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

2024-05-28 10:40:14 +07:00 · 2024-05-28 10:40:14 +07:00 · c38ee57349
commit c38ee57349
parent ff6543be89 1e169bdde6
149 changed files with 9888 additions and 6985 deletions
--- a/adv/sync_1.file
+++ b/adv/sync_1.file
@ -1,5 +1,5 @@
-total 326048
-rw-rw---- 1 root sdcard_rw        0 2021-03-20 13:01 sync_1.file
+total 341344
+-rw-rw---- 1 root sdcard_rw        0 2024-05-23 23:25 sync_1.file
 -rw-rw---- 1 root sdcard_rw  3772465 2023-09-18 18:44 taobin_adv_00.mp4
 -rw-rw---- 1 root sdcard_rw  3647528 2023-09-18 18:44 taobin_adv_01.mp4
 -rw-rw---- 1 root sdcard_rw  8456105 2024-03-18 16:14 taobin_adv_02.mp4
@ -44,10 +44,10 @@ total 326048
 -rw-rw---- 1 root sdcard_rw  5875043 2023-09-18 18:44 taobin_adv_menu2_20.mp4
 -rw-rw---- 1 root sdcard_rw  2625751 2023-09-18 18:44 taobin_adv_menu_00.mp4
 -rw-rw---- 1 root sdcard_rw  2587515 2023-09-18 18:44 taobin_adv_menu_01.mp4
-rw-rw---- 1 root sdcard_rw  5712330 2024-03-18 16:13 taobin_adv_menu_02.mp4
+-rw-rw---- 1 root sdcard_rw 12272227 2024-05-21 14:49 taobin_adv_menu_02.mp4
 -rw-rw---- 1 root sdcard_rw  7482104 2024-04-11 15:57 taobin_adv_menu_03.mp4
 -rw-rw---- 1 root sdcard_rw  7200596 2024-02-21 14:56 taobin_adv_menu_04.mp4
-rw-rw---- 1 root sdcard_rw  1959800 2023-09-18 18:44 taobin_adv_menu_05.mp4
+-rw-rw---- 1 root sdcard_rw 10162524 2024-05-23 16:54 taobin_adv_menu_05.mp4
 -rw-rw---- 1 root sdcard_rw  2625751 2023-09-18 18:44 taobin_adv_menu_06.mp4
 -rw-rw---- 1 root sdcard_rw 13259746 2023-11-06 22:07 taobin_adv_menu_07.mp4
 -rw-rw---- 1 root sdcard_rw   798616 2024-04-22 15:38 taobin_adv_menu_08.mp4
@ -57,7 +57,7 @@ total 326048
 -rw-rw---- 1 root sdcard_rw   190457 2023-09-18 18:44 taobin_adv_menu_12.mp4
 -rw-rw---- 1 root sdcard_rw   258907 2023-09-18 18:44 taobin_adv_menu_13.mp4
 -rw-rw---- 1 root sdcard_rw  3868333 2023-09-18 18:44 taobin_adv_menu_14.mp4
-rw-rw---- 1 root sdcard_rw  1673445 2023-11-28 11:23 taobin_adv_menu_15.mp4
+-rw-rw---- 1 root sdcard_rw  2594334 2024-05-20 16:50 taobin_adv_menu_15.mp4
 -rw-rw---- 1 root sdcard_rw  1716437 2023-09-18 18:44 taobin_adv_menu_16.mp4
 -rw-rw---- 1 root sdcard_rw 18310974 2023-09-18 18:44 taobin_adv_menu_17.mp4
 -rw-rw---- 1 root sdcard_rw  2165663 2023-09-18 18:44 taobin_adv_menu_18.mp4
--- a/adv/taobin_adv_menu_02.mp4
+++ b/adv/taobin_adv_menu_02.mp4
--- a/adv/taobin_adv_menu_05.mp4
+++ b/adv/taobin_adv_menu_05.mp4
--- a/adv/taobin_adv_menu_15.mp4
+++ b/adv/taobin_adv_menu_15.mp4
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@ -1017,6 +1017,8 @@ Coconut Soda	12-05-02-0090	1	62	13	23						24	120	15:00	23
 Coconut Lychee Soda	12-05-02-0093	1	62	11	13	23					24	120	16:00	23
 Coconut Pepsi	12-05-02-0091	1	62	14	13	23					24	120	17:00	23
 Coconut Smoothie	12-05-03-0092	1	62	23	41						24	120	18:00	23
+Coconut Pepsi	12-05-02-0117	1	62	14	13	23					24	120	17:00	23
+Coconut Smoothie	12-05-03-0117	1	62	23	41						24	120	18:00	23
 Coconut Chocolate milk	12-03-02-0059	1	7	15	62	23					24	120	19:00	23
 Coconut Chocolate milk	12-03-03-0059	1	7	15	62	23	41				24	120	20:00	23
 Coconut Matcha latte	12-02-02-0060	1	8	9	7	62	23				24	120	21:00	23
--- a/image/event/energy_drink_1_bath/1_baht_energy_TH.png
+++ b/image/event/energy_drink_1_bath/1_baht_energy_TH.png
--- a/image/page_doing/txt_61_en.png
+++ b/image/page_doing/txt_61_en.png
--- a/image/page_doing/txt_62.png
+++ b/image/page_doing/txt_62.png
--- a/image/page_doing/txt_62_en.png
+++ b/image/page_doing/txt_62_en.png
--- a/image/page_drink_disable_n2/bn_BananaOreo_smoothie_pro.png
+++ b/image/page_drink_disable_n2/bn_BananaOreo_smoothie_pro.png
--- a/image/page_drink_disable_n2/bn_ChocoBanana_milk_pro.png
+++ b/image/page_drink_disable_n2/bn_ChocoBanana_milk_pro.png
--- a/image/page_drink_disable_n2/bn_iced_pepsi.png
+++ b/image/page_drink_disable_n2/bn_iced_pepsi.png
--- a/image/page_drink_disable_n2/bn_iced_pepsi_plum.png
+++ b/image/page_drink_disable_n2/bn_iced_pepsi_plum.png
--- a/image/page_drink_n/bn_BananaOreo_smoothie_pro.png
+++ b/image/page_drink_n/bn_BananaOreo_smoothie_pro.png
--- a/image/page_drink_n/bn_ChocoBanana_milk_pro.png
+++ b/image/page_drink_n/bn_ChocoBanana_milk_pro.png
--- a/image/page_drink_picture2_n/bn_BananaOreo_smoothie_pro.png
+++ b/image/page_drink_picture2_n/bn_BananaOreo_smoothie_pro.png
--- a/image/page_drink_picture2_n/bn_ChocoBanana_milk_pro.png
+++ b/image/page_drink_picture2_n/bn_ChocoBanana_milk_pro.png
--- a/image/page_drink_picture2_n/bn_PEPSI_BANANA.png
+++ b/image/page_drink_picture2_n/bn_PEPSI_BANANA.png
--- a/image/page_drink_picture2_n/bn_PEPSI_COFFEE.png
+++ b/image/page_drink_picture2_n/bn_PEPSI_COFFEE.png
--- a/image/page_drink_picture2_n/bn_PEPSI_LYCHEE.png
+++ b/image/page_drink_picture2_n/bn_PEPSI_LYCHEE.png
--- a/image/page_drink_picture2_n/bn_PEPSI_MELON.png
+++ b/image/page_drink_picture2_n/bn_PEPSI_MELON.png
--- a/image/page_drink_picture2_n/bn_PEPSI_PLUM.png
+++ b/image/page_drink_picture2_n/bn_PEPSI_PLUM.png
--- a/image/page_drink_picture2_n/bn_PEPSI_SALA.png
+++ b/image/page_drink_picture2_n/bn_PEPSI_SALA.png
--- a/image/page_drink_picture2_n/bn_PEPSI_YUZU.png
+++ b/image/page_drink_picture2_n/bn_PEPSI_YUZU.png
--- a/image/page_drink_picture2_n/bn_iced_pepsi_Banana.png
+++ b/image/page_drink_picture2_n/bn_iced_pepsi_Banana.png
--- a/image/page_drink_picture2_n/bn_iced_pepsi_plum.png
+++ b/image/page_drink_picture2_n/bn_iced_pepsi_plum.png
--- a/image/page_drink_picture2_n/bn_iced_pepsi_yuzu.png
+++ b/image/page_drink_picture2_n/bn_iced_pepsi_yuzu.png
--- a/image/page_drink_press_n/bn_BananaOreo_smoothie_pro.png
+++ b/image/page_drink_press_n/bn_BananaOreo_smoothie_pro.png
--- a/image/page_drink_press_n/bn_ChocoBanana_milk_pro.png
+++ b/image/page_drink_press_n/bn_ChocoBanana_milk_pro.png
--- a/inter/aus/image/collect_point/redeem/keep_collecting_btn.png
+++ b/inter/aus/image/collect_point/redeem/keep_collecting_btn.png
--- a/inter/aus/image/collect_point/redeem/keep_collecting_btn_pressed.png
+++ b/inter/aus/image/collect_point/redeem/keep_collecting_btn_pressed.png
--- a/inter/aus/image/collect_point/redeem/redeem_1dollar_content.png
+++ b/inter/aus/image/collect_point/redeem/redeem_1dollar_content.png
--- a/inter/aus/image/collect_point/redeem/redeem_1dollar_header.png
+++ b/inter/aus/image/collect_point/redeem/redeem_1dollar_header.png
--- a/inter/aus/image/collect_point/redeem/redeem_2dollar_content.png
+++ b/inter/aus/image/collect_point/redeem/redeem_2dollar_content.png
--- a/inter/aus/image/collect_point/redeem/redeem_2dollar_header.png
+++ b/inter/aus/image/collect_point/redeem/redeem_2dollar_header.png
--- a/inter/aus/image/collect_point/redeem/redeem_fail_content.png
+++ b/inter/aus/image/collect_point/redeem/redeem_fail_content.png
--- a/inter/aus/image/collect_point/redeem/redeem_fail_header.png
+++ b/inter/aus/image/collect_point/redeem/redeem_fail_header.png
--- a/inter/aus/image/collect_point/redeem/redeem_get_free_content.png
+++ b/inter/aus/image/collect_point/redeem/redeem_get_free_content.png
--- a/inter/aus/image/collect_point/redeem/redeem_get_free_header.png
+++ b/inter/aus/image/collect_point/redeem/redeem_get_free_header.png
--- a/inter/aus/image/collect_point/redeem/redeem_now_btn.png
+++ b/inter/aus/image/collect_point/redeem/redeem_now_btn.png
--- a/inter/aus/image/collect_point/redeem/redeem_now_btn_pressed.png
+++ b/inter/aus/image/collect_point/redeem/redeem_now_btn_pressed.png
--- a/inter/aus/image/collect_point/redeem/redeem_success_content.png
+++ b/inter/aus/image/collect_point/redeem/redeem_success_content.png
--- a/inter/aus/image/collect_point/redeem/redeem_success_header.png
+++ b/inter/aus/image/collect_point/redeem/redeem_success_header.png
--- a/inter/aus/image/collect_point/redeem/success_header_bg.png
+++ b/inter/aus/image/collect_point/redeem/success_header_bg.png
--- a/inter/aus/image/collect_point/show_point/close_btn.png
+++ b/inter/aus/image/collect_point/show_point/close_btn.png
--- a/inter/aus/image/collect_point/show_point/close_btn_pressed.png
+++ b/inter/aus/image/collect_point/show_point/close_btn_pressed.png
--- a/inter/aus/image/collect_point/show_point/default_points.png
+++ b/inter/aus/image/collect_point/show_point/default_points.png
--- a/inter/aus/image/collect_point/show_point/member-profile-bg.png
+++ b/inter/aus/image/collect_point/show_point/member-profile-bg.png
--- a/inter/aus/image/collect_point/show_point/points-alert-container.png
+++ b/inter/aus/image/collect_point/show_point/points-alert-container.png
--- a/inter/aus/image/collect_point/show_point/points-redemption-bg.png
+++ b/inter/aus/image/collect_point/show_point/points-redemption-bg.png
--- a/inter/aus/image/collect_point/show_point/redeem_btn.png
+++ b/inter/aus/image/collect_point/show_point/redeem_btn.png
--- a/inter/aus/image/collect_point/show_point/redeem_btn_disable.png
+++ b/inter/aus/image/collect_point/show_point/redeem_btn_disable.png
--- a/inter/aus/image/collect_point/show_point/redeem_btn_pressed.png
+++ b/inter/aus/image/collect_point/show_point/redeem_btn_pressed.png
--- a/inter/aus/image/collect_point/show_point/shell.png
+++ b/inter/aus/image/collect_point/show_point/shell.png
--- a/inter/aus/image/collect_point/show_point/shell_discount_1dollar_active.png
+++ b/inter/aus/image/collect_point/show_point/shell_discount_1dollar_active.png
--- a/inter/aus/image/collect_point/show_point/shell_discount_1dollar_inactive.png
+++ b/inter/aus/image/collect_point/show_point/shell_discount_1dollar_inactive.png
--- a/inter/aus/image/collect_point/show_point/shell_discount_2dollar_active.png
+++ b/inter/aus/image/collect_point/show_point/shell_discount_2dollar_active.png
--- a/inter/aus/image/collect_point/show_point/shell_discount_2dollar_inactive.png
+++ b/inter/aus/image/collect_point/show_point/shell_discount_2dollar_inactive.png
--- a/inter/aus/image/collect_point/show_point/shell_get_free_active.png
+++ b/inter/aus/image/collect_point/show_point/shell_get_free_active.png
--- a/inter/aus/xml/page_collect_point_3.lxml
+++ b/inter/aus/xml/page_collect_point_3.lxml
--- a/inter/sgp/animation01/play_list.tsv
+++ b/inter/sgp/animation01/play_list.tsv
@ -859,6 +859,8 @@ Coconut Soda	52-05-02-0090	1	62	13	23						24	120	15:00	23
 Coconut Lychee Soda	52-05-02-0093	1	62	11	13	23					24	120	16:00	23
 Coconut Pepsi	52-05-02-0091	1	62	14	13	23					24	120	17:00	23
 Coconut Smoothie	52-05-03-0092	1	62	23	41						24	120	18:00	23
+Coconut Pepsi	52-05-02-0117	1	62	14	13	23					24	120	17:00	23
+Coconut Smoothie	52-05-03-0117	1	62	23	41						24	120	18:00	23
 Coconut Chocolate milk	52-03-02-0059	1	7	15	62	23					24	120	19:00	23
 Coconut Chocolate milk	52-03-03-0059	1	7	15	62	23	41				24	120	20:00	23
 Coconut Matcha latte	52-02-02-0060	1	8	9	7	62	23				24	120	21:00	23
--- a/inter/sgp/image/page_doing/txt_61_en.png
+++ b/inter/sgp/image/page_doing/txt_61_en.png
--- a/inter/sgp/image/page_doing/txt_62_en.png
+++ b/inter/sgp/image/page_doing/txt_62_en.png
--- a/inter/sgp/image/page_drink_disable_n2/bn_Mint_pepsi.png
+++ b/inter/sgp/image/page_drink_disable_n2/bn_Mint_pepsi.png
--- a/inter/sgp/image/page_drink_disable_n2/bn_iced_pepsi.png
+++ b/inter/sgp/image/page_drink_disable_n2/bn_iced_pepsi.png
--- a/inter/sgp/image/page_drink_disable_n2/bn_iced_pepsi_Banana.png
+++ b/inter/sgp/image/page_drink_disable_n2/bn_iced_pepsi_Banana.png
--- a/inter/sgp/image/page_drink_disable_n2/bn_iced_pepsi_Melon.png
+++ b/inter/sgp/image/page_drink_disable_n2/bn_iced_pepsi_Melon.png
--- a/inter/sgp/image/page_drink_disable_n2/bn_iced_pepsi_coconut.png
+++ b/inter/sgp/image/page_drink_disable_n2/bn_iced_pepsi_coconut.png
--- a/inter/sgp/image/page_drink_disable_n2/bn_iced_pepsi_plum.png
+++ b/inter/sgp/image/page_drink_disable_n2/bn_iced_pepsi_plum.png
--- a/inter/sgp/image/page_drink_disable_n2/bn_iced_pepsi_smoothie.png
+++ b/inter/sgp/image/page_drink_disable_n2/bn_iced_pepsi_smoothie.png
--- a/inter/sgp/image/page_drink_disable_n2/bn_iced_pepsi_yuzu.png
+++ b/inter/sgp/image/page_drink_disable_n2/bn_iced_pepsi_yuzu.png
--- a/inter/sgp/image/page_drink_disable_n2/bn_peach_pepsi.png
+++ b/inter/sgp/image/page_drink_disable_n2/bn_peach_pepsi.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_Mint_pepsi.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_Mint_pepsi.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_PEPSI_BANANA.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_PEPSI_BANANA.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_PEPSI_COFFEE.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_PEPSI_COFFEE.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_PEPSI_LYCHEE.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_PEPSI_LYCHEE.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_PEPSI_MELON.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_PEPSI_MELON.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_PEPSI_PLUM.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_PEPSI_PLUM.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_PEPSI_SALA.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_PEPSI_SALA.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_PEPSI_YUZU.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_PEPSI_YUZU.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_iced_pepsi.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_iced_pepsi.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_iced_pepsi_Banana.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_iced_pepsi_Banana.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_iced_pepsi_Melon.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_iced_pepsi_Melon.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_iced_pepsi_coconut.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_iced_pepsi_coconut.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_iced_pepsi_plum.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_iced_pepsi_plum.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_iced_pepsi_smoothie.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_iced_pepsi_smoothie.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_iced_pepsi_yuzu.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_iced_pepsi_yuzu.png
--- a/inter/sgp/image/page_drink_picture2_n/bn_peach_pepsi.png
+++ b/inter/sgp/image/page_drink_picture2_n/bn_peach_pepsi.png
--- a/inter/sgp/image/page_drink_press_n/bn_Mint_pepsi.png
+++ b/inter/sgp/image/page_drink_press_n/bn_Mint_pepsi.png
--- a/inter/sgp/image/page_drink_press_n/bn_iced_pepsi.png
+++ b/inter/sgp/image/page_drink_press_n/bn_iced_pepsi.png
--- a/inter/sgp/image/page_drink_press_n/bn_iced_pepsi_Banana.png
+++ b/inter/sgp/image/page_drink_press_n/bn_iced_pepsi_Banana.png
--- a/inter/sgp/image/page_drink_press_n/bn_iced_pepsi_Melon.png
+++ b/inter/sgp/image/page_drink_press_n/bn_iced_pepsi_Melon.png
--- a/inter/sgp/image/page_drink_press_n/bn_iced_pepsi_coconut.png
+++ b/inter/sgp/image/page_drink_press_n/bn_iced_pepsi_coconut.png
--- a/inter/sgp/image/page_drink_press_n/bn_iced_pepsi_plum.png
+++ b/inter/sgp/image/page_drink_press_n/bn_iced_pepsi_plum.png
--- a/inter/sgp/image/page_drink_press_n/bn_iced_pepsi_smoothie.png
+++ b/inter/sgp/image/page_drink_press_n/bn_iced_pepsi_smoothie.png
--- a/inter/sgp/image/page_drink_press_n/bn_iced_pepsi_yuzu.png
+++ b/inter/sgp/image/page_drink_press_n/bn_iced_pepsi_yuzu.png
--- a/inter/sgp/image/page_drink_press_n/bn_peach_pepsi.png
+++ b/inter/sgp/image/page_drink_press_n/bn_peach_pepsi.png
--- a/inter/sgp/image/page_payment/bd_credit_card_ezlink.png
+++ b/inter/sgp/image/page_payment/bd_credit_card_ezlink.png
--- a/inter/sgp/image/page_payment/bn_credit_card_ezlink.png
+++ b/inter/sgp/image/page_payment/bn_credit_card_ezlink.png
--- a/inter/sgp/image/page_payment/img_tap_card_5_sec.png
+++ b/inter/sgp/image/page_payment/img_tap_card_5_sec.png
--- a/Show more
+++ b/Show more