HKG : Apply remove cup on arm

2025-06-13 14:31:56 +07:00 · 2025-06-13 14:31:56 +07:00 · 4b791206c7
commit 4b791206c7
parent 8497d41ff7
44 changed files with 55 additions and 4 deletions
--- a/inter/hkg/image/main_page/bn_remove_cup.png
+++ b/inter/hkg/image/main_page/bn_remove_cup.png
--- a/inter/hkg/image/main_page/bp_remove_cup.png
+++ b/inter/hkg/image/main_page/bp_remove_cup.png
--- a/inter/hkg/xml/multi/page_catalog.lxml
+++ b/inter/hkg/xml/multi/page_catalog.lxml
@ -243,6 +243,8 @@
 	;SAVELOG SoundPlaying
 	;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
 	If countDownRetrun > 0 Then
 		Var countDownRetrun = countDownRetrun - 1
 	EndIf
@ -1097,4 +1099,6 @@
 	Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml"
 </EventUnitTest8>
 ;include="ROOT/taobin_project/inc/remove_cup_tag_on_arm.inc"
 </Popup>
--- a/inter/hkg/xml/multi/page_catalog_group_appfast.lxml
+++ b/inter/hkg/xml/multi/page_catalog_group_appfast.lxml
@ -65,6 +65,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_appfast.skt
+++ b/inter/hkg/xml/multi/page_catalog_group_appfast.skt
@ -68,6 +68,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_cocktail.skt
+++ b/inter/hkg/xml/multi/page_catalog_group_cocktail.skt
@ -65,6 +65,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_coffee.lxml
+++ b/inter/hkg/xml/multi/page_catalog_group_coffee.lxml
@ -73,6 +73,7 @@
                InstanceSetString "ShowMSC"
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_coffee.skt
+++ b/inter/hkg/xml/multi/page_catalog_group_coffee.skt
@ -75,6 +75,7 @@
                InstanceSetString "ShowMSC"
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_forkid.lxml
+++ b/inter/hkg/xml/multi/page_catalog_group_forkid.lxml
@ -82,6 +82,7 @@
                InstanceSetString "ShowMSC"
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_forkid.skt
+++ b/inter/hkg/xml/multi/page_catalog_group_forkid.skt
@ -85,6 +85,7 @@
                InstanceSetString "ShowMSC"
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_health.lxml
+++ b/inter/hkg/xml/multi/page_catalog_group_health.lxml
@ -72,6 +72,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_health.skt
+++ b/inter/hkg/xml/multi/page_catalog_group_health.skt
@ -75,6 +75,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_milk.lxml
+++ b/inter/hkg/xml/multi/page_catalog_group_milk.lxml
@ -70,6 +70,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_milk.skt
+++ b/inter/hkg/xml/multi/page_catalog_group_milk.skt
@ -72,6 +72,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_oreo.skt
+++ b/inter/hkg/xml/multi/page_catalog_group_oreo.skt
@ -59,6 +59,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_other.lxml
+++ b/inter/hkg/xml/multi/page_catalog_group_other.lxml
@ -72,6 +72,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_other.skt
+++ b/inter/hkg/xml/multi/page_catalog_group_other.skt
@ -74,6 +74,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_pepsi_pro.skt
+++ b/inter/hkg/xml/multi/page_catalog_group_pepsi_pro.skt
@ -59,6 +59,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_recommend.lxml
+++ b/inter/hkg/xml/multi/page_catalog_group_recommend.lxml
@ -141,6 +141,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_recommend.skt
+++ b/inter/hkg/xml/multi/page_catalog_group_recommend.skt
@ -143,6 +143,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_recommend_multi_pro.lxml
+++ b/inter/hkg/xml/multi/page_catalog_group_recommend_multi_pro.lxml
@ -55,6 +55,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_recommend_multi_pro.skt
+++ b/inter/hkg/xml/multi/page_catalog_group_recommend_multi_pro.skt
@ -57,6 +57,7 @@
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_tea.lxml
+++ b/inter/hkg/xml/multi/page_catalog_group_tea.lxml
@ -78,7 +78,7 @@
            EndIf
        EndIf
-		
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_tea.skt
+++ b/inter/hkg/xml/multi/page_catalog_group_tea.skt
@ -81,7 +81,7 @@
            EndIf
        EndIf
-		
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    ; setvarint SlientRefreshEnable 1
--- a/inter/hkg/xml/multi/page_catalog_group_whey.lxml
+++ b/inter/hkg/xml/multi/page_catalog_group_whey.lxml
@ -78,7 +78,7 @@
                InstanceSetString "ShowMSC"
            EndIf
-       
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
        EndIf
    EndIf
--- a/inter/hkg/xml/multi/page_catalog_group_whey.skt
+++ b/inter/hkg/xml/multi/page_catalog_group_whey.skt
@ -81,7 +81,7 @@
                InstanceSetString "ShowMSC"
            EndIf
-       
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
        EndIf
    EndIf
--- a/inter/hkg/xml/multi/page_instance2.xml
+++ b/inter/hkg/xml/multi/page_instance2.xml
@ -36,5 +36,6 @@
    TimerReset
 </EventTimeout>
 ;include="ROOT/taobin_project/inc/remove_cup_tag_on_arm.inc"
 </Popup>
--- a/inter/hkg/xml/multi/v3/page_catalog_group_coffee.lxml
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_coffee.lxml
@ -72,6 +72,7 @@
                Var inst_show_coffee_counter = 4
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
--- a/inter/hkg/xml/multi/v3/page_catalog_group_coffee.skt
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_coffee.skt
@ -74,6 +74,7 @@
                Var inst_show_coffee_counter = 4
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
--- a/inter/hkg/xml/multi/v3/page_catalog_group_forkid.lxml
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_forkid.lxml
@ -74,6 +74,7 @@
                Var inst_show_for_kid_counter = 4
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
--- a/inter/hkg/xml/multi/v3/page_catalog_group_forkid.skt
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_forkid.skt
@ -77,6 +77,7 @@
                Var inst_show_for_kid_counter = 4
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
--- a/inter/hkg/xml/multi/v3/page_catalog_group_health.lxml
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_health.lxml
@ -65,6 +65,7 @@
                Var inst_show_health_counter = 7
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
--- a/inter/hkg/xml/multi/v3/page_catalog_group_health.skt
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_health.skt
@ -68,6 +68,7 @@
                Var inst_show_health_counter = 7
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
--- a/inter/hkg/xml/multi/v3/page_catalog_group_milk.lxml
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_milk.lxml
@ -62,6 +62,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/hkg/xml/multi/v3/page_catalog_group_milk.skt
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_milk.skt
@ -64,6 +64,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/hkg/xml/multi/v3/page_catalog_group_other.lxml
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_other.lxml
@ -73,6 +73,10 @@
 		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/hkg/xml/multi/v3/page_catalog_group_other.skt
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_other.skt
@ -76,6 +76,10 @@
 		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/hkg/xml/multi/v3/page_catalog_group_recommend.lxml
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_recommend.lxml
@ -52,6 +52,7 @@
                Var inst_show_exclude_group_counter = 45
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    Var RecommendTimeOut = RecommendTimeOut + 1
--- a/inter/hkg/xml/multi/v3/page_catalog_group_recommend.skt
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_recommend.skt
@ -54,6 +54,7 @@
                Var inst_show_exclude_group_counter = 45
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    Var RecommendTimeOut = RecommendTimeOut + 1
--- a/inter/hkg/xml/multi/v3/page_catalog_group_tea.lxml
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_tea.lxml
@ -63,6 +63,7 @@
                Var inst_show_tea_counter = 4
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
--- a/inter/hkg/xml/multi/v3/page_catalog_group_tea.skt
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_tea.skt
@ -66,6 +66,7 @@
                Var inst_show_tea_counter = 4
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
--- a/inter/hkg/xml/multi/v3/page_catalog_group_whey.lxml
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_whey.lxml
@ -59,6 +59,7 @@
                Var inst_show_whey_counter = 4
            EndIf
        EndIf
        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
    EndIf
    TimerReset
--- a/inter/hkg/xml/multi/v3/page_catalog_group_whey.skt
+++ b/inter/hkg/xml/multi/v3/page_catalog_group_whey.skt
@ -62,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/xml/page_board.xml
+++ b/xml/page_board.xml
@ -1596,6 +1596,11 @@
 		Var bpRemoveCup = CountryRootPath + "/image/main_page/bp_remove_cup.png"
 	EndIf
 	If CountryName = "HongKong" Then
 		Var bnRemoveCup = CountryRootPath + "/image/main_page/bn_remove_cup.png"
 		Var bpRemoveCup = CountryRootPath + "/image/main_page/bp_remove_cup.png"
 	EndIf
 	If IgnoreProfileFromRunEV = "" Then