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
--- a/spiral/image/page_spiral/03-01-22-1001.png
+++ b/spiral/image/page_spiral/03-01-22-1001.png
--- a/spiral/image/page_spiral/03-02-00-5007.png
+++ b/spiral/image/page_spiral/03-02-00-5007.png
--- a/spiral/image/page_spiral/03-02-00-5008.png
+++ b/spiral/image/page_spiral/03-02-00-5008.png
--- a/spiral/image/page_spiral/03-02-00-5009.png
+++ b/spiral/image/page_spiral/03-02-00-5009.png
--- a/spiral/image/page_spiral/03-02-01-4009.png
+++ b/spiral/image/page_spiral/03-02-01-4009.png
--- a/spiral/image/page_spiral/03-02-01-4010.png
+++ b/spiral/image/page_spiral/03-02-01-4010.png
--- a/spiral/image/page_spiral/03-02-11-5019.png
+++ b/spiral/image/page_spiral/03-02-11-5019.png
--- a/spiral/image/page_spiral/03-02-12-5013.png
+++ b/spiral/image/page_spiral/03-02-12-5013.png
--- a/spiral/image/page_spiral/03-03-00-4021.png
+++ b/spiral/image/page_spiral/03-03-00-4021.png
--- a/spiral/image/page_spiral/03-03-11-5017.png
+++ b/spiral/image/page_spiral/03-03-11-5017.png
--- a/spiral/image/page_spiral/03-03-12-5016.png
+++ b/spiral/image/page_spiral/03-03-12-5016.png
--- a/spiral/image/page_spiral/03-04-14-4016.png
+++ b/spiral/image/page_spiral/03-04-14-4016.png
--- a/spiral/image/page_spiral/03-04-14-4017.png
+++ b/spiral/image/page_spiral/03-04-14-4017.png
--- a/spiral/image/page_spiral/03-04-14-4018.png
+++ b/spiral/image/page_spiral/03-04-14-4018.png
--- a/spiral/image/page_spiral/03-04-14-4019.png
+++ b/spiral/image/page_spiral/03-04-14-4019.png
--- a/spiral/image/page_spiral/03-04-14-4020.png
+++ b/spiral/image/page_spiral/03-04-14-4020.png
--- a/spiral/image/page_spiral/03-05-00-5005.png
+++ b/spiral/image/page_spiral/03-05-00-5005.png
--- a/spiral/image/page_spiral/03-05-00-5006.png
+++ b/spiral/image/page_spiral/03-05-00-5006.png
--- a/spiral/image/page_spiral/03-05-00-5010.png
+++ b/spiral/image/page_spiral/03-05-00-5010.png
--- a/spiral/image/page_spiral/03-05-00-5011.png
+++ b/spiral/image/page_spiral/03-05-00-5011.png
--- a/spiral/image/page_spiral/03-05-12-5014.png
+++ b/spiral/image/page_spiral/03-05-12-5014.png
--- a/spiral/image/page_spiral/03-05-12-5015.png
+++ b/spiral/image/page_spiral/03-05-12-5015.png
--- a/spiral/image/page_spiral/03-06-01-5012.png
+++ b/spiral/image/page_spiral/03-06-01-5012.png
--- a/spiral/image/page_spiral/03-06-10-4021.png
+++ b/spiral/image/page_spiral/03-06-10-4021.png
--- a/spiral/image/page_spiral/03-06-12-5024.png
+++ b/spiral/image/page_spiral/03-06-12-5024.png
--- a/spiral/image/page_spiral/03-06-20-4005.png
+++ b/spiral/image/page_spiral/03-06-20-4005.png
--- a/spiral/image/page_spiral/03-06-20-5002.png
+++ b/spiral/image/page_spiral/03-06-20-5002.png
--- a/spiral/image/page_spiral/03-06-20-5003.png
+++ b/spiral/image/page_spiral/03-06-20-5003.png
--- a/spiral/image/page_spiral/03-06-22-4001.png
+++ b/spiral/image/page_spiral/03-06-22-4001.png
--- a/spiral/image/page_spiral/03-06-22-4002.png
+++ b/spiral/image/page_spiral/03-06-22-4002.png
--- a/spiral/image/page_spiral/03-06-22-4003.png
+++ b/spiral/image/page_spiral/03-06-22-4003.png
--- a/spiral/image/page_spiral/03-06-22-4004.png
+++ b/spiral/image/page_spiral/03-06-22-4004.png
--- a/spiral/image/page_spiral/03-06-22-4006.png
+++ b/spiral/image/page_spiral/03-06-22-4006.png
--- a/spiral/image/page_spiral/03-06-22-4011.png
+++ b/spiral/image/page_spiral/03-06-22-4011.png
--- a/spiral/image/page_spiral/03-06-22-4012.png
+++ b/spiral/image/page_spiral/03-06-22-4012.png
--- a/spiral/image/page_spiral/03-06-22-4013.png
+++ b/spiral/image/page_spiral/03-06-22-4013.png
--- a/spiral/image/page_spiral/03-06-22-4014.png
+++ b/spiral/image/page_spiral/03-06-22-4014.png
--- a/spiral/image/page_spiral/03-06-22-4015.png
+++ b/spiral/image/page_spiral/03-06-22-4015.png
--- a/spiral/image/page_spiral/03-06-22-4022.png
+++ b/spiral/image/page_spiral/03-06-22-4022.png
--- a/spiral/image/page_spiral/03-06-22-4023.png
+++ b/spiral/image/page_spiral/03-06-22-4023.png
--- a/spiral/image/page_spiral/03-06-22-5001.png
+++ b/spiral/image/page_spiral/03-06-22-5001.png
--- a/spiral/image/page_spiral/03-06-22-5004.png
+++ b/spiral/image/page_spiral/03-06-22-5004.png
--- a/spiral/image/page_spiral/03-06-22-5019.png
+++ b/spiral/image/page_spiral/03-06-22-5019.png
--- a/spiral/image/page_spiral/03-06-22-5020.png
+++ b/spiral/image/page_spiral/03-06-22-5020.png
--- a/spiral/image/page_spiral/03-07-10-5001.png
+++ b/spiral/image/page_spiral/03-07-10-5001.png
--- a/spiral/image/page_spiral/03-07-10-5021.png
+++ b/spiral/image/page_spiral/03-07-10-5021.png
--- a/spiral/image/page_spiral/03-07-11-5002.png
+++ b/spiral/image/page_spiral/03-07-11-5002.png
--- a/spiral/image/page_spiral/03-07-11-5003.png
+++ b/spiral/image/page_spiral/03-07-11-5003.png
--- a/spiral/image/page_spiral/03-07-12-5005.png
+++ b/spiral/image/page_spiral/03-07-12-5005.png
--- a/spiral/image/page_spiral/03-07-12-5022.png
+++ b/spiral/image/page_spiral/03-07-12-5022.png
--- a/spiral/image/page_spiral/03-07-12-5023.png
+++ b/spiral/image/page_spiral/03-07-12-5023.png
--- a/spiral/image/page_spiral/03-08-12-5018.png
+++ b/spiral/image/page_spiral/03-08-12-5018.png
--- a/spiral/image/page_spiral/alarm01.png
+++ b/spiral/image/page_spiral/alarm01.png
--- a/spiral/image/page_spiral/bn_all.png
+++ b/spiral/image/page_spiral/bn_all.png
--- a/spiral/image/page_spiral/bn_candies.png
+++ b/spiral/image/page_spiral/bn_candies.png
--- a/spiral/image/page_spiral/bn_cookies.png
+++ b/spiral/image/page_spiral/bn_cookies.png
--- a/spiral/image/page_spiral/bn_drinks.png
+++ b/spiral/image/page_spiral/bn_drinks.png
--- a/spiral/image/page_spiral/bn_freshfood.png
+++ b/spiral/image/page_spiral/bn_freshfood.png
--- a/spiral/image/page_spiral/bn_health.png
+++ b/spiral/image/page_spiral/bn_health.png
--- a/spiral/image/page_spiral/bn_noodies.png
+++ b/spiral/image/page_spiral/bn_noodies.png
--- a/spiral/image/page_spiral/bn_nuts.png
+++ b/spiral/image/page_spiral/bn_nuts.png
--- a/spiral/image/page_spiral/bn_snacks.png
+++ b/spiral/image/page_spiral/bn_snacks.png
--- a/spiral/image/page_spiral/bp_all.png
+++ b/spiral/image/page_spiral/bp_all.png
--- a/spiral/image/page_spiral/bp_candies.png
+++ b/spiral/image/page_spiral/bp_candies.png
--- a/spiral/image/page_spiral/bp_cookies.png
+++ b/spiral/image/page_spiral/bp_cookies.png
--- a/spiral/image/page_spiral/bp_drinks.png
+++ b/spiral/image/page_spiral/bp_drinks.png
--- a/spiral/image/page_spiral/bp_freshfood.png
+++ b/spiral/image/page_spiral/bp_freshfood.png
--- a/Show more
+++ b/Show more