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

2024-11-14 13:40:50 +07:00 · 2024-11-14 13:40:50 +07:00 · abb01bb895
commit abb01bb895
parent a94eaf1559 fccde185b0
294 changed files with 55493 additions and 3806 deletions
--- a/image/event/happy_trios/happy_trios.png
+++ b/image/event/happy_trios/happy_trios.png
--- a/image/event/happy_trios/send_code_complate_en.png
+++ b/image/event/happy_trios/send_code_complate_en.png
--- a/image/event/happy_trios/send_code_complate_th.png
+++ b/image/event/happy_trios/send_code_complate_th.png
--- a/image/event/happy_trios/send_code_fail_en.png
+++ b/image/event/happy_trios/send_code_fail_en.png
--- a/image/event/happy_trios/send_code_fail_th.png
+++ b/image/event/happy_trios/send_code_fail_th.png
--- a/image/event/happy_trios/send_code_pending_en.png
+++ b/image/event/happy_trios/send_code_pending_en.png
--- a/image/event/happy_trios/send_code_pending_th.png
+++ b/image/event/happy_trios/send_code_pending_th.png
--- a/image/event/image_template4
+++ b/image/event/image_template4
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/robinson_beauty/robinson_beauty_en.png
-normal_thai=ROOT/taobin_project/image/event/robinson_beauty/robinson_beauty_th.png
-press_eng=ROOT/taobin_project/image/event/robinson_beauty/robinson_beauty_en.png
-press_thai=ROOT/taobin_project/image/event/robinson_beauty/robinson_beauty_th.png
-disable_eng=ROOT/taobin_project/image/event/robinson_beauty/robinson_beauty_en.png
-disable_thai=ROOT/taobin_project/image/event/robinson_beauty/robinson_beauty_th.png
+normal_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios.png
+normal_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios.png
+press_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios.png
+press_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios.png
+disable_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios.png
+disable_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios.png
--- a/image/page2/bn_vending_machine2.png
+++ b/image/page2/bn_vending_machine2.png
--- a/image/page2/bp_vending_machine2.png
+++ b/image/page2/bp_vending_machine2.png
--- a/image/page2_en/page2/bn_vending_machine2.png
+++ b/image/page2_en/page2/bn_vending_machine2.png
--- a/image/page2_en/page2/bp_vending_machine2.png
+++ b/image/page2_en/page2/bp_vending_machine2.png
--- a/image/page_drink_disable_n2/bn_super_oreo_volcano_Caramel_happy_trios.png
+++ b/image/page_drink_disable_n2/bn_super_oreo_volcano_Caramel_happy_trios.png
--- a/image/page_drink_disable_n2/bn_super_oreo_volcano_Matcha_happy_trios.png
+++ b/image/page_drink_disable_n2/bn_super_oreo_volcano_Matcha_happy_trios.png
--- a/image/page_drink_disable_n2/bn_super_oreo_volcano_ThaiTea_happy_trios.png
+++ b/image/page_drink_disable_n2/bn_super_oreo_volcano_ThaiTea_happy_trios.png
--- a/image/page_drink_n/bn_super_oreo_volcano_Caramel_happy_trios.png
+++ b/image/page_drink_n/bn_super_oreo_volcano_Caramel_happy_trios.png
--- a/image/page_drink_n/bn_super_oreo_volcano_Matcha_happy_trios.png
+++ b/image/page_drink_n/bn_super_oreo_volcano_Matcha_happy_trios.png
--- a/image/page_drink_n/bn_super_oreo_volcano_ThaiTea_happy_trios.png
+++ b/image/page_drink_n/bn_super_oreo_volcano_ThaiTea_happy_trios.png
--- a/image/page_drink_picture2_n/bn_super_oreo_volcano_Caramel_happy_trios.png
+++ b/image/page_drink_picture2_n/bn_super_oreo_volcano_Caramel_happy_trios.png
--- a/image/page_drink_picture2_n/bn_super_oreo_volcano_Matcha_happy_trios.png
+++ b/image/page_drink_picture2_n/bn_super_oreo_volcano_Matcha_happy_trios.png
--- a/image/page_drink_picture2_n/bn_super_oreo_volcano_ThaiTea_happy_trios.png
+++ b/image/page_drink_picture2_n/bn_super_oreo_volcano_ThaiTea_happy_trios.png
--- a/image/page_drink_press_n/bn_super_oreo_volcano_Caramel_happy_trios.png
+++ b/image/page_drink_press_n/bn_super_oreo_volcano_Caramel_happy_trios.png
--- a/image/page_drink_press_n/bn_super_oreo_volcano_Matcha_happy_trios.png
+++ b/image/page_drink_press_n/bn_super_oreo_volcano_Matcha_happy_trios.png
--- a/image/page_drink_press_n/bn_super_oreo_volcano_ThaiTea_happy_trios.png
+++ b/image/page_drink_press_n/bn_super_oreo_volcano_ThaiTea_happy_trios.png
--- a/image/topping2/bd_add_jemila.png
+++ b/image/topping2/bd_add_jemila.png
--- a/image/topping2/bg_top_jemila.png
+++ b/image/topping2/bg_top_jemila.png
--- a/image/topping2/bg_top_jemila_free.png
+++ b/image/topping2/bg_top_jemila_free.png
--- a/image/topping2/bn_add_jemila.png
+++ b/image/topping2/bn_add_jemila.png
--- a/image/topping2/bp_add_jemila.png
+++ b/image/topping2/bp_add_jemila.png
--- a/image/topping2/free.png
+++ b/image/topping2/free.png
--- a/image/topping2_en/bg_top_jemila.png
+++ b/image/topping2_en/bg_top_jemila.png
--- a/image/topping2_en/bg_top_jemila_free.png
+++ b/image/topping2_en/bg_top_jemila_free.png
--- a/image/vending_error/textspiral.png
+++ b/image/vending_error/textspiral.png