Merge remote-tracking branch 'origin/masterpiece' into th_mmr

2025-03-07 13:42:17 +07:00 · 2025-03-07 13:42:17 +07:00 · 247fab8afb
commit 247fab8afb
parent 93918ce012 12d2a701ac
657 changed files with 429579 additions and 31174 deletions
--- a/image/event/image_template3
+++ b/image/event/image_template3
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-normal_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-press_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-press_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-disable_eng=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
-disable_thai=ROOT/taobin_project/image/event/ovaltine_school/ovaltine_school.png
+normal_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+normal_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+press_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+press_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+disable_eng=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
+disable_thai=ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png
--- a/image/event/matcha_every_day/matcha_every_day.png
+++ b/image/event/matcha_every_day/matcha_every_day.png
--- a/image/page_drink_disable_n2/bn_black_tea_coconut.png
+++ b/image/page_drink_disable_n2/bn_black_tea_coconut.png
--- a/image/page_drink_disable_n2/bn_hot_Yuzu_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_Yuzu_tea.png
--- a/image/page_drink_disable_n2/bn_hot_greenteacoffee_lattle.png
+++ b/image/page_drink_disable_n2/bn_hot_greenteacoffee_lattle.png
--- a/image/page_drink_disable_n2/bn_hot_lime_Matcha.png
+++ b/image/page_drink_disable_n2/bn_hot_lime_Matcha.png
--- a/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea.png
--- a/image/page_drink_disable_n2/bn_hot_limeblack_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_limeblack_tea.png
--- a/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png
+++ b/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png
--- a/image/page_drink_disable_n2/bn_hot_matcha_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_matcha_tea.png
--- a/image/page_drink_disable_n2/bn_hot_oolong_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_oolong_tea.png
--- a/image/page_drink_disable_n2/bn_hot_strawberry_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_strawberry_tea.png
--- a/image/page_drink_disable_n2/bn_hot_thai_milk_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_thai_milk_tea.png
--- a/image/page_drink_disable_n2/bn_hot_thai_milk_tea_coconut.png
+++ b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_coconut.png
--- a/image/page_drink_disable_n2/bn_hot_thai_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_thai_tea.png
--- a/image/page_drink_disable_n2/bn_hot_ume_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_ume_tea.png
--- a/image/page_drink_disable_n2/bn_iced_matcha_tea_coconut.png
+++ b/image/page_drink_disable_n2/bn_iced_matcha_tea_coconut.png
--- a/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png
+++ b/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png
--- a/image/page_drink_disable_n2/bn_match_milk_coconut.png
+++ b/image/page_drink_disable_n2/bn_match_milk_coconut.png
--- a/image/page_drink_disable_n2/bn_southern_fusion_tea.png
+++ b/image/page_drink_disable_n2/bn_southern_fusion_tea.png
--- a/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png
+++ b/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png
--- a/image/page_drink_disable_n2/bn_traditional_green_tea.png
+++ b/image/page_drink_disable_n2/bn_traditional_green_tea.png
--- a/image/page_drink_n/bn_black_tea_coconut.png
+++ b/image/page_drink_n/bn_black_tea_coconut.png
--- a/image/page_drink_n/bn_hot_greenteacoffee_lattle.png
+++ b/image/page_drink_n/bn_hot_greenteacoffee_lattle.png
--- a/image/page_drink_n/bn_hot_lime_Matcha.png
+++ b/image/page_drink_n/bn_hot_lime_Matcha.png
--- a/image/page_drink_n/bn_hot_lime_Oolong_tea.png
+++ b/image/page_drink_n/bn_hot_lime_Oolong_tea.png
--- a/image/page_drink_n/bn_hot_limeblack_tea.png
+++ b/image/page_drink_n/bn_hot_limeblack_tea.png
--- a/image/page_drink_n/bn_hot_matcha_latte_Healthy.png
+++ b/image/page_drink_n/bn_hot_matcha_latte_Healthy.png
--- a/image/page_drink_n/bn_hot_matcha_tea.png
+++ b/image/page_drink_n/bn_hot_matcha_tea.png
--- a/image/page_drink_n/bn_hot_oolong_tea.png
+++ b/image/page_drink_n/bn_hot_oolong_tea.png
--- a/image/page_drink_n/bn_hot_strawberry_tea.png
+++ b/image/page_drink_n/bn_hot_strawberry_tea.png
--- a/image/page_drink_n/bn_hot_thai_milk_tea.png
+++ b/image/page_drink_n/bn_hot_thai_milk_tea.png
--- a/image/page_drink_n/bn_hot_thai_milk_tea_coconut.png
+++ b/image/page_drink_n/bn_hot_thai_milk_tea_coconut.png
--- a/image/page_drink_n/bn_hot_thai_tea.png
+++ b/image/page_drink_n/bn_hot_thai_tea.png
--- a/image/page_drink_n/bn_hot_ume_tea.png
+++ b/image/page_drink_n/bn_hot_ume_tea.png
--- a/image/page_drink_n/bn_hot_yuzu_tea.png
+++ b/image/page_drink_n/bn_hot_yuzu_tea.png
--- a/image/page_drink_n/bn_iced_matcha_tea_coconut.png
+++ b/image/page_drink_n/bn_iced_matcha_tea_coconut.png
--- a/image/page_drink_n/bn_limeblack_tea_SingPark.png
+++ b/image/page_drink_n/bn_limeblack_tea_SingPark.png
--- a/image/page_drink_n/bn_match_milk_coconut.png
+++ b/image/page_drink_n/bn_match_milk_coconut.png
--- a/image/page_drink_n/bn_thai_black_tea_SingPark.png
+++ b/image/page_drink_n/bn_thai_black_tea_SingPark.png
--- a/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_Coconut_Milk_Matcha_Smoothie.png
+++ b/image/page_drink_picture2_n/bn_Coconut_Milk_Matcha_Smoothie.png
--- a/image/page_drink_picture2_n/bn_black_tea_coconut.png
+++ b/image/page_drink_picture2_n/bn_black_tea_coconut.png
--- a/image/page_drink_picture2_n/bn_hot_Yuzu_tea.png
+++ b/image/page_drink_picture2_n/bn_hot_Yuzu_tea.png
--- a/image/page_drink_picture2_n/bn_hot_greenteacoffee_lattle.png
+++ b/image/page_drink_picture2_n/bn_hot_greenteacoffee_lattle.png
--- a/image/page_drink_picture2_n/bn_hot_lime_Matcha.png
+++ b/image/page_drink_picture2_n/bn_hot_lime_Matcha.png
--- a/image/page_drink_picture2_n/bn_hot_lime_Oolong_tea.png
+++ b/image/page_drink_picture2_n/bn_hot_lime_Oolong_tea.png
--- a/image/page_drink_picture2_n/bn_hot_limeblack_tea.png
+++ b/image/page_drink_picture2_n/bn_hot_limeblack_tea.png
--- a/image/page_drink_picture2_n/bn_hot_matcha_latte_Healthy.png
+++ b/image/page_drink_picture2_n/bn_hot_matcha_latte_Healthy.png
--- a/image/page_drink_picture2_n/bn_hot_matcha_milk_tea.png
+++ b/image/page_drink_picture2_n/bn_hot_matcha_milk_tea.png
--- a/image/page_drink_picture2_n/bn_hot_matcha_tea.png
+++ b/image/page_drink_picture2_n/bn_hot_matcha_tea.png
--- a/image/page_drink_picture2_n/bn_hot_oolong_tea.png
+++ b/image/page_drink_picture2_n/bn_hot_oolong_tea.png
--- a/image/page_drink_picture2_n/bn_hot_strawberry_tea.png
+++ b/image/page_drink_picture2_n/bn_hot_strawberry_tea.png
--- a/image/page_drink_picture2_n/bn_hot_thai_milk_tea.png
+++ b/image/page_drink_picture2_n/bn_hot_thai_milk_tea.png
--- a/image/page_drink_picture2_n/bn_hot_thai_milk_tea_coconut.png
+++ b/image/page_drink_picture2_n/bn_hot_thai_milk_tea_coconut.png
--- a/image/page_drink_picture2_n/bn_hot_thai_tea.png
+++ b/image/page_drink_picture2_n/bn_hot_thai_tea.png
--- a/image/page_drink_picture2_n/bn_hot_ume_tea.png
+++ b/image/page_drink_picture2_n/bn_hot_ume_tea.png
--- a/image/page_drink_picture2_n/bn_iced_matcha_tea_coconut.png
+++ b/image/page_drink_picture2_n/bn_iced_matcha_tea_coconut.png
--- a/image/page_drink_picture2_n/bn_match_milk_coconut.png
+++ b/image/page_drink_picture2_n/bn_match_milk_coconut.png
--- a/image/page_drink_picture2_n/bn_southern_fusion_tea.png
+++ b/image/page_drink_picture2_n/bn_southern_fusion_tea.png
--- a/image/page_drink_picture2_n/bn_traditional_green_tea.png
+++ b/image/page_drink_picture2_n/bn_traditional_green_tea.png
--- a/image/page_drink_press_n/bn_black_tea_coconut.png
+++ b/image/page_drink_press_n/bn_black_tea_coconut.png
--- a/image/page_drink_press_n/bn_hot_Yuzu_tea.png
+++ b/image/page_drink_press_n/bn_hot_Yuzu_tea.png
--- a/image/page_drink_press_n/bn_hot_greenteacoffee_lattle.png
+++ b/image/page_drink_press_n/bn_hot_greenteacoffee_lattle.png
--- a/image/page_drink_press_n/bn_hot_lime_Matcha.png
+++ b/image/page_drink_press_n/bn_hot_lime_Matcha.png
--- a/image/page_drink_press_n/bn_hot_lime_Oolong_tea.png
+++ b/image/page_drink_press_n/bn_hot_lime_Oolong_tea.png
--- a/image/page_drink_press_n/bn_hot_limeblack_tea.png
+++ b/image/page_drink_press_n/bn_hot_limeblack_tea.png
--- a/image/page_drink_press_n/bn_hot_matcha_latte_Healthy.png
+++ b/image/page_drink_press_n/bn_hot_matcha_latte_Healthy.png
--- a/image/page_drink_press_n/bn_hot_matcha_tea.png
+++ b/image/page_drink_press_n/bn_hot_matcha_tea.png
--- a/image/page_drink_press_n/bn_hot_oolong_tea.png
+++ b/image/page_drink_press_n/bn_hot_oolong_tea.png
--- a/image/page_drink_press_n/bn_hot_strawberry_tea.png
+++ b/image/page_drink_press_n/bn_hot_strawberry_tea.png
--- a/image/page_drink_press_n/bn_hot_thai_milk_tea.png
+++ b/image/page_drink_press_n/bn_hot_thai_milk_tea.png
--- a/image/page_drink_press_n/bn_hot_thai_milk_tea_coconut.png
+++ b/image/page_drink_press_n/bn_hot_thai_milk_tea_coconut.png
--- a/image/page_drink_press_n/bn_hot_thai_tea.png
+++ b/image/page_drink_press_n/bn_hot_thai_tea.png
--- a/image/page_drink_press_n/bn_hot_ume_tea.png
+++ b/image/page_drink_press_n/bn_hot_ume_tea.png
--- a/image/page_drink_press_n/bn_iced_matcha_tea_coconut.png
+++ b/image/page_drink_press_n/bn_iced_matcha_tea_coconut.png
--- a/image/page_drink_press_n/bn_limeblack_tea_SingPark.png
+++ b/image/page_drink_press_n/bn_limeblack_tea_SingPark.png
--- a/image/page_drink_press_n/bn_match_milk_coconut.png
+++ b/image/page_drink_press_n/bn_match_milk_coconut.png
--- a/image/page_drink_press_n/bn_southern_fusion_tea.png
+++ b/image/page_drink_press_n/bn_southern_fusion_tea.png
--- a/image/page_drink_press_n/bn_thai_black_tea_SingPark.png
+++ b/image/page_drink_press_n/bn_thai_black_tea_SingPark.png
--- a/image/page_drink_press_n/bn_traditional_green_tea.png
+++ b/image/page_drink_press_n/bn_traditional_green_tea.png
--- a/image/sleepmode/btnlite.png
+++ b/image/sleepmode/btnlite.png
--- a/image/sleepmode/btnlitebg.png
+++ b/image/sleepmode/btnlitebg.png
--- a/image/sleepmode/sleepmodestaticbg.png
+++ b/image/sleepmode/sleepmodestaticbg.png
--- a/image/sleepmode/waitingbtnlite.png
+++ b/image/sleepmode/waitingbtnlite.png
--- a/inc/button_remove_cup.inc
+++ b/inc/button_remove_cup.inc
@ -0,0 +1,14 @@
+<Button>
+<X> btnRemoveCupX </X>
+<Y> btnRemoveCupYNotPageBoard </Y>
+<State> buttonRemoveCup </State>
+;<Color> "0x00BDFF" </Color>
+<Interval> 500 </Interval>
+<Filename> bnRemoveCup </Filename>
+<Filename> bpRemoveCup </Filename>
+<EventClick> 
+    Machine RemoveCup
+    Machine DoorLidOpen
+    Var buttonRemoveCup = "Invisible"
+</EventClick>
+</Button>
--- a/inc/video.inc
+++ b/inc/video.inc
@ -107,8 +107,8 @@
            If ProReducedPriceEnable = 1 Then
                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
            EndIf
-            If IgnoreProfileFromRunEV = 1 Then
-                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
+            If ProMelonEnable = 1 Then
+                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_26.mp4"
            EndIf
            If UseSlideShowVideo = 1 Then
                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
@ -205,8 +205,8 @@
        If ProReducedPriceEnable = 1 Then
            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
        EndIf
-        If IgnoreProfileFromRunEV = 1 Then
-            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
+        If ProMelonEnable = 1 Then
+            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_26.mp4"
        EndIf
        If UseSlideShowVideo = 1 Then
            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
@ -311,8 +311,8 @@
            If ProReducedPriceEnable = 1 Then
                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
            EndIf
-            If IgnoreProfileFromRunEV = 1 Then
-                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
+            If ProMelonEnable = 1 Then
+                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_26.mp4"
            EndIf
            If UseSlideShowVideo = 1 Then
                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
@ -374,6 +374,10 @@
            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
        EndIf

+        If ProMelonEnable = 1 Then
+            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_26.mp4"
+        EndIf
+
        If UseSlideShowVideo = 1 Then
            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
        EndIf
--- a/inter/aus/image/catalog/bn_diy_FLYING_TURTLE.png
+++ b/inter/aus/image/catalog/bn_diy_FLYING_TURTLE.png
--- a/inter/aus/image/catalog/bp_diy_FLYING_TURTLE.png
+++ b/inter/aus/image/catalog/bp_diy_FLYING_TURTLE.png
--- a/inter/aus/image/main_page/bn_remove_cup.png
+++ b/inter/aus/image/main_page/bn_remove_cup.png
--- a/inter/aus/image/main_page/bp_remove_cup.png
+++ b/inter/aus/image/main_page/bp_remove_cup.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png
--- a/inter/aus/image/page_drink_n/bn_iced_energy_drink_soda.png
+++ b/inter/aus/image/page_drink_n/bn_iced_energy_drink_soda.png
--- a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_soda.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_soda.png
--- a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_soda.png
+++ b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_soda.png
--- a/inter/aus/xml/event/promotion_2.xml
+++ b/inter/aus/xml/event/promotion_2.xml
@ -12217,20 +12217,7 @@



-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-    Var buttonRemoveCup = "Invisible"
-</EventClick>
-</Button>
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"



--- a/inter/aus/xml/event/promotion_3.xml
+++ b/inter/aus/xml/event/promotion_3.xml
@ -12217,20 +12217,7 @@



-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-    Var buttonRemoveCup = "Invisible"
-</EventClick>
-</Button>
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"



--- a/inter/aus/xml/event/promotion_anniversary_1st.lxml
+++ b/inter/aus/xml/event/promotion_anniversary_1st.lxml
@ -12118,20 +12118,7 @@



-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
-<EventClick>
-    Machine RemoveCup
-    Machine DoorLidOpen
-    Var buttonRemoveCup = "Invisible"
-</EventClick>
-</Button>
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"



--- a/inter/aus/xml/event/promotion_coconut.xml
+++ b/inter/aus/xml/event/promotion_coconut.xml
@ -13063,20 +13063,7 @@



-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-    Var buttonRemoveCup = "Invisible"
-</EventClick>
-</Button>
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"



--- a/inter/aus/xml/event/promotion_pepsi_099.lxml
+++ b/inter/aus/xml/event/promotion_pepsi_099.lxml
@ -12217,20 +12217,7 @@



-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
-<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-    Var buttonRemoveCup = "Invisible"
-</EventClick>
-</Button>
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"



--- a/Show more
+++ b/Show more