Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
Pakin 2024-04-02 14:42:07 +07:00
commit 7a500c37ec
17 changed files with 52 additions and 89 deletions

View file

@ -6,13 +6,9 @@ DEBUGVAR OpenFromPageBoard
DEBUGVAR LipitPro
DEBUGVAR MondayBananaPro
DEBUGVAR PepsiSecondCup30Enable
DEBUGVAR FreeEnergyDrink
DEBUGVAR EnergyDrinkEnable
DEBUGVAR TeaTimePro
DEBUGVAR FreeFirePro
DEBUGVAR FreeFireMenuState1
DEBUGVAR FreeFireMenuState2
DEBUGVAR FreeFireMenuState3
Var PromotionState1 = "Invisible"
Var PromotionState2 = "Invisible"
@ -33,7 +29,6 @@ Else
DEBUGVAR FreeEnergyDrink
;Var FreeEnergyDrink = 1
;Var EnableFreeEnergyDrink = "true"
;Var MondayBananaPro = 1
DEBUGVAR EnableFreeEnergyDrink
Var CountEnablePromotion = 0

View file

@ -291,6 +291,7 @@ If BoxID = 172053 Then
Var NewFlowPaymentCode = 0
Var MondayBananaPro = 0
Var LipitPro = 1
Var FreeFirePro = 1
Var FreeEnergyDrink = 0
EndIf
@ -355,6 +356,11 @@ If taobin_nopro = "true" Then
Var PepsiSecondCup30DiscountEnable = 0
Var FromPepsiSecondCup30 = 0
Var LipitPro = 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
If BananaSyrupEnable = "true" Then

View file

@ -460,14 +460,7 @@
If AdvertiseProfileLen = 0 Then
CacheVarStr "get" AdvertiseProfile
Else
STRCONTAIN "00/00" AdvertiseProfile advPro
If advPro = "true" Then
CacheVarStr "get" AdvertiseProfile
Else
CacheVarStr "put" AdvertiseProfile
EndIf
CacheVarStr "put" AdvertiseProfile
EndIf
DEBUGVAR AdvertiseProfile

View file

@ -7,6 +7,8 @@
<EventOpen>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Machine WakeUp
Var UserSeletedSugar = 0
SAVELOG "Event Open Select 6 inter"

View file

@ -7,6 +7,8 @@
<EventOpen>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Machine WakeUp
Var TextSelfTestCntColor = "0x746253"
Var UserSeletedSugar = 0

View file

@ -11,16 +11,6 @@
SPLITDIGIT totalCup 9 SoldCupDigit
DEBUGVAR SoldCupDigit[0]
DEBUGVAR SoldCupDigit[1]
DEBUGVAR SoldCupDigit[2]
DEBUGVAR SoldCupDigit[3]
DEBUGVAR SoldCupDigit[4]
DEBUGVAR SoldCupDigit[5]
DEBUGVAR SoldCupDigit[6]
DEBUGVAR SoldCupDigit[7]
DEBUGVAR SoldCupDigit[8]
Var ClickCountMainTe = 0
Var SoldCupTimeout = 0
</EventOpen>
@ -42,15 +32,6 @@
Var totalCup = CurrentTotalCup
SPLITDIGIT totalCup 9 SoldCupDigit
DEBUGVAR SoldCupDigit[0]
DEBUGVAR SoldCupDigit[1]
DEBUGVAR SoldCupDigit[2]
DEBUGVAR SoldCupDigit[3]
DEBUGVAR SoldCupDigit[4]
DEBUGVAR SoldCupDigit[5]
DEBUGVAR SoldCupDigit[6]
DEBUGVAR SoldCupDigit[7]
DEBUGVAR SoldCupDigit[8]
Refresh
EndIf