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

2024-11-13 12:10:15 +07:00 · 2024-11-13 12:10:15 +07:00 · a7fb727db5
commit a7fb727db5
parent 61bbdef355 e3b9c092e7
384 changed files with 8780 additions and 7552 deletions
--- a/adv/sync_1.file
+++ b/adv/sync_1.file
@ -1,5 +1,5 @@
-total 250892
-rw-rw---- 1 root sdcard_rw        0 2024-11-01 10:08 sync_1.file
+total 258384
+-rw-rw---- 1 root sdcard_rw        0 2024-11-10 15:15 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
@ -39,6 +39,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_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/event/oreo_11/bn_close_en.png
+++ b/image/event/oreo_11/bn_close_en.png
--- a/image/event/oreo_11/bn_close_th.png
+++ b/image/event/oreo_11/bn_close_th.png
--- a/image/event/oreo_11/bp_close_en.png
+++ b/image/event/oreo_11/bp_close_en.png
--- a/image/event/oreo_11/bp_close_th.png
+++ b/image/event/oreo_11/bp_close_th.png
--- a/image/event/oreo_11/error_en.png
+++ b/image/event/oreo_11/error_en.png
--- a/image/event/oreo_11/error_th.png
+++ b/image/event/oreo_11/error_th.png
--- a/image/event/weekday_discount/weekday_discount_en.png
+++ b/image/event/weekday_discount/weekday_discount_en.png
--- a/image/event/weekday_discount/weekday_discount_th.png
+++ b/image/event/weekday_discount/weekday_discount_th.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_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_iced_Jemila_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_iced_Jemila_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_iced_americano_soda_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_iced_americano_soda_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_smoothie_coconut_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_smoothie_coconut_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png
--- a/image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount_event_on.png
+++ b/image/page_drink_disable_n2/bn_super_oreo_volcano_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_iced_americano_soda_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_iced_americano_soda_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_smoothie_coconut_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_smoothie_coconut_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png
--- a/image/page_drink_n/bn_super_oreo_volcano_weekday_discount_event_on.png
+++ b/image/page_drink_n/bn_super_oreo_volcano_weekday_discount_event_on.png
--- a/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_picture2_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_picture2_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_picture2_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_picture2_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_picture2_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_picture2_n/bn_iced_americano_soda_weekday_discount_event_on.png
+++ b/image/page_drink_picture2_n/bn_iced_americano_soda_weekday_discount_event_on.png
--- a/image/page_drink_picture2_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_picture2_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_picture2_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_picture2_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png
+++ b/image/page_drink_picture2_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png
--- a/image/page_drink_picture2_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png
+++ b/image/page_drink_picture2_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png
--- a/image/page_drink_picture2_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png
+++ b/image/page_drink_picture2_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png
--- a/image/page_drink_picture2_n/bn_smoothie_coconut_weekday_discount_event_on.png
+++ b/image/page_drink_picture2_n/bn_smoothie_coconut_weekday_discount_event_on.png
--- a/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png
+++ b/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png
--- a/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png
+++ b/image/page_drink_picture2_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png
--- a/image/page_drink_picture2_n/bn_super_oreo_volcano_oreo_11_th.png
+++ b/image/page_drink_picture2_n/bn_super_oreo_volcano_oreo_11_th.png
--- a/image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount_event_on.png
+++ b/image/page_drink_picture2_n/bn_super_oreo_volcano_weekday_discount_event_on.png
--- a/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_press_n/bn_Caramel_Espresso_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_press_n/bn_Caramel_GreenTea_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_press_n/bn_Caramel_ThaiTea_Oreo_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_press_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_press_n/bn_iced_Jemila_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_press_n/bn_iced_americano_soda_weekday_discount_event_on.png
+++ b/image/page_drink_press_n/bn_iced_americano_soda_weekday_discount_event_on.png
--- a/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_press_n/bn_iced_strawberrycocoa_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png
+++ b/image/page_drink_press_n/bn_iced_strawberrymilk_smoothie_weekday_discount_event_on.png
--- a/image/page_drink_press_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png
+++ b/image/page_drink_press_n/bn_smoothie_cocoa_caramel_weekday_discount_event_on.png
--- a/image/page_drink_press_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png
+++ b/image/page_drink_press_n/bn_smoothie_coconut_cocoa_weekday_discount_event_on.png
--- a/image/page_drink_press_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png
+++ b/image/page_drink_press_n/bn_smoothie_coconut_thai_tea_weekday_discount_event_on.png
--- a/image/page_drink_press_n/bn_smoothie_coconut_weekday_discount_event_on.png
+++ b/image/page_drink_press_n/bn_smoothie_coconut_weekday_discount_event_on.png
--- a/image/page_drink_press_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png
+++ b/image/page_drink_press_n/bn_smoothie_super_cocoa_x2_weekday_discount_event_on.png
--- a/image/page_drink_press_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png
+++ b/image/page_drink_press_n/bn_smoothie_super_cocoa_x3_weekday_discount_event_on.png
--- a/image/page_drink_press_n/bn_super_oreo_volcano_weekday_discount_event_on.png
+++ b/image/page_drink_press_n/bn_super_oreo_volcano_weekday_discount_event_on.png
--- a/image/page_payment/img_popup22.png
+++ b/image/page_payment/img_popup22.png
--- a/image/page_payment_en/page_payment/img_popup1-AUS.png
+++ b/image/page_payment_en/page_payment/img_popup1-AUS.png
--- a/image/page_payment_en/page_payment/img_popup22.png
+++ b/image/page_payment_en/page_payment/img_popup22.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Pie.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Pie.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_AMERICANO.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_AMERICANO.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_CHOCOLATE_MILK.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_CHOCOLATE_MILK.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LYCHEE_SODA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LYCHEE_SODA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MILK.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MILK.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SMOOTHIE.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SMOOTHIE.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SODA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SODA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png
--- a/Show more
+++ b/Show more