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

2024-11-20 15:47:01 +07:00 · 2024-11-20 15:47:01 +07:00 · 45632d48ef
commit 45632d48ef
parent 92c5ce320c 6184a0a8f9
9006 changed files with 584941 additions and 13182 deletions
--- a/adv/sync_1.file
+++ b/adv/sync_1.file
@ -1,26 +1,6 @@
-total 250892
-rw-rw---- 1 root sdcard_rw        0 2024-11-01 10:08 sync_1.file
+total 138328
+-rw-rw---- 1 root sdcard_rw        0 2024-11-12 17:41 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
-rw-rw---- 1 root sdcard_rw 11657827 2024-03-06 16:09 taobin_adv_03.mp4
-rw-rw---- 1 root sdcard_rw  7138742 2024-02-21 14:55 taobin_adv_04.mp4
-rw-rw---- 1 root sdcard_rw  2686245 2023-09-18 18:44 taobin_adv_05.mp4
-rw-rw---- 1 root sdcard_rw  3772465 2023-09-18 18:44 taobin_adv_06.mp4
-rw-rw---- 1 root sdcard_rw 12701242 2023-11-06 22:08 taobin_adv_07.mp4
-rw-rw---- 1 root sdcard_rw  8538147 2024-02-21 14:53 taobin_adv_08.mp4
-rw-rw---- 1 root sdcard_rw  7003766 2024-02-21 13:03 taobin_adv_09.mp4
-rw-rw---- 1 root sdcard_rw  2722307 2023-09-18 18:44 taobin_adv_10.mp4
-rw-rw---- 1 root sdcard_rw   532214 2023-11-16 16:48 taobin_adv_11.mp4
-rw-rw---- 1 root sdcard_rw   257107 2023-09-18 18:44 taobin_adv_12.mp4
-rw-rw---- 1 root sdcard_rw   381590 2023-09-18 18:44 taobin_adv_13.mp4
-rw-rw---- 1 root sdcard_rw  5352097 2023-09-18 18:44 taobin_adv_14.mp4
-rw-rw---- 1 root sdcard_rw  2710208 2023-11-28 11:23 taobin_adv_15.mp4
-rw-rw---- 1 root sdcard_rw  2229541 2023-09-18 18:44 taobin_adv_16.mp4
-rw-rw---- 1 root sdcard_rw 18918525 2023-09-18 18:44 taobin_adv_17.mp4
-rw-rw---- 1 root sdcard_rw  2526278 2023-09-18 18:44 taobin_adv_18.mp4
-rw-rw---- 1 root sdcard_rw 14745021 2023-10-31 17:06 taobin_adv_19.mp4
-rw-rw---- 1 root sdcard_rw  9424753 2023-09-18 18:44 taobin_adv_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  7417004 2024-07-23 09:12 taobin_adv_menu_01.mp4
 -rw-rw---- 1 root sdcard_rw 12272227 2024-05-21 14:49 taobin_adv_menu_02.mp4
@ -30,7 +10,7 @@ total 250892
 -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  1422061 2024-08-19 16:55 taobin_adv_menu_08.mp4
-rw-rw---- 1 root sdcard_rw  3876868 2024-05-29 09:16 taobin_adv_menu_09.mp4
+-rw-rw---- 1 root sdcard_rw  6479855 2024-11-12 16:52 taobin_adv_menu_09.mp4
 -rw-rw---- 1 root sdcard_rw 11866329 2024-09-02 15:56 taobin_adv_menu_10.mp4
 -rw-rw---- 1 root sdcard_rw  1421871 2024-02-22 08:57 taobin_adv_menu_11.mp4
 -rw-rw---- 1 root sdcard_rw  1151618 2024-06-14 16:56 taobin_adv_menu_12.mp4
@ -39,6 +19,6 @@ total 250892
 -rw-rw---- 1 root sdcard_rw  2594334 2024-05-20 16:50 taobin_adv_menu_15.mp4
 -rw-rw---- 1 root sdcard_rw  8680417 2024-10-07 15:33 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
+-rw-rw---- 1 root sdcard_rw  9807774 2024-11-06 09:22 taobin_adv_menu_18.mp4
 -rw-rw---- 1 root sdcard_rw 10498599 2023-10-31 17:06 taobin_adv_menu_19.mp4
 -rw-rw---- 1 root sdcard_rw  2353764 2024-11-01 10:02 taobin_adv_menu_20.mp4
--- a/adv/taobin_adv_01.mp4
+++ b/adv/taobin_adv_01.mp4
--- a/adv/taobin_adv_04.mp4
+++ b/adv/taobin_adv_04.mp4
--- a/adv/taobin_adv_05.mp4
+++ b/adv/taobin_adv_05.mp4
--- a/adv/taobin_adv_08.mp4
+++ b/adv/taobin_adv_08.mp4
--- a/adv/taobin_adv_09.mp4
+++ b/adv/taobin_adv_09.mp4
--- a/adv/taobin_adv_10.mp4
+++ b/adv/taobin_adv_10.mp4
--- a/adv/taobin_adv_11.mp4
+++ b/adv/taobin_adv_11.mp4
--- a/adv/taobin_adv_12.mp4
+++ b/adv/taobin_adv_12.mp4
--- a/adv/taobin_adv_13.mp4
+++ b/adv/taobin_adv_13.mp4
--- a/adv/taobin_adv_14.mp4
+++ b/adv/taobin_adv_14.mp4
--- a/adv/taobin_adv_15.mp4
+++ b/adv/taobin_adv_15.mp4
--- a/adv/taobin_adv_16.mp4
+++ b/adv/taobin_adv_16.mp4
--- a/adv/taobin_adv_18.mp4
+++ b/adv/taobin_adv_18.mp4
--- a/adv/taobin_adv_menu_09.mp4
+++ b/adv/taobin_adv_menu_09.mp4
--- a/adv/taobin_adv_menu_18.mp4
+++ b/adv/taobin_adv_menu_18.mp4
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@ -504,33 +504,6 @@ ICED AMERICANO BLUE DADDY	12-01-03-0019	1	2	36	3	4	5	23	16	41	24	133	2:13	32
 Coke	12-05-03-0019	1	23	37	13	41					24	49	0:49	23


-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 รีเมียมเอสเพรสโซ่คาราเมลโอริโอ้	12-21-03-0078	1	2	3	4	14	23	41			24	49	11:01	23


@ -547,55 +520,6 @@ PEPSI COCOA OREO	12-99-03-0067	1	14	40	15	23	41				24	49	10:01	23



-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 Hot Latte	12-01-81-0004	1	2	3	4	5	6	70			24	1170	10:30	19
 Hot Cappucino	12-01-81-0005	1	2	3	4	5	6	70			24	136	2:16	22
 Hot Milk	12-03-81-0005	1	6	70							24	102	1:42	49
@ -1231,3 +1155,17 @@ Strawberry milk 7Up lime  top ovaltine	12-03-03-0083	1	18	19	17	23	41	51			24	13
 โกโก้ยูซุปั่น	12-99-03-0035	1	15	53	23	41					24	133	12:13	22
 กาแฟชานมไต้หวันปั่น	12-99-03-0036	1	2	3	4	5	10	23	41		24	133	13:13	22
 กาแฟชานมไต้หวันปั่น	12-99-03-0038	1	2	3	4	5	10	23	41		24	133	14:13	22
+
+ชานมขิงโอรีโอปั่น	12-02-03-0056	1	40	7	10	23	41				24	49	10:01	23
+นมมะพร้าวปั่นโอรีโอ\nภูเขาไฟ	12-03-03-0086	1	40	62	23	41					24	49	10:01	23
+นมยูสุปั่นโอรีโอภูเขาไฟ	12-03-03-0087	1	40	53	23	41					24	49	10:01	23
+
+
+
+
+
+
+
+
+
+	 
--- a/font/Noto_Sans_Thai/NotoSansThai-Black.ttf
+++ b/font/Noto_Sans_Thai/NotoSansThai-Black.ttf
--- a/font/Noto_Sans_Thai/NotoSansThai-Bold.ttf
+++ b/font/Noto_Sans_Thai/NotoSansThai-Bold.ttf
--- a/font/Noto_Sans_Thai/NotoSansThai-ExtraBold.ttf
+++ b/font/Noto_Sans_Thai/NotoSansThai-ExtraBold.ttf
--- a/font/Noto_Sans_Thai/NotoSansThai-ExtraLight.ttf
+++ b/font/Noto_Sans_Thai/NotoSansThai-ExtraLight.ttf
--- a/font/Noto_Sans_Thai/NotoSansThai-Light.ttf
+++ b/font/Noto_Sans_Thai/NotoSansThai-Light.ttf
--- a/font/Noto_Sans_Thai/NotoSansThai-Medium.ttf
+++ b/font/Noto_Sans_Thai/NotoSansThai-Medium.ttf
--- a/font/Noto_Sans_Thai/NotoSansThai-Regular.ttf
+++ b/font/Noto_Sans_Thai/NotoSansThai-Regular.ttf
--- a/font/Noto_Sans_Thai/NotoSansThai-SemiBold.ttf
+++ b/font/Noto_Sans_Thai/NotoSansThai-SemiBold.ttf
--- a/font/Noto_Sans_Thai/NotoSansThai-Thin.ttf
+++ b/font/Noto_Sans_Thai/NotoSansThai-Thin.ttf
--- a/image/collectiing/bd_pay_with_cashACU.png
+++ b/image/collectiing/bd_pay_with_cashACU.png
--- a/image/collectiing/bn_pay_with_cashACU.png
+++ b/image/collectiing/bn_pay_with_cashACU.png
--- a/image/collectiing/bp_pay_with_cashACU.png
+++ b/image/collectiing/bp_pay_with_cashACU.png
--- a/image/drink_option_mmr/blend.png
+++ b/image/drink_option_mmr/blend.png
--- a/image/drink_option_mmr/blend_db.png
+++ b/image/drink_option_mmr/blend_db.png
--- a/image/drink_option_mmr/cold.png
+++ b/image/drink_option_mmr/cold.png
--- a/image/drink_option_mmr/cold_db.png
+++ b/image/drink_option_mmr/cold_db.png
--- a/image/drink_option_mmr/hot.png
+++ b/image/drink_option_mmr/hot.png
--- a/image/drink_option_mmr/hot_db.png
+++ b/image/drink_option_mmr/hot_db.png
--- a/image/drink_option_mmr/normal.png
+++ b/image/drink_option_mmr/normal.png
--- a/image/drink_option_mmr/option_deactive.png
+++ b/image/drink_option_mmr/option_deactive.png
--- a/image/drink_option_mmr/pricetaotim.png
+++ b/image/drink_option_mmr/pricetaotim.png
--- a/image/event/happy_trios/happy_trios_en.png
+++ b/image/event/happy_trios/happy_trios_en.png
--- a/image/event/happy_trios/happy_trios_th.png
+++ b/image/event/happy_trios/happy_trios_th.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_en.png
+normal_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
+press_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
+press_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
+disable_eng=ROOT/taobin_project/image/event/happy_trios/happy_trios_en.png
+disable_thai=ROOT/taobin_project/image/event/happy_trios/happy_trios_th.png
--- a/image/lang/bn_myanmar_lang.png
+++ b/image/lang/bn_myanmar_lang.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/page2_inter/bn_Pepsi_7up.png
+++ b/image/page2_inter/bn_Pepsi_7up.png
--- a/image/page2_inter/bn_myanmar_lang.png
+++ b/image/page2_inter/bn_myanmar_lang.png
--- a/image/page2_inter/bp_Pepsi_7up.png
+++ b/image/page2_inter/bp_Pepsi_7up.png
--- a/image/page3_2_mmr/bn_Pepsi_7up.png
+++ b/image/page3_2_mmr/bn_Pepsi_7up.png
--- a/image/page3_2_mmr/bn_appfast2.png
+++ b/image/page3_2_mmr/bn_appfast2.png
--- a/image/page3_2_mmr/bn_cho_ca2.png
+++ b/image/page3_2_mmr/bn_cho_ca2.png
--- a/image/page3_2_mmr/bn_cocktail.png
+++ b/image/page3_2_mmr/bn_cocktail.png
--- a/image/page3_2_mmr/bn_coffee2.png
+++ b/image/page3_2_mmr/bn_coffee2.png
--- a/image/page3_2_mmr/bn_forkid2.png
+++ b/image/page3_2_mmr/bn_forkid2.png
--- a/image/page3_2_mmr/bn_health.png
+++ b/image/page3_2_mmr/bn_health.png
--- a/image/page3_2_mmr/bn_protein2.png
+++ b/image/page3_2_mmr/bn_protein2.png
--- a/image/page3_2_mmr/bn_recommend2.png
+++ b/image/page3_2_mmr/bn_recommend2.png
--- a/image/page3_2_mmr/bn_recommend3.png
+++ b/image/page3_2_mmr/bn_recommend3.png
--- a/image/page3_2_mmr/bn_sodada2.png
+++ b/image/page3_2_mmr/bn_sodada2.png
--- a/image/page3_2_mmr/bn_tea2.png
+++ b/image/page3_2_mmr/bn_tea2.png
--- a/image/page3_2_mmr/bn_vending2.png
+++ b/image/page3_2_mmr/bn_vending2.png
--- a/image/page3_2_mmr/bp_Pepsi_7up.png
+++ b/image/page3_2_mmr/bp_Pepsi_7up.png
--- a/image/page3_2_mmr/bp_appfast2.png
+++ b/image/page3_2_mmr/bp_appfast2.png
--- a/image/page3_2_mmr/bp_cho_ca2.png
+++ b/image/page3_2_mmr/bp_cho_ca2.png
--- a/image/page3_2_mmr/bp_cocktail.png
+++ b/image/page3_2_mmr/bp_cocktail.png
--- a/image/page3_2_mmr/bp_coffee2.png
+++ b/image/page3_2_mmr/bp_coffee2.png
--- a/image/page3_2_mmr/bp_forkid2.png
+++ b/image/page3_2_mmr/bp_forkid2.png
--- a/image/page3_2_mmr/bp_health.png
+++ b/image/page3_2_mmr/bp_health.png
--- a/image/page3_2_mmr/bp_protein2.png
+++ b/image/page3_2_mmr/bp_protein2.png
--- a/image/page3_2_mmr/bp_recommend2.png
+++ b/image/page3_2_mmr/bp_recommend2.png
--- a/image/page3_2_mmr/bp_recommend3.png
+++ b/image/page3_2_mmr/bp_recommend3.png
--- a/image/page3_2_mmr/bp_sodada2.png
+++ b/image/page3_2_mmr/bp_sodada2.png
--- a/image/page3_2_mmr/bp_tea2.png
+++ b/image/page3_2_mmr/bp_tea2.png
--- a/image/page3_2_mmr/bp_vending2.png
+++ b/image/page3_2_mmr/bp_vending2.png
--- a/image/page_doing/brewing_txt_adv16.png
+++ b/image/page_doing/brewing_txt_adv16.png
--- a/image/page_doing/brewing_txt_adv16_en.png
+++ b/image/page_doing/brewing_txt_adv16_en.png
--- a/image/page_doing/brewing_txt_adv17.png
+++ b/image/page_doing/brewing_txt_adv17.png
--- a/image/page_doing/brewing_txt_adv17_en.png
+++ b/image/page_doing/brewing_txt_adv17_en.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/page_payment/img_popup22.png
+++ b/image/page_payment/img_popup22.png
--- a/image/page_payment_en/page_payment/img_popup22.png
+++ b/image/page_payment_en/page_payment/img_popup22.png
--- a/image/topping2/bd_add_jemila.png
+++ b/image/topping2/bd_add_jemila.png
--- a/Show more
+++ b/Show more