pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Relase 11.12

Browse source
This commit is contained in:
wanlop run 2025-07-01 13:21:47 +07:00
parent dd20206491
commit ac565b6da8
5 changed files with 1120 additions and 1231 deletions
Download patch file Download diff file Expand all files Collapse all files

19
xml/function2.inc
View file

@ -406,15 +406,12 @@
Var TOPPING_PRICE = TOPPING_PRICE + OreoPrice Var TOPPING_PRICE = TOPPING_PRICE + OreoPrice
Var strMulti6_1 = "TPID=321,multiply=1" Var strMulti6_1 = "TPID=321,multiply=1"
Var DisableUsingCode = "true" Var DisableUsingCode = "true"
DEBUGVAR DisableUsingCode
Else
;Var PriceDrinkTmp = PriceDrinkNoTop ;Var PriceDrinkTmp = PriceDrinkNoTop
Var strMulti6_1 = "TPID=320,multiply=0" Var strMulti6_1 = "TPID=320,multiply=0"
Var DisableUsingCode = "false" Var DisableUsingCode = "false"
DEBUGVAR DisableUsingCode
EndIf EndIf
@ -424,14 +421,12 @@
;Var topping6 = toppingID6index5 ;Var topping6 = toppingID6index5
Var strMulti6_2 = "TPID=323,multiply=1" Var strMulti6_2 = "TPID=323,multiply=1"
Var DisableUsingCode = "true" Var DisableUsingCode = "true"
DEBUGVAR DisableUsingCode
Else Else
;Var PriceDrinkTmp = PriceDrinkNoTop ;Var PriceDrinkTmp = PriceDrinkNoTop
Var strMulti6_2 = "TPID=320,multiply=0" Var strMulti6_2 = "TPID=320,multiply=0"
Var DisableUsingCode = "false" Var DisableUsingCode = "false"
DEBUGVAR DisableUsingCode
EndIf EndIf
@ -440,7 +435,6 @@
;Var topping6 = toppingID6index3 ;Var topping6 = toppingID6index3
Var strMulti6_3 = "TPID=322,multiply=1" Var strMulti6_3 = "TPID=322,multiply=1"
Var DisableUsingCode = "true" Var DisableUsingCode = "true"
DEBUGVAR DisableUsingCode
Else Else
;Var PriceDrinkTmp = PriceDrinkNoTop ;Var PriceDrinkTmp = PriceDrinkNoTop
@ -448,61 +442,52 @@
Var strMulti6_3 = "TPID=320,multiply=0" Var strMulti6_3 = "TPID=320,multiply=0"
Var DisableUsingCode = "false" Var DisableUsingCode = "false"
DEBUGVAR DisableUsingCode
EndIf EndIf
If CustomMilkState[0] = "PressForever" Then If CustomMilkState[0] = "PressForever" Then
Var strMulti11_1 = "TPID=541,multiply=1" Var strMulti11_1 = "TPID=541,multiply=1"
Var DisableUsingCode = "true" Var DisableUsingCode = "true"
DEBUGVAR DisableUsingCode
Else Else
Var strMulti11_1 = "TPID=542,multiply=0" Var strMulti11_1 = "TPID=542,multiply=0"
Var DisableUsingCode = "false" Var DisableUsingCode = "false"
DEBUGVAR DisableUsingCode
EndIf EndIf
If CustomMilkState[1] = "PressForever" Then If CustomMilkState[1] = "PressForever" Then
Var strMulti11_2 = "TPID=542,multiply=1" Var strMulti11_2 = "TPID=542,multiply=1"
Var DisableUsingCode = "true" Var DisableUsingCode = "true"
DEBUGVAR DisableUsingCode
Else Else
Var strMulti11_2 = "TPID=542,multiply=0" Var strMulti11_2 = "TPID=542,multiply=0"
Var DisableUsingCode = "false" Var DisableUsingCode = "false"
DEBUGVAR DisableUsingCode
EndIf EndIf
If CustomMilkState[2] = "PressForever" Then If CustomMilkState[2] = "PressForever" Then
Var strMulti11_3 = "TPID=543,multiply=1" Var strMulti11_3 = "TPID=543,multiply=1"
Var DisableUsingCode = "true" Var DisableUsingCode = "true"
DEBUGVAR DisableUsingCode
Else Else
Var strMulti11_3 = "TPID=542,multiply=0" Var strMulti11_3 = "TPID=542,multiply=0"
Var DisableUsingCode = "false" Var DisableUsingCode = "false"
DEBUGVAR DisableUsingCode
EndIf EndIf
If CustomTaiwaneseTeaState[0] = "PressForever" Then If CustomTaiwaneseTeaState[0] = "PressForever" Then
Var strMulti11_4 = "TPID=546,multiply=1" Var strMulti11_4 = "TPID=546,multiply=1"
Var DisableUsingCode = "true" Var DisableUsingCode = "true"
DEBUGVAR DisableUsingCode
Else Else
Var strMulti11_4 = "TPID=546,multiply=0" Var strMulti11_4 = "TPID=546,multiply=0"
Var DisableUsingCode = "false" Var DisableUsingCode = "false"
DEBUGVAR DisableUsingCode
EndIf EndIf
If CustomTaiwaneseTeaState[1] = "PressForever" Then If CustomTaiwaneseTeaState[1] = "PressForever" Then
Var strMulti11_5 = "TPID=547,multiply=1" Var strMulti11_5 = "TPID=547,multiply=1"
Var DisableUsingCode = "true" Var DisableUsingCode = "true"
DEBUGVAR DisableUsingCode
Else Else
Var strMulti11_5 = "TPID=547,multiply=0" Var strMulti11_5 = "TPID=547,multiply=0"
Var DisableUsingCode = "false" Var DisableUsingCode = "false"
DEBUGVAR DisableUsingCode
EndIf EndIf
DEBUGVAR DisableUsingCode
If CustomTaiwaneseTeaState[1] = "PressForever" Then If CustomTaiwaneseTeaState[1] = "PressForever" Then
Var TOPPING_PRICE = TOPPING_PRICE + TaiwaneseTeaIncreasePrice Var TOPPING_PRICE = TOPPING_PRICE + TaiwaneseTeaIncreasePrice
EndIf EndIf

204
xml/page_topping_select8.xml
View file

@ -998,6 +998,7 @@
If UserSelectProductCode = "" Then If UserSelectProductCode = "" Then
Var MenuReady = "error-pd2" Var MenuReady = "error-pd2"
Else Else
DEBUGVAR UserSelectProductCode
Strlen UserSelectProductCode UserSelectProductCodeLen Strlen UserSelectProductCode UserSelectProductCodeLen
If UserSelectProductCodeLen = 13 Then If UserSelectProductCodeLen = 13 Then
@ -2207,24 +2208,6 @@
EndIf EndIf
EndIf EndIf
If TOPPING2 = "shot coffee" Then
Var ShotCoffeeBG = "Enable"
Var showShotEnable = "Enable"
Var ExtraTopping = "Enable"
Var toppingID2price2Conv !assigned StringFmt( toppingID2price2 , DisplayFormat, PreScaleConvertShow)
DEBUGVAR toppingID2price2Conv
Var text_shot_normal_add = toppingID2price2Conv + ")"
Var text_shot_normal_add = "(+" + text_shot_normal_add
If showShotNormal = "Enable" Then
Var showShotNormal = "Press"
EndIf
EndIf
If TOPPING13 = "shot coffee" Then If TOPPING13 = "shot coffee" Then
Var showAdjust = "Enable" Var showAdjust = "Enable"
If toppingID13index2Status = "Enable" Then If toppingID13index2Status = "Enable" Then
@ -4764,8 +4747,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
Var CustomSweetState[0] = "PressForever" Var CustomSweetState[0] = "PressForever"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
Var CustomSweetState[2] = "Enable" Var CustomSweetState[2] = "Enable"
@ -4782,11 +4764,9 @@ Refresh
EndIf EndIf
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
EndIf
Var SugarZeroCalOption = "Invisible" Var SugarZeroCalOption = "Invisible"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf
EndIf
Refresh Refresh
@ -4812,8 +4792,6 @@ Refresh
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else
If ButtonConfirmOrderState = "Disable" Then
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
@ -4856,7 +4834,6 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
@ -4880,8 +4857,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -4925,7 +4901,6 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -4949,8 +4924,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -5010,7 +4984,6 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5034,8 +5007,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -5095,7 +5067,6 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5119,8 +5090,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -5180,7 +5150,6 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5191,7 +5160,7 @@ Refresh
<Text> <Text>
<X> CustomSweetNotTextX </X> <X> CustomSweetNotTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[0] </State> <State> "CustomSweetState[0]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5205,7 +5174,7 @@ Refresh
<Text> <Text>
<X> CustomSweetLittleTextX </X> <X> CustomSweetLittleTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[1] </State> <State> "CustomSweetState[1]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5219,7 +5188,7 @@ Refresh
<Text> <Text>
<X> CustomSweetLessTextX </X> <X> CustomSweetLessTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[2] </State> <State> "CustomSweetState[2]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5233,7 +5202,7 @@ Refresh
<Text> <Text>
<X> CustomSweetPerfectTextX </X> <X> CustomSweetPerfectTextX </X>
<Y> CustomSweetPercentTextY </Y> <Y> CustomSweetPercentTextY </Y>
<State> CustomSweetState[3] </State> <State> "CustomSweetState[3]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5247,7 +5216,7 @@ Refresh
<Text> <Text>
<X> CustomSweetExtraTextX </X> <X> CustomSweetExtraTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[4] </State> <State> "CustomSweetState[4]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5261,7 +5230,7 @@ Refresh
<Text> <Text>
<X> CustomSweetestTextX </X> <X> CustomSweetestTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[5] </State> <State> "CustomSweetState[5]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5479,8 +5448,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
Var CustomSweetState[0] = "PressForever" Var CustomSweetState[0] = "PressForever"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
Var CustomSweetState[2] = "Enable" Var CustomSweetState[2] = "Enable"
@ -5499,7 +5467,6 @@ Refresh
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -5526,8 +5493,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "PressForever" Var CustomSweetState[1] = "PressForever"
@ -5571,7 +5537,6 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5595,8 +5560,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -5640,7 +5604,6 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5664,8 +5627,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -5725,7 +5687,6 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5749,8 +5710,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -5810,7 +5770,6 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5834,8 +5793,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -5895,7 +5853,6 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5906,7 +5863,7 @@ Refresh
<Text> <Text>
<X> CustomSweetNotTextX </X> <X> CustomSweetNotTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[0] </State> <State> "CustomSweetState[0]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5920,7 +5877,7 @@ Refresh
<Text> <Text>
<X> CustomSweetLittleTextX </X> <X> CustomSweetLittleTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[1] </State> <State> "CustomSweetState[1]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5934,7 +5891,7 @@ Refresh
<Text> <Text>
<X> CustomSweetLessTextX </X> <X> CustomSweetLessTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[2] </State> <State> "CustomSweetState[2]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5948,7 +5905,7 @@ Refresh
<Text> <Text>
<X> CustomSweetPerfectTextX </X> <X> CustomSweetPerfectTextX </X>
<Y> CustomSweetPercentTextY </Y> <Y> CustomSweetPercentTextY </Y>
<State> CustomSweetState[3] </State> <State> "CustomSweetState[3]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5962,7 +5919,7 @@ Refresh
<Text> <Text>
<X> CustomSweetExtraTextX </X> <X> CustomSweetExtraTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[4] </State> <State> "CustomSweetState[4]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5976,7 +5933,7 @@ Refresh
<Text> <Text>
<X> CustomSweetestTextX </X> <X> CustomSweetestTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[5] </State> <State> "CustomSweetState[5]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -6044,8 +6001,7 @@ Refresh
Refresh Refresh
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "PressForever" Var CustomSweetState[0] = "PressForever"
@ -6080,7 +6036,6 @@ Refresh
TRY "ROOT/taobin_project/xml/function2.inc" TRY "ROOT/taobin_project/xml/function2.inc"
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -6108,8 +6063,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "PressForever" Var CustomSweetState[1] = "PressForever"
@ -6166,7 +6120,6 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -6190,8 +6143,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -6249,7 +6201,6 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -6273,8 +6224,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -6350,7 +6300,6 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -6374,8 +6323,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -6440,7 +6388,6 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -6464,8 +6411,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -6529,7 +6475,6 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -6540,7 +6485,7 @@ Refresh
<Text> <Text>
<X> CustomSweetNotTextX </X> <X> CustomSweetNotTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[0] </State> <State> "CustomSweetState[0]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -6554,7 +6499,7 @@ Refresh
<Text> <Text>
<X> CustomSweetLittleTextX </X> <X> CustomSweetLittleTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[1] </State> <State> "CustomSweetState[1]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -6568,7 +6513,7 @@ Refresh
<Text> <Text>
<X> CustomSweetLessTextX </X> <X> CustomSweetLessTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[2] </State> <State> "CustomSweetState[2]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -6582,7 +6527,7 @@ Refresh
<Text> <Text>
<X> CustomSweetPerfectTextX </X> <X> CustomSweetPerfectTextX </X>
<Y> CustomSweetPercentTextY </Y> <Y> CustomSweetPercentTextY </Y>
<State> CustomSweetState[3] </State> <State> "CustomSweetState[3]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -6596,7 +6541,7 @@ Refresh
<Text> <Text>
<X> CustomSweetExtraTextX </X> <X> CustomSweetExtraTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[4] </State> <State> "CustomSweetState[4]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -6610,7 +6555,7 @@ Refresh
<Text> <Text>
<X> CustomSweetestTextX </X> <X> CustomSweetestTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> CustomSweetState[5] </State> <State> "CustomSweetState[5]" </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -6825,8 +6770,6 @@ Refresh
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else
If ButtonConfirmOrderState = "Disable" Then
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "PressForever" Var CustomSweetState[0] = "PressForever"
@ -6839,7 +6782,6 @@ Refresh
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
EndIf EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf
EndIf EndIf
@ -6867,8 +6809,6 @@ Refresh
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else
If ButtonConfirmOrderState = "Disable" Then
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
@ -6884,11 +6824,10 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf
TRY "ROOT/taobin_project/xml/function2.inc" TRY "ROOT/taobin_project/xml/function2.inc"
EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>
@ -6910,8 +6849,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -6925,7 +6863,6 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -6949,8 +6886,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
@ -6964,7 +6900,6 @@ Refresh
EndIf EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -7344,8 +7279,6 @@ Refresh
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else
If ButtonConfirmOrderState = "Disable" Then
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "PressForever" Var CustomSweetState[0] = "PressForever"
@ -7373,7 +7306,6 @@ Refresh
EndIf EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
TRY "ROOT/taobin_project/xml/function2.inc" TRY "ROOT/taobin_project/xml/function2.inc"
EndIf
EndIf EndIf
@ -7401,8 +7333,6 @@ Refresh
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else
If ButtonConfirmOrderState = "Disable" Then
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
@ -7431,7 +7361,6 @@ Refresh
;Var UserSeletedSugar = 1 ;Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -7454,8 +7383,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -7482,7 +7410,6 @@ Refresh
;Var UserSeletedSugar = 1 ;Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -7506,8 +7433,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
@ -7534,7 +7460,6 @@ Refresh
EndIf EndIf
;Var UserSeletedSugar = 1 ;Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -7683,8 +7608,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
Var CustomSweetState[0] = "PressForever" Var CustomSweetState[0] = "PressForever"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
Var CustomSweetState[2] = "Enable" Var CustomSweetState[2] = "Enable"
@ -7693,10 +7617,8 @@ Refresh
Var CustomSweetState[5] = "Enable" Var CustomSweetState[5] = "Enable"
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf
EndIf
Refresh Refresh
@ -7722,8 +7644,6 @@ Refresh
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else
If ButtonConfirmOrderState = "Disable" Then
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
@ -7745,11 +7665,9 @@ Refresh
EndIf EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf
TRY "ROOT/taobin_project/xml/function2.inc" TRY "ROOT/taobin_project/xml/function2.inc"
EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>
@ -7770,8 +7688,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -7795,7 +7712,6 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -7819,8 +7735,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
@ -7850,7 +7765,6 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
@ -8003,8 +7917,7 @@ Refresh
Refresh Refresh
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "PressForever" Var CustomSweetState[0] = "PressForever"
@ -8034,7 +7947,6 @@ Refresh
TRY "ROOT/taobin_project/xml/function2.inc" TRY "ROOT/taobin_project/xml/function2.inc"
EndIf EndIf
EndIf
</EventClick> </EventClick>
@ -8059,8 +7971,6 @@ Refresh
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else
If ButtonConfirmOrderState = "Disable" Then
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
@ -8096,11 +8006,9 @@ Refresh
EndIf EndIf
EndIf EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf
TRY "ROOT/taobin_project/xml/function2.inc" TRY "ROOT/taobin_project/xml/function2.inc"
EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>
@ -8121,8 +8029,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -8157,7 +8064,6 @@ Refresh
EndIf EndIf
;Var UserSeletedSugar = 1 ;Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -8181,8 +8087,7 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
@ -8225,7 +8130,6 @@ Refresh
EndIf EndIf
;Var UserSeletedSugar = 1 ;Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
@ -10804,7 +10708,7 @@ Refresh
<Width> 700 </Width> <Width> 700 </Width>
<Height> 72 </Height> <Height> 72 </Height>
<Language> <Language>
<ID> 002027 </ID> <ID> 000102 </ID>
</Language> </Language>
</Text> </Text>
@ -10827,7 +10731,7 @@ Refresh
Var ShotCoffeePremium = "Press" Var ShotCoffeePremium = "Press"
EndIf EndIf
TRY "ROOT/taobin_project/xml/function2.inc" Function 2
Refresh Refresh
</EventClick> </EventClick>
@ -10853,7 +10757,7 @@ Refresh
Var ShotCoffeePremium = "Press" Var ShotCoffeePremium = "Press"
EndIf EndIf
TRY "ROOT/taobin_project/xml/function2.inc" Function 2
Refresh Refresh

2
xml/topview2.xml
View file

@ -182,7 +182,7 @@
If str_openfile_xml_0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" Then If str_openfile_xml_0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" Then
If str_openfile_xml_2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" Then If str_openfile_xml_2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" Then
Var CountUpForProjectThisFileStruct = CountUpForProjectThisFileStruct + 1 Var CountUpForProjectThisFileStruct = CountUpForProjectThisFileStruct + 1
DEBUGVAR CountUpForProjectThisFileStruct ;DEBUGVAR CountUpForProjectThisFileStruct
EndIf EndIf
EndIf EndIf

4
xml_main/startup.xml
View file

@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0 Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0 Var RandomSalePackage = 0
Var XMLPageVersion = "10.11" Var XMLPageVersion = "10.12"
Var XMLPageVersionInt = 1011 Var XMLPageVersionInt = 1012
Var CurrentMainVideo = 2 Var CurrentMainVideo = 2
</EventOpen> </EventOpen>

4
xml_main/startup_dev.xml
View file

@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0 Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0 Var RandomSalePackage = 0
Var XMLPageVersion = "11.11" Var XMLPageVersion = "11.12"
Var XMLPageVersionInt = 1111 Var XMLPageVersionInt = 1112
;Oreo ;Oreo
Var OreoGuarantee = 0 Var OreoGuarantee = 0