Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
wanlop run 2025-03-04 17:49:11 +07:00
commit 184e7876cc
93 changed files with 32450 additions and 1709 deletions

View file

@ -68,6 +68,9 @@ Var SwensenPro = 0
; Coconut Milk, 1 Mar - 31 Mar
Var CoconutMilkPro = 0
; Matcha every day, 10 Mar - 31 Mar
Var MatchaEveryDayPro = 0
Var NewCollectPoint = 1
Var PaymentCodeShouldCollectPromotionPoint = 0
@ -119,6 +122,7 @@ EndIf
If SystemDateMonthInt = 3 Then
If SystemDateDayInt >= 10 Then
Var SwensenPro = 1
Var MatchaEveryDayPro = 1
EndIf
Var CoconutMilkPro = 1
@ -218,6 +222,7 @@ If taobin_nopro = "true" Then
Var OvaltineSchoolPro = 0
Var RedStringOfFatePro = 0
Var CoconutMilkPro = 0
Var MatchaEveryDayPro = 0
Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
EndIf
@ -230,6 +235,12 @@ Else
Var CoconutMilkPro = 0
EndIf
If MatchaPowderEnable = "true" Then
Else
Var MatchaEveryDayPro = 0
EndIf
DEBUGVAR HaveIngredientOvaltine
If HaveIngredientOvaltine = "true" Then