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

This commit is contained in:
wanlop run 2025-06-10 13:44:06 +07:00
commit ff46a370d7
12 changed files with 339 additions and 249 deletions

View file

@ -181,6 +181,7 @@
Var Seeker.IntVendingCredit = 0
Var EMAMemberID = ""
Var UKBMemberID = ""
Var Seeker.StoreCreditFlag = 0
Var Seeker.pageStoreCredit0 = 0

View file

@ -25,6 +25,10 @@
If StrCountryShort = "AUS" Then
Open "ROOT/taobin_project/inter/aus/xml/page_remove_cup.lxml"
EndIf
If StrCountryShort = "GBR" Then
Open "ROOT/taobin_project/inter/gbr/xml/page_remove_cup.lxml"
EndIf
If StrCountryShort = "SGP" Then
Open "ROOT/taobin_project/inter/sgp/xml/page_remove_cup.lxml"

View file

@ -461,8 +461,8 @@
Var custom_coffee_level_medium_text_x = 560
Var custom_coffee_level_medium_price_x = 600
Var custom_coffee_level_right_text_x = 676
Var custom_coffee_level_darker_text_x = 880
Var custom_coffee_level_dark_text_x = 790
Var custom_coffee_level_darker_text_x = 875
Var custom_coffee_level_dark_text_x = 780
Var SugarZeroCalPrice_X = 482
@ -8324,7 +8324,31 @@
EndIf
EndIf
Else
Var return = "Invisible"
If showShotEnable = "Press" Then
If TOPPING1 = "Suger 4 step cold" Then
Var return = "Invisible"
Else
If TOPPING1 = "Suger 4 step hot" Then
Var return = "Invisible"
Else
Var return = "Enable"
EndIf
EndIf
Else
If showShotEnable = "Disable" Then
If TOPPING1 = "Suger 4 step cold" Then
Var return = "Invisible"
Else
If TOPPING1 = "Suger 4 step hot" Then
Var return = "Invisible"
Else
Var return = "Enable"
EndIf
EndIf
Else
Var return = "Invisible"
EndIf
EndIf
EndIf
)
</State>
@ -8430,7 +8454,31 @@
EndIf
EndIf
Else
Var return = "Invisible"
If showShotEnable = "Press" Then
If TOPPING1 = "Suger 4 step cold" Then
Var return = "Enable"
Else
If TOPPING1 = "Suger 4 step hot" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
EndIf
Else
If showShotEnable = "Disable" Then
If TOPPING1 = "Suger 4 step cold" Then
Var return = "Enable"
Else
If TOPPING1 = "Suger 4 step hot" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
EndIf
Else
Var return = "Invisible"
EndIf
EndIf
EndIf
)
</State>