fix conflict

2024-07-01 16:13:02 +07:00 · 2024-07-01 16:13:02 +07:00 · 1aa230bc9f
commit 1aa230bc9f
parent 1301258344 508d332688
313 changed files with 104942 additions and 5139 deletions
--- a/adv/taobin_adv_menu_01.mp4
+++ b/adv/taobin_adv_menu_01.mp4
--- a/image/event/cocoa77/cocoa77.mp4
+++ b/image/event/cocoa77/cocoa77.mp4
--- a/image/event/cocoa77/cocoa77.png
+++ b/image/event/cocoa77/cocoa77.png
--- a/image/event/image_template1
+++ b/image/event/image_template1
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png
-normal_thai=ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png
-press_eng=ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png
-press_thai=ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png
-disable_eng=ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png
-disable_thai=ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png
+normal_eng=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
+normal_thai=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
+press_eng=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
+press_thai=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
+disable_eng=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
+disable_thai=ROOT/taobin_project/image/event/cocoa77/cocoa77.png
--- a/image/page_drink_disable_n2/bn_ChocoBanana_milk_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_ChocoBanana_milk_cocoa77.png
--- a/image/page_drink_disable_n2/bn_ChocoBanana_milk_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_ChocoBanana_milk_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_ChocoOreo_PEPSI_smoothie_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_ChocoOreo_PEPSI_smoothie_cocoa77.png
--- a/image/page_drink_disable_n2/bn_ChocoOreo_PEPSI_smoothie_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_ChocoOreo_PEPSI_smoothie_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_ChocoOreo_smoothie_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_ChocoOreo_smoothie_cocoa77.png
--- a/image/page_drink_disable_n2/bn_ChocoOreo_smoothie_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_ChocoOreo_smoothie_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_ChocoYuzu_milk_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_ChocoYuzu_milk_cocoa77.png
--- a/image/page_drink_disable_n2/bn_ChocoYuzu_milk_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_ChocoYuzu_milk_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_ICED_THAI_TEA_COCAO_CARAMEL_MILK_tea_time_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_ICED_THAI_TEA_COCAO_CARAMEL_MILK_tea_time_cocoa77.png
--- a/image/page_drink_disable_n2/bn_ICED_THAI_TEA_COCAO_CARAMEL_MILK_tea_time_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_ICED_THAI_TEA_COCAO_CARAMEL_MILK_tea_time_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_Mint_Cocoa_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_Mint_Cocoa_cocoa77.png
--- a/image/page_drink_disable_n2/bn_Mint_Cocoa_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_Mint_Cocoa_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_cocoa_MILK_BISCOFF_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_cocoa_MILK_BISCOFF_cocoa77.png
--- a/image/page_drink_disable_n2/bn_cocoa_MILK_BISCOFF_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_cocoa_MILK_BISCOFF_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_dirty_light__peacher.png
+++ b/image/page_drink_disable_n2/bn_dirty_light__peacher.png
--- a/image/page_drink_disable_n2/bn_dirty_light__snowwhite.png
+++ b/image/page_drink_disable_n2/bn_dirty_light__snowwhite.png
--- a/image/page_drink_disable_n2/bn_dirty_light_geisha.png
+++ b/image/page_drink_disable_n2/bn_dirty_light_geisha.png
--- a/image/page_drink_disable_n2/bn_dirty_light_pure_beauty.png
+++ b/image/page_drink_disable_n2/bn_dirty_light_pure_beauty.png
--- a/image/page_drink_disable_n2/bn_dirty_light_rosalyn.png
+++ b/image/page_drink_disable_n2/bn_dirty_light_rosalyn.png
--- a/image/page_drink_disable_n2/bn_dirty_light_whiskydude.png
+++ b/image/page_drink_disable_n2/bn_dirty_light_whiskydude.png
--- a/image/page_drink_disable_n2/bn_hot_Banana_Mocha_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_hot_Banana_Mocha_cocoa77.png
--- a/image/page_drink_disable_n2/bn_hot_Banana_Mocha_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_hot_Banana_Mocha_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_hot_Mint_Mocha_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_hot_Mint_Mocha_cocoa77.png
--- a/image/page_drink_disable_n2/bn_hot_Mint_Mocha_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_hot_Mint_Mocha_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_hot_Mocha_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_hot_Mocha_cocoa77.png
--- a/image/page_drink_disable_n2/bn_hot_Mocha_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_hot_Mocha_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_light_geisha.png
--- a/image/page_drink_disable_n2/bn_hot_americano_light_peacher.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_light_peacher.png
--- a/image/page_drink_disable_n2/bn_hot_americano_light_pure_beauty.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_light_pure_beauty.png
--- a/image/page_drink_disable_n2/bn_hot_americano_light_rosalyn.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_light_rosalyn.png
--- a/image/page_drink_disable_n2/bn_hot_americano_light_snowwhite.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_light_snowwhite.png
--- a/image/page_drink_disable_n2/bn_hot_americano_light_whiskydude.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_light_whiskydude.png
--- a/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png
+++ b/image/page_drink_disable_n2/bn_hot_espresso_light_geisha.png
--- a/image/page_drink_disable_n2/bn_hot_espresso_light_peacher.png
+++ b/image/page_drink_disable_n2/bn_hot_espresso_light_peacher.png
--- a/image/page_drink_disable_n2/bn_hot_espresso_light_pure_beauty.png
+++ b/image/page_drink_disable_n2/bn_hot_espresso_light_pure_beauty.png
--- a/image/page_drink_disable_n2/bn_hot_espresso_light_rosalyn.png
+++ b/image/page_drink_disable_n2/bn_hot_espresso_light_rosalyn.png
--- a/image/page_drink_disable_n2/bn_hot_espresso_light_snowwhite.png
+++ b/image/page_drink_disable_n2/bn_hot_espresso_light_snowwhite.png
--- a/image/page_drink_disable_n2/bn_hot_espresso_light_whiskydude.png
+++ b/image/page_drink_disable_n2/bn_hot_espresso_light_whiskydude.png
--- a/image/page_drink_disable_n2/bn_iced_Choco_strawberry_banana_smoothie_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_iced_Choco_strawberry_banana_smoothie_cocoa77.png
--- a/image/page_drink_disable_n2/bn_iced_Choco_strawberry_banana_smoothie_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_iced_Choco_strawberry_banana_smoothie_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_iced_Cocoa_coconut_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_iced_Cocoa_coconut_cocoa77.png
--- a/image/page_drink_disable_n2/bn_iced_Cocoa_coconut_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_iced_Cocoa_coconut_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_iced_caramel_cocoa_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_iced_caramel_cocoa_cocoa77.png
--- a/image/page_drink_disable_n2/bn_iced_caramel_cocoa_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_iced_caramel_cocoa_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_iced_cocoa_Healthy_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_iced_cocoa_Healthy_cocoa77.png
--- a/image/page_drink_disable_n2/bn_iced_cocoa_Healthy_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_iced_cocoa_Healthy_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_iced_cocoa_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_iced_cocoa_cocoa77.png
--- a/image/page_drink_disable_n2/bn_iced_cocoa_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_iced_cocoa_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_iced_melon_cocoa_smoothie_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_iced_melon_cocoa_smoothie_cocoa77.png
--- a/image/page_drink_disable_n2/bn_iced_melon_cocoa_smoothie_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_iced_melon_cocoa_smoothie_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_cocoa77-1.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_cocoa77-1.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_cocoa77.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_cocoa77_en-1.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_cocoa77_en-1.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_cocoa77_en.png
--- a/image/page_drink_disable_n2/bn_peach_Cocoa_cocoa77.png
+++ b/image/page_drink_disable_n2/bn_peach_Cocoa_cocoa77.png
--- a/image/page_drink_disable_n2/bn_peach_Cocoa_cocoa77_en.png
+++ b/image/page_drink_disable_n2/bn_peach_Cocoa_cocoa77_en.png
--- a/image/page_drink_disable_n2/cocoa_mocha_Healthy_cocoa77.png
+++ b/image/page_drink_disable_n2/cocoa_mocha_Healthy_cocoa77.png
--- a/image/page_drink_disable_n2/cocoa_mocha_Healthy_cocoa77_en.png
+++ b/image/page_drink_disable_n2/cocoa_mocha_Healthy_cocoa77_en.png
--- a/image/page_drink_n/bn_ChocoBanana_milk_cocoa77.png
+++ b/image/page_drink_n/bn_ChocoBanana_milk_cocoa77.png
--- a/image/page_drink_n/bn_ChocoBanana_milk_cocoa77_en.png
+++ b/image/page_drink_n/bn_ChocoBanana_milk_cocoa77_en.png
--- a/image/page_drink_n/bn_ChocoOreo_PEPSI_smoothie_cocoa77.png
+++ b/image/page_drink_n/bn_ChocoOreo_PEPSI_smoothie_cocoa77.png
--- a/image/page_drink_n/bn_ChocoOreo_PEPSI_smoothie_cocoa77_en.png
+++ b/image/page_drink_n/bn_ChocoOreo_PEPSI_smoothie_cocoa77_en.png
--- a/image/page_drink_n/bn_ChocoOreo_smoothie_cocoa77.png
+++ b/image/page_drink_n/bn_ChocoOreo_smoothie_cocoa77.png
--- a/image/page_drink_n/bn_ChocoOreo_smoothie_cocoa77_en.png
+++ b/image/page_drink_n/bn_ChocoOreo_smoothie_cocoa77_en.png
--- a/image/page_drink_n/bn_ChocoYuzu_milk_cocoa77.png
+++ b/image/page_drink_n/bn_ChocoYuzu_milk_cocoa77.png
--- a/image/page_drink_n/bn_ChocoYuzu_milk_cocoa77_en.png
+++ b/image/page_drink_n/bn_ChocoYuzu_milk_cocoa77_en.png
--- a/image/page_drink_n/bn_ICED_THAI_TEA_COCAO_CARAMEL_MILK_tea_time_cocoa77.png
+++ b/image/page_drink_n/bn_ICED_THAI_TEA_COCAO_CARAMEL_MILK_tea_time_cocoa77.png
--- a/image/page_drink_n/bn_ICED_THAI_TEA_COCAO_CARAMEL_MILK_tea_time_cocoa77_en.png
+++ b/image/page_drink_n/bn_ICED_THAI_TEA_COCAO_CARAMEL_MILK_tea_time_cocoa77_en.png
--- a/image/page_drink_n/bn_Mint_Cocoa_cocoa77.png
+++ b/image/page_drink_n/bn_Mint_Cocoa_cocoa77.png
--- a/image/page_drink_n/bn_Mint_Cocoa_cocoa77_en.png
+++ b/image/page_drink_n/bn_Mint_Cocoa_cocoa77_en.png
--- a/image/page_drink_n/bn_cocoa_MILK_BISCOFF_cocoa77.png
+++ b/image/page_drink_n/bn_cocoa_MILK_BISCOFF_cocoa77.png
--- a/image/page_drink_n/bn_cocoa_MILK_BISCOFF_cocoa77_en.png
+++ b/image/page_drink_n/bn_cocoa_MILK_BISCOFF_cocoa77_en.png
--- a/image/page_drink_n/bn_dirty_light__peacher.png
+++ b/image/page_drink_n/bn_dirty_light__peacher.png
--- a/image/page_drink_n/bn_dirty_light__snowwhite.png
+++ b/image/page_drink_n/bn_dirty_light__snowwhite.png
--- a/image/page_drink_n/bn_dirty_light_geisha.png
+++ b/image/page_drink_n/bn_dirty_light_geisha.png
--- a/image/page_drink_n/bn_dirty_light_pure_beauty.png
+++ b/image/page_drink_n/bn_dirty_light_pure_beauty.png
--- a/image/page_drink_n/bn_dirty_light_rosalyn.png
+++ b/image/page_drink_n/bn_dirty_light_rosalyn.png
--- a/image/page_drink_n/bn_dirty_light_whiskydude.png
+++ b/image/page_drink_n/bn_dirty_light_whiskydude.png
--- a/image/page_drink_n/bn_hot_Banana_Mocha_cocoa77.png
+++ b/image/page_drink_n/bn_hot_Banana_Mocha_cocoa77.png
--- a/image/page_drink_n/bn_hot_Banana_Mocha_cocoa77_en.png
+++ b/image/page_drink_n/bn_hot_Banana_Mocha_cocoa77_en.png
--- a/image/page_drink_n/bn_hot_Mint_Mocha_cocoa77.png
+++ b/image/page_drink_n/bn_hot_Mint_Mocha_cocoa77.png
--- a/image/page_drink_n/bn_hot_Mint_Mocha_cocoa77_en.png
+++ b/image/page_drink_n/bn_hot_Mint_Mocha_cocoa77_en.png
--- a/image/page_drink_n/bn_hot_Mocha_cocoa77.png
+++ b/image/page_drink_n/bn_hot_Mocha_cocoa77.png
--- a/image/page_drink_n/bn_hot_Mocha_cocoa77_en.png
+++ b/image/page_drink_n/bn_hot_Mocha_cocoa77_en.png
--- a/image/page_drink_n/bn_hot_americano_light_geisha.png
+++ b/image/page_drink_n/bn_hot_americano_light_geisha.png
--- a/image/page_drink_n/bn_hot_americano_light_peacher.png
+++ b/image/page_drink_n/bn_hot_americano_light_peacher.png
--- a/image/page_drink_n/bn_hot_americano_light_pure_beauty.png
+++ b/image/page_drink_n/bn_hot_americano_light_pure_beauty.png
--- a/image/page_drink_n/bn_hot_americano_light_rosalyn.png
+++ b/image/page_drink_n/bn_hot_americano_light_rosalyn.png
--- a/image/page_drink_n/bn_hot_americano_light_snowwhite.png
+++ b/image/page_drink_n/bn_hot_americano_light_snowwhite.png
--- a/image/page_drink_n/bn_hot_americano_light_whiskydude.png
+++ b/image/page_drink_n/bn_hot_americano_light_whiskydude.png
--- a/image/page_drink_n/bn_hot_espresso_light_geisha.png
+++ b/image/page_drink_n/bn_hot_espresso_light_geisha.png
--- a/image/page_drink_n/bn_hot_espresso_light_peacher.png
+++ b/image/page_drink_n/bn_hot_espresso_light_peacher.png
--- a/image/page_drink_n/bn_hot_espresso_light_pure_beauty.png
+++ b/image/page_drink_n/bn_hot_espresso_light_pure_beauty.png
--- a/image/page_drink_n/bn_hot_espresso_light_rosalyn.png
+++ b/image/page_drink_n/bn_hot_espresso_light_rosalyn.png
--- a/image/page_drink_n/bn_hot_espresso_light_snowwhite.png
+++ b/image/page_drink_n/bn_hot_espresso_light_snowwhite.png
--- a/image/page_drink_n/bn_hot_espresso_light_whiskydude.png
+++ b/image/page_drink_n/bn_hot_espresso_light_whiskydude.png
--- a/Show more
+++ b/Show more