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

2024-08-23 15:47:22 +07:00 · 2024-08-23 15:47:22 +07:00 · 8f5b2b1937
commit 8f5b2b1937
parent 84e83f6ea2 4d1a082e8e
143 changed files with 26391 additions and 4254 deletions
--- a/image/event/image_template4
+++ b/image/event/image_template4
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/wednesday_melon/wednesday_melon_EN.png
-normal_thai=ROOT/taobin_project/image/event/wednesday_melon/wednesday_melon_TH.png
-press_eng=ROOT/taobin_project/image/event/wednesday_melon/wednesday_melon_EN.png
-press_thai=ROOT/taobin_project/image/event/wednesday_melon/wednesday_melon_TH.png
-disable_eng=ROOT/taobin_project/image/event/wednesday_melon/wednesday_melon_EN.png
-disable_thai=ROOT/taobin_project/image/event/wednesday_melon/wednesday_melon_TH.png
+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
--- a/image/event/mom_cocoa/mom_cocoa_banner_13-31.png
+++ b/image/event/mom_cocoa/mom_cocoa_banner_13-31.png
--- a/image/event/robinson_beauty/bg_fail.png
+++ b/image/event/robinson_beauty/bg_fail.png
--- a/image/event/robinson_beauty/bn_close_en.png
+++ b/image/event/robinson_beauty/bn_close_en.png
--- a/image/event/robinson_beauty/bn_close_th.png
+++ b/image/event/robinson_beauty/bn_close_th.png
--- a/image/event/robinson_beauty/collect_fail_text_en.png
+++ b/image/event/robinson_beauty/collect_fail_text_en.png
--- a/image/event/robinson_beauty/collect_fail_text_th.png
+++ b/image/event/robinson_beauty/collect_fail_text_th.png
--- a/image/event/robinson_beauty/continue_btn.png
+++ b/image/event/robinson_beauty/continue_btn.png
--- a/image/event/robinson_beauty/continue_en_btn.png
+++ b/image/event/robinson_beauty/continue_en_btn.png
--- a/image/event/robinson_beauty/img_fail.png
+++ b/image/event/robinson_beauty/img_fail.png
--- a/image/event/robinson_beauty/no_point.png
+++ b/image/event/robinson_beauty/no_point.png
--- a/image/event/robinson_beauty/not_line_member_en.png
+++ b/image/event/robinson_beauty/not_line_member_en.png
--- a/image/event/robinson_beauty/not_line_member_th.png
+++ b/image/event/robinson_beauty/not_line_member_th.png
--- a/image/event/robinson_beauty/point_9.png
+++ b/image/event/robinson_beauty/point_9.png
--- a/image/event/robinson_beauty/point_9_en.png
+++ b/image/event/robinson_beauty/point_9_en.png
--- a/image/event/robinson_beauty/random_1.png
+++ b/image/event/robinson_beauty/random_1.png
--- a/image/event/robinson_beauty/random_2.png
+++ b/image/event/robinson_beauty/random_2.png
--- a/image/event/robinson_beauty/random_3.png
+++ b/image/event/robinson_beauty/random_3.png
--- a/image/event/robinson_beauty/random_4.png
+++ b/image/event/robinson_beauty/random_4.png
--- a/image/event/robinson_beauty/random_5.png
+++ b/image/event/robinson_beauty/random_5.png
--- a/image/event/robinson_beauty/random_6.png
+++ b/image/event/robinson_beauty/random_6.png
--- a/image/event/robinson_beauty/random_7.png
+++ b/image/event/robinson_beauty/random_7.png
--- a/image/event/robinson_beauty/random_8.png
+++ b/image/event/robinson_beauty/random_8.png
--- a/image/event/robinson_beauty/random_9.png
+++ b/image/event/robinson_beauty/random_9.png
--- a/image/event/robinson_beauty/random_select.png
+++ b/image/event/robinson_beauty/random_select.png
--- a/image/event/robinson_beauty/random_text.png
+++ b/image/event/robinson_beauty/random_text.png
--- a/image/event/robinson_beauty/reawrd_set_a.png
+++ b/image/event/robinson_beauty/reawrd_set_a.png
--- a/image/event/robinson_beauty/reawrd_set_a_name.png
+++ b/image/event/robinson_beauty/reawrd_set_a_name.png
--- a/image/event/robinson_beauty/reawrd_set_a_plus.png
+++ b/image/event/robinson_beauty/reawrd_set_a_plus.png
--- a/image/event/robinson_beauty/reawrd_set_a_plus_name.png
+++ b/image/event/robinson_beauty/reawrd_set_a_plus_name.png
--- a/image/event/robinson_beauty/reward_bg.png
+++ b/image/event/robinson_beauty/reward_bg.png
--- a/image/event/robinson_beauty/reward_blush_and_lip.png
+++ b/image/event/robinson_beauty/reward_blush_and_lip.png
--- a/image/event/robinson_beauty/reward_blush_and_lip_name.png
+++ b/image/event/robinson_beauty/reward_blush_and_lip_name.png
--- a/image/event/robinson_beauty/reward_calvin_klein.png
+++ b/image/event/robinson_beauty/reward_calvin_klein.png
--- a/image/event/robinson_beauty/reward_calvin_klein_name.png
+++ b/image/event/robinson_beauty/reward_calvin_klein_name.png
--- a/image/event/robinson_beauty/reward_double_serum.png
+++ b/image/event/robinson_beauty/reward_double_serum.png
--- a/image/event/robinson_beauty/reward_double_serum_name.png
+++ b/image/event/robinson_beauty/reward_double_serum_name.png
--- a/image/event/robinson_beauty/reward_lip_tint_oil.png
+++ b/image/event/robinson_beauty/reward_lip_tint_oil.png
--- a/image/event/robinson_beauty/reward_lip_tint_oil_name.png
+++ b/image/event/robinson_beauty/reward_lip_tint_oil_name.png
--- a/image/event/robinson_beauty/reward_lustrous_lipstick.png
+++ b/image/event/robinson_beauty/reward_lustrous_lipstick.png
--- a/image/event/robinson_beauty/reward_lustrous_lipstick_name.png
+++ b/image/event/robinson_beauty/reward_lustrous_lipstick_name.png
--- a/image/event/robinson_beauty/reward_random.png
+++ b/image/event/robinson_beauty/reward_random.png
--- a/image/event/robinson_beauty/reward_random_name.png
+++ b/image/event/robinson_beauty/reward_random_name.png
--- a/image/event/robinson_beauty/robinson_beauty_en.png
+++ b/image/event/robinson_beauty/robinson_beauty_en.png
--- a/image/event/robinson_beauty/robinson_beauty_th.png
+++ b/image/event/robinson_beauty/robinson_beauty_th.png
--- a/image/event/robinson_beauty/send_reward_fail_text_en.png
+++ b/image/event/robinson_beauty/send_reward_fail_text_en.png
--- a/image/event/robinson_beauty/send_reward_fail_text_th.png
+++ b/image/event/robinson_beauty/send_reward_fail_text_th.png
--- a/image/event/robinson_beauty/tao_beauty.png
+++ b/image/event/robinson_beauty/tao_beauty.png
--- a/image/page_drink_disable_n2/IcedCocoax2.png
+++ b/image/page_drink_disable_n2/IcedCocoax2.png
--- a/image/page_drink_disable_n2/IcedCocoax3.png
+++ b/image/page_drink_disable_n2/IcedCocoax3.png
--- a/image/page_drink_disable_n2/bn_Caramel_Plum_Milk_caramel_robinson_beauty.png
+++ b/image/page_drink_disable_n2/bn_Caramel_Plum_Milk_caramel_robinson_beauty.png
--- a/image/page_drink_disable_n2/bn_HOT_JASMINE_Lychee_robinson_beauty.png
+++ b/image/page_drink_disable_n2/bn_HOT_JASMINE_Lychee_robinson_beauty.png
--- a/image/page_drink_disable_n2/bn_Straw_Lychee_Americano_robinson_beauty.png
+++ b/image/page_drink_disable_n2/bn_Straw_Lychee_Americano_robinson_beauty.png
--- a/image/page_drink_disable_n2/bn_Straw_Lychee_Thaitea_robinson_beauty.png
+++ b/image/page_drink_disable_n2/bn_Straw_Lychee_Thaitea_robinson_beauty.png
--- a/image/page_drink_disable_n2/bn_Straw_Matcha_milk_robinson_beauty.png
+++ b/image/page_drink_disable_n2/bn_Straw_Matcha_milk_robinson_beauty.png
--- a/image/page_drink_disable_n2/bn_hot_LATTE_Straw_robinson_beauty.png
+++ b/image/page_drink_disable_n2/bn_hot_LATTE_Straw_robinson_beauty.png
--- a/image/page_drink_disable_n2/bn_iced_Cocoa_Lychee_Milk_robinson_beauty.png
+++ b/image/page_drink_disable_n2/bn_iced_Cocoa_Lychee_Milk_robinson_beauty.png
--- a/image/page_drink_disable_n2/bn_iced_Lychee_straw_soda_robinson_beauty.png
+++ b/image/page_drink_disable_n2/bn_iced_Lychee_straw_soda_robinson_beauty.png
--- a/image/page_drink_disable_n2/bn_iced_pepsi_Lychee_Lime_robinson_beauty.png
+++ b/image/page_drink_disable_n2/bn_iced_pepsi_Lychee_Lime_robinson_beauty.png
--- a/image/page_drink_n/IcedCocoax2.png
+++ b/image/page_drink_n/IcedCocoax2.png
--- a/image/page_drink_n/IcedCocoax3.png
+++ b/image/page_drink_n/IcedCocoax3.png
--- a/image/page_drink_n/bn_Caramel_Plum_Milk_caramel_robinson_beauty.png
+++ b/image/page_drink_n/bn_Caramel_Plum_Milk_caramel_robinson_beauty.png
--- a/image/page_drink_n/bn_HOT_JASMINE_Lychee_robinson_beauty.png
+++ b/image/page_drink_n/bn_HOT_JASMINE_Lychee_robinson_beauty.png
--- a/image/page_drink_n/bn_Straw_Lychee_Americano_robinson_beauty.png
+++ b/image/page_drink_n/bn_Straw_Lychee_Americano_robinson_beauty.png
--- a/image/page_drink_n/bn_Straw_Lychee_Thaitea_robinson_beauty.png
+++ b/image/page_drink_n/bn_Straw_Lychee_Thaitea_robinson_beauty.png
--- a/image/page_drink_n/bn_Straw_Matcha_milk_robinson_beauty.png
+++ b/image/page_drink_n/bn_Straw_Matcha_milk_robinson_beauty.png
--- a/image/page_drink_n/bn_hot_LATTE_Straw_robinson_beauty.png
+++ b/image/page_drink_n/bn_hot_LATTE_Straw_robinson_beauty.png
--- a/image/page_drink_n/bn_iced_Cocoa_Lychee_Milk_robinson_beauty.png
+++ b/image/page_drink_n/bn_iced_Cocoa_Lychee_Milk_robinson_beauty.png
--- a/image/page_drink_n/bn_iced_Lychee_straw_soda_robinson_beauty.png
+++ b/image/page_drink_n/bn_iced_Lychee_straw_soda_robinson_beauty.png
--- a/image/page_drink_n/bn_iced_pepsi_Lychee_Lime_robinson_beauty.png
+++ b/image/page_drink_n/bn_iced_pepsi_Lychee_Lime_robinson_beauty.png
--- a/image/page_drink_picture2_n/IcedCocoax2.png
+++ b/image/page_drink_picture2_n/IcedCocoax2.png
--- a/image/page_drink_picture2_n/IcedCocoax3.png
+++ b/image/page_drink_picture2_n/IcedCocoax3.png
--- a/image/page_drink_picture2_n/bn_Caramel_Plum_Milk_caramel_robinson_beauty.png
+++ b/image/page_drink_picture2_n/bn_Caramel_Plum_Milk_caramel_robinson_beauty.png
--- a/image/page_drink_picture2_n/bn_HOT_JASMINE_Lychee_robinson_beauty.png
+++ b/image/page_drink_picture2_n/bn_HOT_JASMINE_Lychee_robinson_beauty.png
--- a/image/page_drink_picture2_n/bn_Straw_Lychee_Americano_robinson_beauty.png
+++ b/image/page_drink_picture2_n/bn_Straw_Lychee_Americano_robinson_beauty.png
--- a/image/page_drink_picture2_n/bn_Straw_Lychee_Thaitea_robinson_beauty.png
+++ b/image/page_drink_picture2_n/bn_Straw_Lychee_Thaitea_robinson_beauty.png
--- a/image/page_drink_picture2_n/bn_Straw_Matcha_milk_robinson_beauty.png
+++ b/image/page_drink_picture2_n/bn_Straw_Matcha_milk_robinson_beauty.png
--- a/image/page_drink_picture2_n/bn_hot_LATTE_Straw_robinson_beauty.png
+++ b/image/page_drink_picture2_n/bn_hot_LATTE_Straw_robinson_beauty.png
--- a/image/page_drink_picture2_n/bn_iced_Cocoa_Lychee_Milk_robinson_beauty.png
+++ b/image/page_drink_picture2_n/bn_iced_Cocoa_Lychee_Milk_robinson_beauty.png
--- a/image/page_drink_picture2_n/bn_iced_Lychee_straw_soda_robinson_beauty.png
+++ b/image/page_drink_picture2_n/bn_iced_Lychee_straw_soda_robinson_beauty.png
--- a/image/page_drink_picture2_n/bn_iced_pepsi_Lychee_Lime_robinson_beauty.png
+++ b/image/page_drink_picture2_n/bn_iced_pepsi_Lychee_Lime_robinson_beauty.png
--- a/image/page_drink_press_n/IcedCocoax2.png
+++ b/image/page_drink_press_n/IcedCocoax2.png
--- a/image/page_drink_press_n/IcedCocoax3.png
+++ b/image/page_drink_press_n/IcedCocoax3.png
--- a/image/page_drink_press_n/bn_Caramel_Plum_Milk_caramel_robinson_beauty.png
+++ b/image/page_drink_press_n/bn_Caramel_Plum_Milk_caramel_robinson_beauty.png
--- a/image/page_drink_press_n/bn_HOT_JASMINE_Lychee_robinson_beauty.png
+++ b/image/page_drink_press_n/bn_HOT_JASMINE_Lychee_robinson_beauty.png
--- a/image/page_drink_press_n/bn_Straw_Lychee_Americano_robinson_beauty.png
+++ b/image/page_drink_press_n/bn_Straw_Lychee_Americano_robinson_beauty.png
--- a/image/page_drink_press_n/bn_Straw_Lychee_Thaitea_robinson_beauty.png
+++ b/image/page_drink_press_n/bn_Straw_Lychee_Thaitea_robinson_beauty.png
--- a/image/page_drink_press_n/bn_Straw_Matcha_milk_robinson_beauty.png
+++ b/image/page_drink_press_n/bn_Straw_Matcha_milk_robinson_beauty.png
--- a/image/page_drink_press_n/bn_hot_LATTE_Straw_robinson_beauty.png
+++ b/image/page_drink_press_n/bn_hot_LATTE_Straw_robinson_beauty.png
--- a/image/page_drink_press_n/bn_iced_Cocoa_Lychee_Milk_robinson_beauty.png
+++ b/image/page_drink_press_n/bn_iced_Cocoa_Lychee_Milk_robinson_beauty.png
--- a/image/page_drink_press_n/bn_iced_Lychee_straw_soda_robinson_beauty.png
+++ b/image/page_drink_press_n/bn_iced_Lychee_straw_soda_robinson_beauty.png
--- a/image/page_drink_press_n/bn_iced_pepsi_Lychee_Lime_robinson_beauty.png
+++ b/image/page_drink_press_n/bn_iced_pepsi_Lychee_Lime_robinson_beauty.png