Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

2025-07-01 13:29:46 +07:00 · 2025-07-01 13:29:46 +07:00 · 23d9017d71
commit 23d9017d71
parent ac565b6da8 7a86a84e92
145 changed files with 7013 additions and 2871 deletions
--- a/inter/aus/configure.ev
+++ b/inter/aus/configure.ev
@ -1,6 +1,6 @@

 	If BoxID = 200027 Then
-		Var EnableMultiInstanceFromBoxID = 1
+	    Var EnableMultiInstanceFromBoxID = 0
 	EndIf

 	READ_FILE "/mnt/sdcard/enable_ui_v3" EnableMultiInstanceFromConfig
--- a/inter/aus/image/event/hug_in_a_cup_banner.png
+++ b/inter/aus/image/event/hug_in_a_cup_banner.png
--- a/inter/aus/image/event/image_template3
+++ b/inter/aus/image/event/image_template3
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/inter/aus/image/event/happy_easter_banner.png
-normal_thai=ROOT/taobin_project/inter/aus/image/event/happy_easter_banner.png
-press_eng=ROOT/taobin_project/inter/aus/image/event/happy_easter_banner.png
-press_thai=ROOT/taobin_project/inter/aus/image/event/happy_easter_banner.png
-disable_eng=ROOT/taobin_project/inter/aus/image/event/happy_easter_banner.png
-disable_thai=ROOT/taobin_project/inter/aus/image/event/happy_easter_banner.png
+normal_eng=ROOT/taobin_project/inter/aus/image/event/hug_in_a_cup_banner.png
+normal_thai=ROOT/taobin_project/inter/aus/image/event/hug_in_a_cup_banner.png
+press_eng=ROOT/taobin_project/inter/aus/image/event/hug_in_a_cup_banner.png
+press_thai=ROOT/taobin_project/inter/aus/image/event/hug_in_a_cup_banner.png
+disable_eng=ROOT/taobin_project/inter/aus/image/event/hug_in_a_cup_banner.png
+disable_thai=ROOT/taobin_project/inter/aus/image/event/hug_in_a_cup_banner.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Matcha_Latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Yuzu_Soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Yuzu_Soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte_hug_in_a_cup.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte_hug_in_a_cup.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_milk_tea_sing.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_milk_tea_sing.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_tea_sing.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_tea_sing.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_lemonade_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_lemonade_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_strawberry_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_strawberry_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda_hug_in_a_cup.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda_hug_in_a_cup.png
--- a/inter/aus/image/page_drink_disable_n2/bn_jasmine_milk_tea_hug_in_a_cup.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_jasmine_milk_tea_hug_in_a_cup.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_Chocolate.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_Chocolate.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_Matcha.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_Matcha.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_Strawberry.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_Strawberry.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_Thaitea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_Thaitea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_caramel.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_caramel.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_espresso.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_espresso.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_isolated.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_isolated.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_melon.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_melon.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_milk.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_n/bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_n/bn_Hot_Vanilla_Latte_Coffee_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_n/bn_Mint_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_n/bn_Mint_Matcha_Latte.png
--- a/inter/aus/image/page_drink_n/bn_Mint_Yuzu_Soda.png
+++ b/inter/aus/image/page_drink_n/bn_Mint_Yuzu_Soda.png
--- a/inter/aus/image/page_drink_n/bn_hot_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_n/bn_hot_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_n/bn_hot_caramel_latte_hug_in_a_cup.png
+++ b/inter/aus/image/page_drink_n/bn_hot_caramel_latte_hug_in_a_cup.png
--- a/inter/aus/image/page_drink_n/bn_hot_matcha_milk_tea.png
+++ b/inter/aus/image/page_drink_n/bn_hot_matcha_milk_tea.png
--- a/inter/aus/image/page_drink_n/bn_hot_matcha_milk_tea_sing.png
+++ b/inter/aus/image/page_drink_n/bn_hot_matcha_milk_tea_sing.png
--- a/inter/aus/image/page_drink_n/bn_hot_matcha_tea.png
+++ b/inter/aus/image/page_drink_n/bn_hot_matcha_tea.png
--- a/inter/aus/image/page_drink_n/bn_hot_matcha_tea_sing.png
+++ b/inter/aus/image/page_drink_n/bn_hot_matcha_tea_sing.png
--- a/inter/aus/image/page_drink_n/bn_iced_Lychee_soda.png
+++ b/inter/aus/image/page_drink_n/bn_iced_Lychee_soda.png
--- a/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png
--- a/inter/aus/image/page_drink_n/bn_iced_lemonade_soda.png
+++ b/inter/aus/image/page_drink_n/bn_iced_lemonade_soda.png
--- a/inter/aus/image/page_drink_n/bn_iced_strawberry_soda.png
+++ b/inter/aus/image/page_drink_n/bn_iced_strawberry_soda.png
--- a/inter/aus/image/page_drink_n/bn_iced_yuzu_soda.png
+++ b/inter/aus/image/page_drink_n/bn_iced_yuzu_soda.png
--- a/inter/aus/image/page_drink_n/bn_iced_yuzu_soda_hug_in_a_cup.png
+++ b/inter/aus/image/page_drink_n/bn_iced_yuzu_soda_hug_in_a_cup.png
--- a/inter/aus/image/page_drink_n/bn_jasmine_milk_tea_hug_in_a_cup.png
+++ b/inter/aus/image/page_drink_n/bn_jasmine_milk_tea_hug_in_a_cup.png
--- a/inter/aus/image/page_drink_n/bn_protein_Chocolate.png
+++ b/inter/aus/image/page_drink_n/bn_protein_Chocolate.png
--- a/inter/aus/image/page_drink_n/bn_protein_Matcha.png
+++ b/inter/aus/image/page_drink_n/bn_protein_Matcha.png
--- a/inter/aus/image/page_drink_n/bn_protein_Mocha.png
+++ b/inter/aus/image/page_drink_n/bn_protein_Mocha.png
--- a/inter/aus/image/page_drink_n/bn_protein_Strawberry.png
+++ b/inter/aus/image/page_drink_n/bn_protein_Strawberry.png
--- a/inter/aus/image/page_drink_n/bn_protein_Thaitea.png
+++ b/inter/aus/image/page_drink_n/bn_protein_Thaitea.png
--- a/inter/aus/image/page_drink_n/bn_protein_caramel.png
+++ b/inter/aus/image/page_drink_n/bn_protein_caramel.png
--- a/inter/aus/image/page_drink_n/bn_protein_espresso.png
+++ b/inter/aus/image/page_drink_n/bn_protein_espresso.png
--- a/inter/aus/image/page_drink_n/bn_protein_isolated.png
+++ b/inter/aus/image/page_drink_n/bn_protein_isolated.png
--- a/inter/aus/image/page_drink_n/bn_protein_melon.png
+++ b/inter/aus/image/page_drink_n/bn_protein_melon.png
--- a/inter/aus/image/page_drink_n/bn_protein_milk.png
+++ b/inter/aus/image/page_drink_n/bn_protein_milk.png
--- a/inter/aus/image/page_drink_n/bn_smoothie_oreo.png
+++ b/inter/aus/image/page_drink_n/bn_smoothie_oreo.png
--- a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_picture2_n/bn_Mint_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_Mint_Matcha_Latte.png
--- a/inter/aus/image/page_drink_picture2_n/bn_Mint_Yuzu_Soda.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_Mint_Yuzu_Soda.png
--- a/inter/aus/image/page_drink_picture2_n/bn_hot_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_hot_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_picture2_n/bn_hot_caramel_latte_hug_in_a_cup.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_hot_caramel_latte_hug_in_a_cup.png
--- a/inter/aus/image/page_drink_picture2_n/bn_hot_matcha_milk_tea.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_hot_matcha_milk_tea.png
--- a/inter/aus/image/page_drink_picture2_n/bn_hot_matcha_milk_tea_sing.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_hot_matcha_milk_tea_sing.png
--- a/inter/aus/image/page_drink_picture2_n/bn_hot_matcha_tea.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_hot_matcha_tea.png
--- a/inter/aus/image/page_drink_picture2_n/bn_hot_matcha_tea_sing.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_hot_matcha_tea_sing.png
--- a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_soda.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_soda.png
--- a/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_Strawberry_Matcha_Latte.png
--- a/inter/aus/image/page_drink_picture2_n/bn_iced_lemonade_soda.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_lemonade_soda.png
--- a/inter/aus/image/page_drink_picture2_n/bn_iced_strawberry_soda.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_strawberry_soda.png
--- a/inter/aus/image/page_drink_picture2_n/bn_iced_yuzu_soda.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_yuzu_soda.png
--- a/inter/aus/image/page_drink_picture2_n/bn_iced_yuzu_soda_hug_in_a_cup.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_yuzu_soda_hug_in_a_cup.png
--- a/inter/aus/image/page_drink_picture2_n/bn_jasmine_milk_tea_hug_in_a_cup.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_jasmine_milk_tea_hug_in_a_cup.png
--- a/inter/aus/image/page_drink_picture2_n/bn_protein_Chocolate.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_protein_Chocolate.png
--- a/inter/aus/image/page_drink_picture2_n/bn_protein_Matcha.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_protein_Matcha.png
--- a/inter/aus/image/page_drink_picture2_n/bn_protein_Mocha.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_protein_Mocha.png
--- a/inter/aus/image/page_drink_picture2_n/bn_protein_Strawberry.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_protein_Strawberry.png
--- a/inter/aus/image/page_drink_picture2_n/bn_protein_Thaitea.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_protein_Thaitea.png
--- a/inter/aus/image/page_drink_picture2_n/bn_protein_caramel.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_protein_caramel.png
--- a/inter/aus/image/page_drink_picture2_n/bn_protein_espresso.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_protein_espresso.png
--- a/inter/aus/image/page_drink_picture2_n/bn_protein_isolated.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_protein_isolated.png
--- a/inter/aus/image/page_drink_picture2_n/bn_protein_melon.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_protein_melon.png
--- a/inter/aus/image/page_drink_picture2_n/bn_protein_milk.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_protein_milk.png
--- a/inter/aus/image/page_drink_press_n/bn_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_press_n/bn_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_press_n/bn_Mint_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_press_n/bn_Mint_Matcha_Latte.png
--- a/inter/aus/image/page_drink_press_n/bn_Mint_Yuzu_Soda.png
+++ b/inter/aus/image/page_drink_press_n/bn_Mint_Yuzu_Soda.png
--- a/inter/aus/image/page_drink_press_n/bn_hot_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_press_n/bn_hot_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_press_n/bn_hot_caramel_latte_hug_in_a_cup.png
+++ b/inter/aus/image/page_drink_press_n/bn_hot_caramel_latte_hug_in_a_cup.png
--- a/inter/aus/image/page_drink_press_n/bn_hot_matcha_milk_tea.png
+++ b/inter/aus/image/page_drink_press_n/bn_hot_matcha_milk_tea.png
--- a/inter/aus/image/page_drink_press_n/bn_hot_matcha_milk_tea_sing.png
+++ b/inter/aus/image/page_drink_press_n/bn_hot_matcha_milk_tea_sing.png
--- a/inter/aus/image/page_drink_press_n/bn_hot_matcha_tea.png
+++ b/inter/aus/image/page_drink_press_n/bn_hot_matcha_tea.png
--- a/inter/aus/image/page_drink_press_n/bn_hot_matcha_tea_sing.png
+++ b/inter/aus/image/page_drink_press_n/bn_hot_matcha_tea_sing.png
--- a/inter/aus/image/page_drink_press_n/bn_iced_Lychee_soda.png
+++ b/inter/aus/image/page_drink_press_n/bn_iced_Lychee_soda.png
--- a/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_press_n/bn_iced_Strawberry_Matcha_Latte.png
--- a/inter/aus/image/page_drink_press_n/bn_iced_lemonade_soda.png
+++ b/inter/aus/image/page_drink_press_n/bn_iced_lemonade_soda.png
--- a/inter/aus/image/page_drink_press_n/bn_iced_strawberry_soda.png
+++ b/inter/aus/image/page_drink_press_n/bn_iced_strawberry_soda.png
--- a/inter/aus/image/page_drink_press_n/bn_iced_yuzu_soda.png
+++ b/inter/aus/image/page_drink_press_n/bn_iced_yuzu_soda.png
--- a/inter/aus/image/page_drink_press_n/bn_iced_yuzu_soda_hug_in_a_cup.png
+++ b/inter/aus/image/page_drink_press_n/bn_iced_yuzu_soda_hug_in_a_cup.png
--- a/inter/aus/image/page_drink_press_n/bn_jasmine_milk_tea_hug_in_a_cup.png
+++ b/inter/aus/image/page_drink_press_n/bn_jasmine_milk_tea_hug_in_a_cup.png
--- a/inter/aus/image/page_drink_press_n/bn_protein_Chocolate.png
+++ b/inter/aus/image/page_drink_press_n/bn_protein_Chocolate.png
--- a/Show more
+++ b/Show more