merged again

2025-02-10 17:05:16 +07:00 · 2025-02-10 17:05:16 +07:00 · 0237fc0096
commit 0237fc0096
parent e43a3f46e3 ad97882d2f
209 changed files with 22590 additions and 13675 deletions
--- a/image/event/swensen/bn_swensen_pay_code.png
+++ b/image/event/swensen/bn_swensen_pay_code.png
--- a/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_disable_n2/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_disable_n2/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_disable_n2/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_fruit_punch_Ume_Jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_fruit_punch_Ume_Jemila.png
--- a/image/page_drink_disable_n2/bn_iced_fruit_punch_Yuzu_Jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_fruit_punch_Yuzu_Jemila.png
--- a/image/page_drink_n/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_n/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_n/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_n/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
+++ b/image/page_drink_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
--- a/image/page_drink_n/bn_iced_fruit_punch_Ume_Jemila.png
+++ b/image/page_drink_n/bn_iced_fruit_punch_Ume_Jemila.png
--- a/image/page_drink_n/bn_iced_fruit_punch_Yuzu_Jemila.png
+++ b/image/page_drink_n/bn_iced_fruit_punch_Yuzu_Jemila.png
--- a/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_picture2_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_picture2_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_picture2_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
--- a/image/page_drink_picture2_n/bn_iced_fruit_punch_Ume_Jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_fruit_punch_Ume_Jemila.png
--- a/image/page_drink_picture2_n/bn_iced_fruit_punch_Yuzu_Jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_fruit_punch_Yuzu_Jemila.png
--- a/image/page_drink_press_n/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_press_n/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_press_n/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_press_n/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_press_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_press_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_press_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
+++ b/image/page_drink_press_n/bn_iced_Fruit_Punch_Lime_Sala_jemila.png
--- a/image/page_drink_press_n/bn_iced_fruit_punch_Ume_Jemila.png
+++ b/image/page_drink_press_n/bn_iced_fruit_punch_Ume_Jemila.png
--- a/image/page_drink_press_n/bn_iced_fruit_punch_Yuzu_Jemila.png
+++ b/image/page_drink_press_n/bn_iced_fruit_punch_Yuzu_Jemila.png
--- a/image/sleepmode/bd_press.png
+++ b/image/sleepmode/bd_press.png
--- a/image/sleepmode/bn_press.png
+++ b/image/sleepmode/bn_press.png
--- a/image/sleepmode/bp_press.png
+++ b/image/sleepmode/bp_press.png
--- a/image/sleepmode/cancle_bn.png
+++ b/image/sleepmode/cancle_bn.png
--- a/image/sleepmode/cancle_bp.png
+++ b/image/sleepmode/cancle_bp.png
--- a/image/sleepmode/close_bn.png
+++ b/image/sleepmode/close_bn.png
--- a/image/sleepmode/close_bp.png
+++ b/image/sleepmode/close_bp.png
--- a/image/sleepmode/ok_bn.png
+++ b/image/sleepmode/ok_bn.png
--- a/image/sleepmode/ok_bp.png
+++ b/image/sleepmode/ok_bp.png
--- a/image/sleepmode/opacitypopup.png
+++ b/image/sleepmode/opacitypopup.png
--- a/image/sleepmode/popup.png
+++ b/image/sleepmode/popup.png
--- a/image/sleepmode/taobinlogo.png
+++ b/image/sleepmode/taobinlogo.png
--- 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_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/Show more
+++ b/Show more