doing cup on arm

2025-06-06 17:30:21 +07:00 · 2025-06-06 17:30:21 +07:00 · 0e5e9a0639
commit 0e5e9a0639
parent 12d31e3cde
38 changed files with 9975 additions and 3110 deletions
--- a/inter/tha/menu/lang.tsv
+++ b/inter/tha/menu/lang.tsv
@ -279,6 +279,7 @@
 002022		D.I.Y. your cup, your style [(max 1)###Font=KanitLight,Size=20]	เพิ่่มไซรัปฉ่ำๆ D.I.Y ความอร่อยได้เลย [(เลือกสูงสุด 1 ข้อ)###Font=KanitLight,Size=20]	自定义你的杯子，你的风格 [(最多可选 1 项)###Font=KanitLight,Size=20]			ကိုယ်ပိုင်စတိုင်နဲ့ ခွက်လုပ်ပါ[(အများဆုံး ၁ အချက်)###Font=KanitLight,Size=20]

 		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46			Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46
+002028		Taiwanese tea Intensity	ความข้นของชาไต้หวัน	台湾茶浓度			တိုင်ဝမ်လက်ဖက်ရည်အား
 002029		Sugar type	ประเภทน้ำตาล	糖类选择			သကြား အမျိုးအစား
 002030		Sweetness	ความหวาน	甜度			အချိုချင်း
 002031		Espresso Shot	เอสเพรสโซ่ช็อต	浓缩咖啡份数			အီစပရိုဆို ရိုက်ခြင်း
--- a/inter/tha/xml/multi/page_catalog.lxml
+++ b/inter/tha/xml/multi/page_catalog.lxml
@ -319,7 +319,6 @@

 	DEBUGVAR MultiProcessTimer
 	DEBUGVAR CatalogLayoutV3
-	If CatalogLayoutV3Loaded = 1 Then
 		Var Inst5MenuLoaded = "done"
 		Var Inst6MenuLoaded = "done"
 		Var Inst7MenuLoaded = "done"
@ -328,7 +327,6 @@
 		Var Inst10MenuLoaded = "done"
 		Var Inst11MenuLoaded = "done"

-	EndIf


 	If MultiProcess = "Enable" Then
--- a/inter/tha/xml/multi/page_instance2.xml
+++ b/inter/tha/xml/multi/page_instance2.xml
@ -43,5 +43,7 @@
    TimerReset
 </EventTimeout>

+;include="ROOT/taobin_project/inc/remove_cup_tag_on_arm.inc"
+

 </Popup>
--- a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
+++ b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
@ -15161,6 +15161,5 @@ OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_ha



-;include="ROOT/taobin_project/inc/button_remove_cup.inc"

 </Popup>
--- a/inter/tha/xml/multi/v3/event/event_v3/catalog_other/active_promotions.lxml
+++ b/inter/tha/xml/multi/v3/event/event_v3/catalog_other/active_promotions.lxml
@ -38,7 +38,6 @@

 	DEBUGVAR SlientRefreshIndex

-	Var buttonRemoveCupOnArm = "Invisible"

 	RefreshAll

@ -76,6 +75,9 @@
 		EndIf
    EndIf

+   	If inst_show_other_other = 1 Then
+	 	;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+	EndIf

    TimerReset
 </EventTimeout>
--- a/inter/tha/xml/multi/v3/page_catalog_group_20_baht.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_20_baht.lxml
@ -31,7 +31,6 @@

 	DEBUGVAR SlientRefreshIndex

-    Var buttonRemoveCupOnArm = "Invisible"

    RefreshAll

@ -64,6 +63,7 @@
                Var inst_show_pepsi_7up_counter = 4
            EndIf
        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf


--- a/inter/tha/xml/multi/v3/page_catalog_group_20_baht.skt
+++ b/inter/tha/xml/multi/v3/page_catalog_group_20_baht.skt
@ -33,7 +33,6 @@

 	DEBUGVAR SlientRefreshIndex

-    Var buttonRemoveCupOnArm = "Invisible"

    RefreshAll

@ -66,6 +65,7 @@
                Var inst_show_pepsi_7up_counter = 4
            EndIf
        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf


--- a/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml
@ -33,7 +33,7 @@
        Var Menu21Selected = "PressForever"
    EndIf

-    
+
    Var Timeout = 0
    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"

@ -52,22 +52,15 @@
    ;DEBUGVAR ICE_PROCESS_STATUS
    ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"

-    If ICE_PROCESS_STATUS = 2 Then
-        Var ice_tab_process_show = "Enable"
-        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
-    Else
-        Var ice_tab_process_show = "Invisible"
-    EndIf

-   

    GetVisible inst_show_for_kid
-    
+

    If inst_show_for_kid = 1 Then
        If inst_show_for_kid_counter > 0 Then
            DEBUGVAR inst_show_for_kid_counter
-            
+
            Var inst_show_for_kid_counter = inst_show_for_kid_counter - 1

            If inst_show_for_kid_counter = 0 Then
@ -75,8 +68,9 @@
                Var inst_show_for_kid_counter = 4
            EndIf
        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
-    
+


    TimerReset
--- a/inter/tha/xml/multi/v3/page_catalog_group_forkid.skt
+++ b/inter/tha/xml/multi/v3/page_catalog_group_forkid.skt
@ -36,7 +36,7 @@
        Var Menu21Selected = "PressForever"
    EndIf

-    
+
    Var Timeout = 0
    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"

@ -55,22 +55,15 @@
    ;DEBUGVAR ICE_PROCESS_STATUS
    ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"

-    If ICE_PROCESS_STATUS = 2 Then
-        Var ice_tab_process_show = "Enable"
-        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
-    Else
-        Var ice_tab_process_show = "Invisible"
-    EndIf

-   

    GetVisible inst_show_for_kid
-    
+

    If inst_show_for_kid = 1 Then
        If inst_show_for_kid_counter > 0 Then
            DEBUGVAR inst_show_for_kid_counter
-            
+
            Var inst_show_for_kid_counter = inst_show_for_kid_counter - 1

            If inst_show_for_kid_counter = 0 Then
@ -78,8 +71,9 @@
                Var inst_show_for_kid_counter = 4
            EndIf
        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
-    
+


    TimerReset
@ -90,7 +84,7 @@



-<?hurr 
+<?hurr
    #include=menu_new_layout_gen_v3.py
 ?>

--- a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml
@ -27,7 +27,6 @@

    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"

-    Var buttonRemoveCupOnArm = "Invisible"

    RefreshAll
 	DEBUGVAR SlientRefreshIndex
@ -40,13 +39,6 @@
    ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"


-    If ICE_PROCESS_STATUS = 2 Then
-        Var ice_tab_process_show = "Enable"
-        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
-    Else
-        Var ice_tab_process_show = "Invisible"
-    EndIf
-

    GetVisible inst_show_frozen_fruit

@ -62,6 +54,7 @@
                Var inst_show_frozen_fruit_counter = 15
            EndIf
        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf


--- a/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt
+++ b/inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt
@ -29,7 +29,6 @@

    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"

-    Var buttonRemoveCupOnArm = "Invisible"

    RefreshAll
 	DEBUGVAR SlientRefreshIndex
@ -42,13 +41,6 @@
    ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"


-    If ICE_PROCESS_STATUS = 2 Then
-        Var ice_tab_process_show = "Enable"
-        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
-    Else
-        Var ice_tab_process_show = "Invisible"
-    EndIf
-

    GetVisible inst_show_frozen_fruit

@ -64,6 +56,7 @@
                Var inst_show_frozen_fruit_counter = 15
            EndIf
        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf


--- a/inter/tha/xml/multi/v3/page_catalog_group_health.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_health.lxml
@ -33,7 +33,6 @@

    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"

-    Var buttonRemoveCupOnArm = "Invisible"

    RefreshAll
 	DEBUGVAR SlientRefreshIndex
@ -46,14 +45,6 @@
    ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"


-    If ICE_PROCESS_STATUS = 2 Then
-        Var ice_tab_process_show = "Enable"
-        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
-    Else
-        Var ice_tab_process_show = "Invisible"
-    EndIf
-
-

    GetVisible inst_show_health

@ -69,6 +60,8 @@
                Var inst_show_health_counter = 7
            EndIf
        EndIf
+
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf


--- a/inter/tha/xml/multi/v3/page_catalog_group_health.skt
+++ b/inter/tha/xml/multi/v3/page_catalog_group_health.skt
@ -36,7 +36,6 @@

    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"

-    Var buttonRemoveCupOnArm = "Invisible"

    RefreshAll
 	DEBUGVAR SlientRefreshIndex
@ -49,14 +48,6 @@
    ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"


-    If ICE_PROCESS_STATUS = 2 Then
-        Var ice_tab_process_show = "Enable"
-        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
-    Else
-        Var ice_tab_process_show = "Invisible"
-    EndIf
-
-

    GetVisible inst_show_health

@ -72,6 +63,8 @@
                Var inst_show_health_counter = 7
            EndIf
        EndIf
+
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf


--- a/inter/tha/xml/multi/v3/page_catalog_group_milk.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_milk.lxml
@ -33,7 +33,6 @@

    Var inst_show_milk_cupe_counter = 7

-    Var buttonRemoveCupOnArm = "Invisible"
    RefreshAll
 	DEBUGVAR SlientRefreshIndex
 </EventOnShow>
@ -67,6 +66,7 @@
                Var inst_show_milk_cupe_counter = 7
            EndIf
        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf

    TimerReset
--- a/inter/tha/xml/multi/v3/page_catalog_group_milk.skt
+++ b/inter/tha/xml/multi/v3/page_catalog_group_milk.skt
@ -35,7 +35,6 @@

    Var inst_show_milk_cupe_counter = 7

-    Var buttonRemoveCupOnArm = "Invisible"
    RefreshAll
 	DEBUGVAR SlientRefreshIndex
 </EventOnShow>
@ -69,6 +68,7 @@
                Var inst_show_milk_cupe_counter = 7
            EndIf
        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf

    TimerReset
--- a/inter/tha/xml/multi/v3/page_catalog_group_other.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_other.lxml
@ -28,7 +28,6 @@
 		Var SlientRefreshIndex = 8
 	EndIf

-    Var buttonRemoveCupOnArm = "Invisible"

 </EventOpen>

--- a/inter/tha/xml/multi/v3/page_catalog_group_other.skt
+++ b/inter/tha/xml/multi/v3/page_catalog_group_other.skt
@ -31,7 +31,6 @@
 		Var SlientRefreshIndex = 8
 	EndIf

-    Var buttonRemoveCupOnArm = "Invisible"

 </EventOpen>

--- a/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml
@ -38,7 +38,6 @@

 	DEBUGVAR SlientRefreshIndex

-	Var buttonRemoveCupOnArm = "Invisible"

 	RefreshAll

@ -76,6 +75,9 @@
 		EndIf
    EndIf

+   	If inst_show_other_other = 1 Then
+	 	;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+	EndIf

    TimerReset
 </EventTimeout>
--- a/inter/tha/xml/multi/v3/page_catalog_group_other_other.skt
+++ b/inter/tha/xml/multi/v3/page_catalog_group_other_other.skt
@ -41,7 +41,6 @@

 	DEBUGVAR SlientRefreshIndex

-	Var buttonRemoveCupOnArm = "Invisible"

 	RefreshAll

@ -79,6 +78,9 @@
 		EndIf
    EndIf

+   	If inst_show_other_other = 1 Then
+	 	;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+	EndIf

    TimerReset
 </EventTimeout>
--- a/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml
@ -36,7 +36,6 @@

    Var inst_show_pepsi_7up_counter = 4

-    Var buttonRemoveCupOnArm = "Invisible"

    RefreshAll
 	DEBUGVAR SlientRefreshIndex
@ -68,6 +67,7 @@
                Var inst_show_pepsi_7up_counter = 4
            EndIf
        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf


--- a/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.skt
+++ b/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.skt
@ -39,7 +39,6 @@

    Var inst_show_pepsi_7up_counter = 4

-    Var buttonRemoveCupOnArm = "Invisible"

    RefreshAll
 	DEBUGVAR SlientRefreshIndex
@ -71,6 +70,7 @@
                Var inst_show_pepsi_7up_counter = 4
            EndIf
        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf


--- a/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml
@ -15127,6 +15127,5 @@



-;include="ROOT/taobin_project/inc/button_remove_cup.inc"

 </Popup>
--- a/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt
+++ b/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt
@ -74,6 +74,5 @@



-;include="ROOT/taobin_project/inc/button_remove_cup.inc"

 </Popup>
--- a/inter/tha/xml/multi/v3/page_catalog_group_tea.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_tea.lxml
@ -38,7 +38,6 @@

    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"

-    Var buttonRemoveCupOnArm = "Invisible"
    RefreshAll
 </EventOnShow>

@ -65,6 +64,7 @@
                Var inst_show_tea_counter = 4
            EndIf
        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf


--- a/inter/tha/xml/multi/v3/page_catalog_group_tea.skt
+++ b/inter/tha/xml/multi/v3/page_catalog_group_tea.skt
@ -41,7 +41,6 @@

    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"

-    Var buttonRemoveCupOnArm = "Invisible"
    RefreshAll
 </EventOnShow>

@ -68,6 +67,7 @@
                Var inst_show_tea_counter = 4
            EndIf
        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf


--- a/inter/tha/xml/multi/v3/page_catalog_group_whey.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_whey.lxml
@ -40,7 +40,6 @@
    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"

 	DEBUGVAR SlientRefreshIndex
-	Var buttonRemoveCupOnArm = "Invisible"
 </EventOnShow>

 <Timeout> 1000 </Timeout>
@ -63,6 +62,7 @@
                Var inst_show_whey_counter = 4
            EndIf
        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf

    TimerReset
--- a/inter/tha/xml/multi/v3/page_catalog_group_whey.skt
+++ b/inter/tha/xml/multi/v3/page_catalog_group_whey.skt
@ -43,7 +43,6 @@
    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"

 	DEBUGVAR SlientRefreshIndex
-	Var buttonRemoveCupOnArm = "Invisible"
 </EventOnShow>

 <Timeout> 1000 </Timeout>
@ -66,6 +65,7 @@
                Var inst_show_whey_counter = 4
            EndIf
        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf

    TimerReset