Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
759708226c
154 changed files with 30 additions and 5 deletions
|
|
@ -159,9 +159,6 @@
|
|||
|
||||
Var BugFlag = 0
|
||||
|
||||
Var Seeker.NameDrinkEN = NameDrink
|
||||
Var Seeker.NameDrinkTH = NameDrinkTH
|
||||
|
||||
If show_eng = "true" Then
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/topping2_en"
|
||||
|
|
@ -7425,6 +7422,10 @@
|
|||
Var showname = menu_name_thai_hot
|
||||
Var showdesc = menu_desc_thai_hot
|
||||
EndIf
|
||||
|
||||
Var Seeker.NameDrinkEN = menu_name_eng_hot
|
||||
Var Seeker.NameDrinkTH = menu_name_thai_hot
|
||||
|
||||
Var text_hot_color = "0xFFFFFF"
|
||||
Var text_cold_color = "0x84776F"
|
||||
Var text_blender_color = "0x84776F"
|
||||
|
|
@ -7461,6 +7462,9 @@
|
|||
Var showdesc = menu_desc_thai_cold
|
||||
EndIf
|
||||
|
||||
Var Seeker.NameDrinkEN = menu_name_eng_cold
|
||||
Var Seeker.NameDrinkTH = menu_name_thai_cold
|
||||
|
||||
Var text_hot_color = "0x84776F"
|
||||
Var text_cold_color = "0xFFFFFF"
|
||||
Var text_blender_color = "0x84776F"
|
||||
|
|
@ -7505,6 +7509,9 @@
|
|||
Var showdesc = menu_desc_thai_blender
|
||||
EndIf
|
||||
|
||||
Var Seeker.NameDrinkEN = menu_name_eng_blender
|
||||
Var Seeker.NameDrinkTH = menu_name_thai_blender
|
||||
|
||||
Var text_hot_color = "0x84776F"
|
||||
Var text_cold_color = "0x84776F"
|
||||
Var text_blender_color = "0xFFFFFF"
|
||||
|
|
@ -7968,7 +7975,7 @@
|
|||
;
|
||||
|
||||
<EventUnitTest1>
|
||||
__CMD "UpdateCupOnArm" UserSelectProductCode "-"
|
||||
__CMD "UpdateCupOnArm" UserSelectProductCode "-"
|
||||
</EventUnitTest1>
|
||||
|
||||
<EventUnitTest2>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue