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

Merge

Browse source
This commit is contained in:
wanlop run 2024-12-11 13:22:46 +07:00
commit 5d733eca34
36 changed files with 105 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

29
inter/tha/xml/page_topping_select6.lxml
View file

@ -895,6 +895,7 @@
Var text_cancel_yc = 16
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 80
Var OatMilkPrice_X = 260
If show_name_len > 24 Then
Var showname = showname + "###size=54"
EndIf
@ -918,6 +919,7 @@
Var text_cancel_yc = 16
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 75
Var OatMilkPrice_X = 220
If show_name_len > 0 Then
Var showname = showname + "###size=68"
EndIf
@ -942,6 +944,7 @@
Var text_cancel_xc = 5
Var text_cancel_yc = 30
Var show_eng = "true"
Var OatMilkPrice_X = 210
If show_name_len > 24 Then
Var showname = showname + "###size=54"
EndIf
@ -954,8 +957,10 @@
EndIf
EndIf
;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000113, LanguageShowByIndex)
DEBUGVAR StringToppingOatMilkWithPrice
Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
DEBUGVAR StringToppingOatMilkWithPrice
Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
@ -2813,7 +2818,7 @@
Var high_light_drink_type = "Invisible"
Var IndexDrinktType = 0
</EventClick>
@ -2871,7 +2876,7 @@
Var topping_price_refresh = 0
Topping "Load" PD_CODE2
Var IndexDrinktType = 1
</EventClick>
<Language>
@ -2929,7 +2934,7 @@
Topping "Load" PD_CODE3
Var IndexDrinktType = 2
</EventClick>
<Language>
@ -6071,9 +6076,20 @@
<Height> 65 </Height>
<Language>
<ID> 000113 </ID>
<SubValue> OatMilkPrice </SubValue>
</Language>
</Text>
;<Text>
;<X> OatMilkPrice_X </X>
;<Y> 77 </Y>
;<Font> KanitRegularTTF </Font>
;<State> "Enable" </State>
;<Size> 28 </Size>
;<Color> 0x84776F </Color>
;<Value> OatMilkPrice </Value>
;</Text>
</Block>
;
;
@ -8436,12 +8452,15 @@
If SelectCountDrinkType = 1 Then
If DefaultDrinkType = 1 Then
Var hot_button_state = "PressForever"
Var IndexDrinktType = 0
EndIf
If DefaultDrinkType = 2 Then
Var cold_button_state = "PressForever"
Var IndexDrinktType = 1
EndIf
If DefaultDrinkType = 3 Then
Var blend_button_state = "PressForever"
Var IndexDrinktType = 2
EndIf
EndIf