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

2025-02-17 09:12:50 +07:00 · 2025-02-17 09:12:50 +07:00 · ab2c6e6976
commit ab2c6e6976
parent b008ab55fe 62c44f8c17
1068 changed files with 345745 additions and 284584 deletions
--- a/inter/aus/image/event/image_template1
+++ b/inter/aus/image/event/image_template1
@ -1,6 +1,3 @@
-normal_eng=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
-normal_thai=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
-press_eng=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
-press_thai=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
-disable_eng=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
-disable_thai=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
+normal_eng=ROOT/taobin_project/inter/aus/image/event/valentine_banner.png
+disable_eng=ROOT/taobin_project/inter/aus/image/event/valentine_banner.png
+press_eng=ROOT/taobin_project/inter/aus/image/event/valentine_banner.png
--- a/inter/aus/image/event/valentine_banner.png
+++ b/inter/aus/image/event/valentine_banner.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LYCHEE_SODA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LYCHEE_SODA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MILK.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MILK.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SMOOTHIE.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SMOOTHIE.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Yuzu_americano_pro_valentine.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Yuzu_americano_pro_valentine.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_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_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_strawberrycocoa_smoothie.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda_pro_valentine.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda_pro_valentine.png
--- a/inter/aus/image/page_drink_disable_n2/bn_jasmine_milk_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_jasmine_milk_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_melon_americano.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_melon_americano.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_thai_milk_tea_SingPark_pro_valentine.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark_pro_valentine.png
--- a/inter/aus/image/page_drink_fail/bn_door_open.png
+++ b/inter/aus/image/page_drink_fail/bn_door_open.png
--- a/inter/aus/image/page_drink_fail/bp_door_open.png
+++ b/inter/aus/image/page_drink_fail/bp_door_open.png
--- a/inter/aus/image/page_drink_fail/remove_cup.png
+++ b/inter/aus/image/page_drink_fail/remove_cup.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_LYCHEE_SODA.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_LYCHEE_SODA.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_MILK.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_MILK.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_PEPSI.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_PEPSI.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_SMOOTHIE.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_SMOOTHIE.png
--- a/inter/aus/image/page_drink_n/bn_Mint_Oreo_smoothie.png
+++ b/inter/aus/image/page_drink_n/bn_Mint_Oreo_smoothie.png
--- a/inter/aus/image/page_drink_n/bn_Yuzu_americano_pro_valentine.png
+++ b/inter/aus/image/page_drink_n/bn_Yuzu_americano_pro_valentine.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_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_lemonade_soda.png
+++ b/inter/aus/image/page_drink_n/bn_iced_lemonade_soda.png
--- a/inter/aus/image/page_drink_n/bn_iced_strawberrycocoa_smoothie.png
+++ b/inter/aus/image/page_drink_n/bn_iced_strawberrycocoa_smoothie.png
--- a/inter/aus/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png
+++ b/inter/aus/image/page_drink_n/bn_iced_strawberrymilk_smoothie.png
--- a/inter/aus/image/page_drink_n/bn_iced_yuzu_soda_pro_valentine.png
+++ b/inter/aus/image/page_drink_n/bn_iced_yuzu_soda_pro_valentine.png
--- a/inter/aus/image/page_drink_n/bn_jasmine_milk_tea.png
+++ b/inter/aus/image/page_drink_n/bn_jasmine_milk_tea.png
--- a/inter/aus/image/page_drink_n/bn_melon_americano.png
+++ b/inter/aus/image/page_drink_n/bn_melon_americano.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_thai_milk_tea_SingPark_pro_valentine.png
+++ b/inter/aus/image/page_drink_n/bn_thai_milk_tea_SingPark_pro_valentine.png
--- a/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Pie.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_Bananoffee_Pie.png
--- a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_AMERICANO.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_AMERICANO.png
--- a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LYCHEE_SODA.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_LYCHEE_SODA.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_COCONUT_PEPSI.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_PEPSI.png
--- a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_SMOOTHIE.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_SMOOTHIE.png
--- a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_SODA.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_SODA.png
--- a/inter/aus/image/page_drink_picture2_n/bn_COCONUT_THAI_MILK_TEA.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_COCONUT_THAI_MILK_TEA.png
--- a/inter/aus/image/page_drink_picture2_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_picture2_n/bn_Caramel_choc_espresso.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_Caramel_choc_espresso.png
--- a/inter/aus/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_Choc_caramel_crumble.png
--- a/inter/aus/image/page_drink_picture2_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_picture2_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_picture2_n/bn_Melon_matcha_iced_tea.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_Melon_matcha_iced_tea.png
--- a/inter/aus/image/page_drink_picture2_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_picture2_n/bn_Mint_Milk_Straw_Biscoff.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_Mint_Milk_Straw_Biscoff.png
--- a/inter/aus/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie.png
--- a/inter/aus/image/page_drink_picture2_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_picture2_n/bn_Yuzu_americano_pro_valentine.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_Yuzu_americano_pro_valentine.png
--- a/inter/aus/image/page_drink_picture2_n/bn_hot_COCONUT_JASMINE_TEA.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_hot_COCONUT_JASMINE_TEA.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_latte_with_twist.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_hot_latte_with_twist.png
--- a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee.png
--- a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_jasmine_tea.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_jasmine_tea.png
--- a/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_matcha_tea.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_Lychee_matcha_tea.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_Melon_jasmine_tea.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_Melon_jasmine_tea.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_caramel_Biscoff.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_caramel_Biscoff.png
--- a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Lychee_soda.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Lychee_soda.png
--- a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_melon_soda.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_melon_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_picture2_n/bn_iced_yuzu_soda_pro_valentine.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_iced_yuzu_soda_pro_valentine.png
--- a/inter/aus/image/page_drink_picture2_n/bn_protein_Vanilla.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_protein_Vanilla.png
--- a/inter/aus/image/page_drink_picture2_n/bn_protein_espresso_caramel.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_protein_espresso_caramel.png
--- a/inter/aus/image/page_drink_picture2_n/bn_thai_black_tea_SingPark.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_thai_black_tea_SingPark.png
--- a/inter/aus/image/page_drink_picture2_n/bn_thai_milk_tea_SingPark_pro_valentine.png
+++ b/inter/aus/image/page_drink_picture2_n/bn_thai_milk_tea_SingPark_pro_valentine.png
--- a/inter/aus/image/page_drink_press_n/bn_COCONUT_LYCHEE_SODA.png
+++ b/inter/aus/image/page_drink_press_n/bn_COCONUT_LYCHEE_SODA.png
--- a/inter/aus/image/page_drink_press_n/bn_COCONUT_MILK.png
+++ b/inter/aus/image/page_drink_press_n/bn_COCONUT_MILK.png
--- a/inter/aus/image/page_drink_press_n/bn_COCONUT_PEPSI.png
+++ b/inter/aus/image/page_drink_press_n/bn_COCONUT_PEPSI.png
--- a/inter/aus/image/page_drink_press_n/bn_COCONUT_SMOOTHIE.png
+++ b/inter/aus/image/page_drink_press_n/bn_COCONUT_SMOOTHIE.png
--- a/inter/aus/image/page_drink_press_n/bn_Yuzu_americano_pro_valentine.png
+++ b/inter/aus/image/page_drink_press_n/bn_Yuzu_americano_pro_valentine.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_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_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_strawberrycocoa_smoothie.png
+++ b/inter/aus/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie.png
--- a/inter/aus/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png
+++ b/inter/aus/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie.png
--- a/inter/aus/image/page_drink_press_n/bn_iced_yuzu_soda_pro_valentine.png
+++ b/inter/aus/image/page_drink_press_n/bn_iced_yuzu_soda_pro_valentine.png
--- a/inter/aus/image/page_drink_press_n/bn_jasmine_milk_tea.png
+++ b/inter/aus/image/page_drink_press_n/bn_jasmine_milk_tea.png
--- a/inter/aus/image/page_drink_press_n/bn_melon_americano.png
+++ b/inter/aus/image/page_drink_press_n/bn_melon_americano.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/inter/aus/image/page_drink_press_n/bn_thai_milk_tea_SingPark_pro_valentine.png
+++ b/inter/aus/image/page_drink_press_n/bn_thai_milk_tea_SingPark_pro_valentine.png
--- a/inter/aus/image/vending_error_en/img_error_aus.png
+++ b/inter/aus/image/vending_error_en/img_error_aus.png
--- a/Show more
+++ b/Show more