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

2024-05-20 09:58:22 +07:00 · 2024-05-20 09:58:22 +07:00 · 3b7213eefc
commit 3b7213eefc
parent 6641363473 a49748a193
211 changed files with 54939 additions and 9621 deletions
--- a/font/Inter/Inter-Black.ttf
+++ b/font/Inter/Inter-Black.ttf
--- a/font/Inter/Inter-Bold.ttf
+++ b/font/Inter/Inter-Bold.ttf
--- a/font/Inter/Inter-ExtraBold.ttf
+++ b/font/Inter/Inter-ExtraBold.ttf
--- a/font/Inter/Inter-ExtraLight.ttf
+++ b/font/Inter/Inter-ExtraLight.ttf
--- a/font/Inter/Inter-Light.ttf
+++ b/font/Inter/Inter-Light.ttf
--- a/font/Inter/Inter-Medium.ttf
+++ b/font/Inter/Inter-Medium.ttf
--- a/font/Inter/Inter-Regular.ttf
+++ b/font/Inter/Inter-Regular.ttf
--- a/font/Inter/Inter-SemiBold.ttf
+++ b/font/Inter/Inter-SemiBold.ttf
--- a/font/Inter/Inter-Thin.ttf
+++ b/font/Inter/Inter-Thin.ttf
--- a/image/event/energy_drink_1_bath/check_member_fail_en.png
+++ b/image/event/energy_drink_1_bath/check_member_fail_en.png
--- a/image/event/energy_drink_1_bath/check_member_fail_th.png
+++ b/image/event/energy_drink_1_bath/check_member_fail_th.png
--- a/image/event/energy_drink_1_bath/energy_drink_1_bath_error.png
+++ b/image/event/energy_drink_1_bath/energy_drink_1_bath_error.png
--- a/image/event/energy_drink_1_bath/energy_drink_1_bath_error_en.png
+++ b/image/event/energy_drink_1_bath/energy_drink_1_bath_error_en.png
--- a/image/event/energy_drink_1_bath/energy_drink_1_bath_policy.png
+++ b/image/event/energy_drink_1_bath/energy_drink_1_bath_policy.png
--- a/image/event/energy_drink_1_bath/energy_drink_1_bath_policy_en.png
+++ b/image/event/energy_drink_1_bath/energy_drink_1_bath_policy_en.png
--- a/image/event/energy_drink_1_bath/energy_drink_1_bath_quota_full.png
+++ b/image/event/energy_drink_1_bath/energy_drink_1_bath_quota_full.png
--- a/image/event/energy_drink_1_bath/energy_drink_1_bath_quota_full_en.png
+++ b/image/event/energy_drink_1_bath/energy_drink_1_bath_quota_full_en.png
--- a/image/event/energy_drink_1_bath/enter_numbers_to_check.png
+++ b/image/event/energy_drink_1_bath/enter_numbers_to_check.png
--- a/image/event/energy_drink_1_bath/enter_numbers_to_check_en.png
+++ b/image/event/energy_drink_1_bath/enter_numbers_to_check_en.png
--- a/image/event/energy_drink_1_bath/insert_id_card.png
+++ b/image/event/energy_drink_1_bath/insert_id_card.png
--- a/image/event/energy_drink_1_bath/insert_id_card_en.png
+++ b/image/event/energy_drink_1_bath/insert_id_card_en.png
--- a/image/event/energy_drink_1_bath/text20.png
+++ b/image/event/energy_drink_1_bath/text20.png
--- a/image/event/image_template3
+++ b/image/event/image_template3
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/tea_time/tea_time_th.png
-normal_thai=ROOT/taobin_project/image/event/tea_time/tea_time_th.png
-press_eng=ROOT/taobin_project/image/event/tea_time/tea_time_th.png
-press_thai=ROOT/taobin_project/image/event/tea_time/tea_time_th.png
-disable_eng=ROOT/taobin_project/image/event/tea_time/tea_time_th.png
-disable_thai=ROOT/taobin_project/image/event/tea_time/tea_time_th.png
+normal_eng=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png
+normal_thai=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png
+press_eng=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png
+press_thai=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png
+disable_eng=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png
+disable_thai=ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png
--- a/image/event/nam_hom_coconut/display_point/bg_bottom.png
+++ b/image/event/nam_hom_coconut/display_point/bg_bottom.png
--- a/image/event/nam_hom_coconut/display_point/bg_top.png
+++ b/image/event/nam_hom_coconut/display_point/bg_top.png
--- a/image/event/nam_hom_coconut/display_point/coconut_point.png
+++ b/image/event/nam_hom_coconut/display_point/coconut_point.png
--- a/image/event/nam_hom_coconut/display_point/coconut_point_active.png
+++ b/image/event/nam_hom_coconut/display_point/coconut_point_active.png
--- a/image/event/nam_hom_coconut/display_point/continue_btn.png
+++ b/image/event/nam_hom_coconut/display_point/continue_btn.png
--- a/image/event/nam_hom_coconut/display_point/continue_en_btn.png
+++ b/image/event/nam_hom_coconut/display_point/continue_en_btn.png
--- a/image/event/nam_hom_coconut/display_point/random_btn.png
+++ b/image/event/nam_hom_coconut/display_point/random_btn.png
--- a/image/event/nam_hom_coconut/display_point/random_btn_en.png
+++ b/image/event/nam_hom_coconut/display_point/random_btn_en.png
--- a/image/event/nam_hom_coconut/display_point/tao_drink_coconut.png
+++ b/image/event/nam_hom_coconut/display_point/tao_drink_coconut.png
--- a/image/event/nam_hom_coconut/error/bg.png
+++ b/image/event/nam_hom_coconut/error/bg.png
--- a/image/event/nam_hom_coconut/error/coconut.png
+++ b/image/event/nam_hom_coconut/error/coconut.png
--- a/image/event/nam_hom_coconut/error/confirm_btn.png
+++ b/image/event/nam_hom_coconut/error/confirm_btn.png
--- a/image/event/nam_hom_coconut/error/confirm_btn_press.png
+++ b/image/event/nam_hom_coconut/error/confirm_btn_press.png
--- a/image/event/nam_hom_coconut/error/cura-md-bag.png
+++ b/image/event/nam_hom_coconut/error/cura-md-bag.png
--- a/image/event/nam_hom_coconut/error/text2_en.png
+++ b/image/event/nam_hom_coconut/error/text2_en.png
--- a/image/event/nam_hom_coconut/error/text2_th.png
+++ b/image/event/nam_hom_coconut/error/text2_th.png
--- a/image/event/nam_hom_coconut/error/text_en.png
+++ b/image/event/nam_hom_coconut/error/text_en.png
--- a/image/event/nam_hom_coconut/error/text_th.png
+++ b/image/event/nam_hom_coconut/error/text_th.png
--- a/image/event/nam_hom_coconut/nam_hom_coconut_en.mp4
+++ b/image/event/nam_hom_coconut/nam_hom_coconut_en.mp4
--- a/image/event/nam_hom_coconut/nam_hom_coconut_en.png
+++ b/image/event/nam_hom_coconut/nam_hom_coconut_en.png
--- a/image/event/nam_hom_coconut/nam_hom_coconut_main_page.png
+++ b/image/event/nam_hom_coconut/nam_hom_coconut_main_page.png
--- a/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_en.png
+++ b/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_en.png
--- a/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_th.png
+++ b/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_th.png
--- a/image/event/nam_hom_coconut/nam_hom_coconut_th.mp4
+++ b/image/event/nam_hom_coconut/nam_hom_coconut_th.mp4
--- a/image/event/nam_hom_coconut/nam_hom_coconut_th.png
+++ b/image/event/nam_hom_coconut/nam_hom_coconut_th.png
--- a/image/event/nam_hom_coconut/random/balance_essence_toner_reward.png
+++ b/image/event/nam_hom_coconut/random/balance_essence_toner_reward.png
--- a/image/event/nam_hom_coconut/random/balance_essence_toner_reward_text.png
+++ b/image/event/nam_hom_coconut/random/balance_essence_toner_reward_text.png
--- a/image/event/nam_hom_coconut/random/bg.png
+++ b/image/event/nam_hom_coconut/random/bg.png
--- a/image/event/nam_hom_coconut/random/bg_reward.png
+++ b/image/event/nam_hom_coconut/random/bg_reward.png
--- a/image/event/nam_hom_coconut/random/cleansing_gel_reward.png
+++ b/image/event/nam_hom_coconut/random/cleansing_gel_reward.png
--- a/image/event/nam_hom_coconut/random/cleansing_gel_reward_text.png
+++ b/image/event/nam_hom_coconut/random/cleansing_gel_reward_text.png
--- a/image/event/nam_hom_coconut/random/clear_gel_reward.png
+++ b/image/event/nam_hom_coconut/random/clear_gel_reward.png
--- a/image/event/nam_hom_coconut/random/clear_gel_reward_text.png
+++ b/image/event/nam_hom_coconut/random/clear_gel_reward_text.png
--- a/image/event/nam_hom_coconut/random/cura-md-bag_lg.png
+++ b/image/event/nam_hom_coconut/random/cura-md-bag_lg.png
--- a/image/event/nam_hom_coconut/random/cura-md-bag_md.png
+++ b/image/event/nam_hom_coconut/random/cura-md-bag_md.png
--- a/image/event/nam_hom_coconut/random/random_text.png
+++ b/image/event/nam_hom_coconut/random/random_text.png
--- a/image/event/nam_hom_coconut/random/reward_result_line_register_text.png
+++ b/image/event/nam_hom_coconut/random/reward_result_line_register_text.png
--- a/image/event/nam_hom_coconut/random/super_set_reward.png
+++ b/image/event/nam_hom_coconut/random/super_set_reward.png
--- a/image/event/nam_hom_coconut/random/super_set_reward_text.png
+++ b/image/event/nam_hom_coconut/random/super_set_reward_text.png
--- a/image/event/nam_hom_coconut/random/tumble_bottle_reward.png
+++ b/image/event/nam_hom_coconut/random/tumble_bottle_reward.png
--- a/image/event/nam_hom_coconut/random/tumble_bottle_reward_text.png
+++ b/image/event/nam_hom_coconut/random/tumble_bottle_reward_text.png
--- a/image/event/nam_hom_coconut/reward_remain.png
+++ b/image/event/nam_hom_coconut/reward_remain.png
--- a/image/page_drink_disable_n2/bn_black_tea_coconut_pro.png
+++ b/image/page_drink_disable_n2/bn_black_tea_coconut_pro.png
--- a/image/page_drink_disable_n2/bn_hot_americano_Coconut_pro.png
+++ b/image/page_drink_disable_n2/bn_hot_americano_Coconut_pro.png
--- a/image/page_drink_disable_n2/bn_hot_thai_milk_tea_coconut_pro.png
+++ b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_coconut_pro.png
--- a/image/page_drink_disable_n2/bn_iced_Cocoa_coconut_pro.png
+++ b/image/page_drink_disable_n2/bn_iced_Cocoa_coconut_pro.png
--- a/image/page_drink_disable_n2/bn_iced_Coconut_soda_pro.png
+++ b/image/page_drink_disable_n2/bn_iced_Coconut_soda_pro.png
--- a/image/page_drink_disable_n2/bn_iced_Lychee_Coconut_pro.png
+++ b/image/page_drink_disable_n2/bn_iced_Lychee_Coconut_pro.png
--- a/image/page_drink_disable_n2/bn_iced_matcha_tea_coconut_pro.png
+++ b/image/page_drink_disable_n2/bn_iced_matcha_tea_coconut_pro.png
--- a/image/page_drink_disable_n2/bn_iced_milk_coconut_pro.png
+++ b/image/page_drink_disable_n2/bn_iced_milk_coconut_pro.png
--- a/image/page_drink_disable_n2/bn_iced_pepsi_coconut_pro.png
+++ b/image/page_drink_disable_n2/bn_iced_pepsi_coconut_pro.png
--- a/image/page_drink_disable_n2/bn_jasmine_coconut_pro.png
+++ b/image/page_drink_disable_n2/bn_jasmine_coconut_pro.png
--- a/image/page_drink_disable_n2/bn_jasmine_milk_coconut_pro.png
+++ b/image/page_drink_disable_n2/bn_jasmine_milk_coconut_pro.png
--- a/image/page_drink_disable_n2/bn_match_milk_coconut_pro.png
+++ b/image/page_drink_disable_n2/bn_match_milk_coconut_pro.png
--- a/image/page_drink_disable_n2/bn_smoothie_coconut_pro.png
+++ b/image/page_drink_disable_n2/bn_smoothie_coconut_pro.png
--- a/image/page_drink_n/bn_black_tea_coconut_pro.png
+++ b/image/page_drink_n/bn_black_tea_coconut_pro.png
--- a/image/page_drink_n/bn_hot_americano_Coconut_pro.png
+++ b/image/page_drink_n/bn_hot_americano_Coconut_pro.png
--- a/image/page_drink_n/bn_hot_thai_milk_tea_coconut_pro.png
+++ b/image/page_drink_n/bn_hot_thai_milk_tea_coconut_pro.png
--- a/image/page_drink_n/bn_iced_Cocoa_coconut_pro.png
+++ b/image/page_drink_n/bn_iced_Cocoa_coconut_pro.png
--- a/image/page_drink_n/bn_iced_Coconut_soda_pro.png
+++ b/image/page_drink_n/bn_iced_Coconut_soda_pro.png
--- a/image/page_drink_n/bn_iced_Lychee_Coconut_pro.png
+++ b/image/page_drink_n/bn_iced_Lychee_Coconut_pro.png
--- a/image/page_drink_n/bn_iced_matcha_tea_coconut_pro.png
+++ b/image/page_drink_n/bn_iced_matcha_tea_coconut_pro.png
--- a/image/page_drink_n/bn_iced_milk_coconut_pro.png
+++ b/image/page_drink_n/bn_iced_milk_coconut_pro.png
--- a/image/page_drink_n/bn_iced_pepsi_coconut_pro.png
+++ b/image/page_drink_n/bn_iced_pepsi_coconut_pro.png
--- a/image/page_drink_n/bn_jasmine_coconut_pro.png
+++ b/image/page_drink_n/bn_jasmine_coconut_pro.png
--- a/image/page_drink_n/bn_jasmine_milk_coconut_pro.png
+++ b/image/page_drink_n/bn_jasmine_milk_coconut_pro.png
--- a/image/page_drink_n/bn_match_milk_coconut_pro.png
+++ b/image/page_drink_n/bn_match_milk_coconut_pro.png
--- a/image/page_drink_n/bn_smoothie_coconut_pro.png
+++ b/image/page_drink_n/bn_smoothie_coconut_pro.png
--- a/image/page_drink_picture2_n/bn_black_tea_coconut_pro.png
+++ b/image/page_drink_picture2_n/bn_black_tea_coconut_pro.png
--- a/image/page_drink_picture2_n/bn_hot_americano_Coconut_pro.png
+++ b/image/page_drink_picture2_n/bn_hot_americano_Coconut_pro.png
--- a/image/page_drink_picture2_n/bn_hot_thai_milk_tea_coconut_pro.png
+++ b/image/page_drink_picture2_n/bn_hot_thai_milk_tea_coconut_pro.png
--- a/image/page_drink_picture2_n/bn_iced_Cocoa_coconut_pro.png
+++ b/image/page_drink_picture2_n/bn_iced_Cocoa_coconut_pro.png
--- a/image/page_drink_picture2_n/bn_iced_Coconut_soda_pro.png
+++ b/image/page_drink_picture2_n/bn_iced_Coconut_soda_pro.png
--- a/image/page_drink_picture2_n/bn_iced_Lychee_Coconut_pro.png
+++ b/image/page_drink_picture2_n/bn_iced_Lychee_Coconut_pro.png
--- a/image/page_drink_picture2_n/bn_iced_matcha_tea_coconut_pro.png
+++ b/image/page_drink_picture2_n/bn_iced_matcha_tea_coconut_pro.png
--- a/image/page_drink_picture2_n/bn_iced_milk_coconut_pro.png
+++ b/image/page_drink_picture2_n/bn_iced_milk_coconut_pro.png
--- a/image/page_drink_picture2_n/bn_iced_pepsi_coconut_pro.png
+++ b/image/page_drink_picture2_n/bn_iced_pepsi_coconut_pro.png
--- a/Show more
+++ b/Show more