Merge branch 'masterpiece' of ssh://kong:/1TBHDD/ikong/taobin_project into masterpiece

2024-09-05 15:51:11 +07:00 · 2024-09-05 15:51:11 +07:00 · feb2abe587
commit feb2abe587
parent a06c11514e 800b10e03a
101 changed files with 23255 additions and 319 deletions
--- a/image/event/image_template2
+++ b/image/event/image_template2
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
-normal_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
-press_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
-press_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
-disable_eng=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_en.png
-disable_thai=ROOT/taobin_project/image/event/7up_lucky_draw_x2/7up_lucky_draw_x2_th.png
+normal_eng=ROOT/taobin_project/image/event/jemila/jemila.png
+normal_thai=ROOT/taobin_project/image/event/jemila/jemila.png
+press_eng=ROOT/taobin_project/image/event/jemila/jemila.png
+press_thai=ROOT/taobin_project/image/event/jemila/jemila.png
+disable_eng=ROOT/taobin_project/image/event/jemila/jemila.png
+disable_thai=ROOT/taobin_project/image/event/jemila/jemila.png
--- a/image/event/jemila/jemila.png
+++ b/image/event/jemila/jemila.png
--- a/image/page_doing/brewing_txt_adv11.png
+++ b/image/page_doing/brewing_txt_adv11.png
--- a/image/page_doing/brewing_txt_adv11_en.png
+++ b/image/page_doing/brewing_txt_adv11_en.png
--- a/image/page_doing/brewing_txt_adv12.png
+++ b/image/page_doing/brewing_txt_adv12.png
--- a/image/page_doing/brewing_txt_adv12_en.png
+++ b/image/page_doing/brewing_txt_adv12_en.png
--- a/image/page_doing/brewing_txt_adv13.png
+++ b/image/page_doing/brewing_txt_adv13.png
--- a/image/page_doing/brewing_txt_adv13_en.png
+++ b/image/page_doing/brewing_txt_adv13_en.png
--- a/image/page_drink_disable_n2/bn_hot_Ginger_tea_jemila.png
+++ b/image/page_drink_disable_n2/bn_hot_Ginger_tea_jemila.png
--- a/image/page_drink_disable_n2/bn_hot_america_no_jemila.png
+++ b/image/page_drink_disable_n2/bn_hot_america_no_jemila.png
--- a/image/page_drink_disable_n2/bn_hot_thai_milk_tea_jemila.png
+++ b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_7up_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_cocoa_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_cocoa_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_lemonade_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_lemonade_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_milk_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_milk_jemila.png
--- a/image/page_drink_disable_n2/bn_jasmine_tea_jemila.png
+++ b/image/page_drink_disable_n2/bn_jasmine_tea_jemila.png
--- a/image/page_drink_disable_n2/bn_soda_jemila.png
+++ b/image/page_drink_disable_n2/bn_soda_jemila.png
--- a/image/page_drink_disable_n2/bn_water_roomtemp_jemila.png
+++ b/image/page_drink_disable_n2/bn_water_roomtemp_jemila.png
--- a/image/page_drink_n/bn_hot_Ginger_tea_jemila.png
+++ b/image/page_drink_n/bn_hot_Ginger_tea_jemila.png
--- a/image/page_drink_n/bn_hot_america_no_jemila.png
+++ b/image/page_drink_n/bn_hot_america_no_jemila.png
--- a/image/page_drink_n/bn_hot_thai_milk_tea_jemila.png
+++ b/image/page_drink_n/bn_hot_thai_milk_tea_jemila.png
--- a/image/page_drink_n/bn_iced_7up_jemila.png
+++ b/image/page_drink_n/bn_iced_7up_jemila.png
--- a/image/page_drink_n/bn_iced_cocoa_jemila.png
+++ b/image/page_drink_n/bn_iced_cocoa_jemila.png
--- a/image/page_drink_n/bn_iced_lemonade_jemila.png
+++ b/image/page_drink_n/bn_iced_lemonade_jemila.png
--- a/image/page_drink_n/bn_iced_milk_jemila.png
+++ b/image/page_drink_n/bn_iced_milk_jemila.png
--- a/image/page_drink_n/bn_jasmine_tea_jemila.png
+++ b/image/page_drink_n/bn_jasmine_tea_jemila.png
--- a/image/page_drink_n/bn_soda_jemila.png
+++ b/image/page_drink_n/bn_soda_jemila.png
--- a/image/page_drink_n/bn_water_roomtemp_jemila.png
+++ b/image/page_drink_n/bn_water_roomtemp_jemila.png
--- a/image/page_drink_picture2_n/bn_hot_Ginger_tea_jemila.png
+++ b/image/page_drink_picture2_n/bn_hot_Ginger_tea_jemila.png
--- a/image/page_drink_picture2_n/bn_hot_america_no_jemila.png
+++ b/image/page_drink_picture2_n/bn_hot_america_no_jemila.png
--- a/image/page_drink_picture2_n/bn_hot_thai_milk_tea_jemila.png
+++ b/image/page_drink_picture2_n/bn_hot_thai_milk_tea_jemila.png
--- a/image/page_drink_picture2_n/bn_iced_7up_jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_7up_jemila.png
--- a/image/page_drink_picture2_n/bn_iced_cocoa_jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_cocoa_jemila.png
--- a/image/page_drink_picture2_n/bn_iced_lemonade_jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_lemonade_jemila.png
--- a/image/page_drink_picture2_n/bn_iced_milk_jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_milk_jemila.png
--- a/image/page_drink_picture2_n/bn_jasmine_tea_jemila.png
+++ b/image/page_drink_picture2_n/bn_jasmine_tea_jemila.png
--- a/image/page_drink_picture2_n/bn_soda_jemila.png
+++ b/image/page_drink_picture2_n/bn_soda_jemila.png
--- a/image/page_drink_picture2_n/bn_water_roomtemp_jemila.png
+++ b/image/page_drink_picture2_n/bn_water_roomtemp_jemila.png
--- a/image/page_drink_press_n/bn_hot_Ginger_tea_jemila.png
+++ b/image/page_drink_press_n/bn_hot_Ginger_tea_jemila.png
--- a/image/page_drink_press_n/bn_hot_america_no_jemila.png
+++ b/image/page_drink_press_n/bn_hot_america_no_jemila.png
--- a/image/page_drink_press_n/bn_hot_thai_milk_tea_jemila.png
+++ b/image/page_drink_press_n/bn_hot_thai_milk_tea_jemila.png
--- a/image/page_drink_press_n/bn_iced_7up_jemila.png
+++ b/image/page_drink_press_n/bn_iced_7up_jemila.png
--- a/image/page_drink_press_n/bn_iced_cocoa_jemila.png
+++ b/image/page_drink_press_n/bn_iced_cocoa_jemila.png
--- a/image/page_drink_press_n/bn_iced_lemonade_jemila.png
+++ b/image/page_drink_press_n/bn_iced_lemonade_jemila.png
--- a/image/page_drink_press_n/bn_iced_milk_jemila.png
+++ b/image/page_drink_press_n/bn_iced_milk_jemila.png
--- a/image/page_drink_press_n/bn_jasmine_tea_jemila.png
+++ b/image/page_drink_press_n/bn_jasmine_tea_jemila.png
--- a/image/page_drink_press_n/bn_soda_jemila.png
+++ b/image/page_drink_press_n/bn_soda_jemila.png
--- a/image/page_drink_press_n/bn_water_roomtemp_jemila.png
+++ b/image/page_drink_press_n/bn_water_roomtemp_jemila.png