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

adv/sync_1.file

@@ -1,5 +1,5 @@
-total 248776
--rw-rw---- 1 root sdcard_rw        0 2024-09-16 10:55 sync_1.file
+total 252288
+-rw-rw---- 1 root sdcard_rw        0 2021-03-18 16:21 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
@@ -37,7 +37,7 @@ total 248776
 -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  2594334 2024-05-20 16:50 taobin_adv_menu_15.mp4
--rw-rw---- 1 root sdcard_rw  5096243 2024-08-19 16:57 taobin_adv_menu_16.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 10498599 2023-10-31 17:06 taobin_adv_menu_19.mp4

animation01/play_list.tsv

@@ -1134,18 +1134,11 @@ Cocoa , 7up, Soda , Ice	12-03-02-0074	1	15	17	18	23	13				24	120	2:00	23
 โรบินสันอัพชี่	12-05-03-0115	1	11	18	12	23	11				24	120	23:00	23
 
 
-
-
-
 Iced Americano	12-01-01-0081	1	2	3	4	5	23	16			24	133	2:13	22
 Iced Americano	12-01-02-0081	1	2	3	4	5	23	16			24	133	2:13	22
 Iced Americano	12-21-01-0081	1	2	3	4	5	23	16			24	133	2:13	22
 Iced Americano	12-21-02-0081	1	2	3	4	5	23	16			24	133	2:13	22
 
-
-
-
-
 เจมิลากาโน่	12-21-02-0075	1	2	3	5	63					24	133	2:13	22
 เจมิลากาโน่	12-01-02-0075	1	2	3	5	63					24	133	3:13	22
 เจมิลานมเย็น	12-03-02-0075	1	2	3	5	63	7				24	133	4:13	22
@@ -1165,3 +1158,29 @@ Iced Americano	12-21-02-0081	1	2	3	4	5	23	16			24	133	2:13	22
 เจมิลาเซเว่นอัพโซดาปั่น	12-05-03-0126	1	63	18	23	13	41				24	133	18:13	22
 เจมิลามะนาวปั่น	12-05-03-0127	1	63	12	23	41					24	133	19:13	22
 เจมิลามะลิปั่น	12-02-03-0070	1	63	10	23	41					24	133	20:13	22
+
+
+
+
+
+
+
+Strawberry milk 7Up lime	12-03-03-0084	1	18	19	6	23	41				24	133	20:13	22
+Matcha 7Up Lime Soda	12-02-02-0080	1	18	8	9	12	23	13			24	133	21:13	22
+Strawberry energy 7Up lime smoothie	12-05-03-0128	1	18	19	34	23	41				24	133	22:13	22
+Strawberry milk 7Up lime	12-03-03-0084	1	18	19	6	23	41				24	133	23:13	22
+Lychee milk 7Up lime	12-03-03-0085	1	18	11	17	23	41				24	133	0:13	22
+Thai tea strawberry 7up	12-02-02-0081	1	18	10	19	23					24	133	1:13	22
+Jasmine plum 7Up soda	12-02-02-0082	1	18	10	33	23	13				24	133	2:13	22
+Hot ginger strawberry 7up tea	12-02-01-0079	1	18	10	19	10					24	133	3:13	22
+Caramel milk 7up smoothie top ovaltine	12-03-03-0081	1	18	22	17	23	41	51			24	133	4:13	22
+Coffee 7Up  Lime  Soda	12-01-02-0082	1	18	2	3	4	5	12	23	13	24	133	5:13	22
+Coffee 7Up  Lime  Soda (s)	12-21-02-0082	1	18	2	3	4	5	12	23	13	24	133	6:13	22
+Pepsi thai milk tea	12-03-02-0080	1	14	10	23						24	133	7:13	22
+Pepsi caramel milk smoothie	12-03-03-0080	1	14	22	6	23	41				24	133	8:13	22
+Hot Pepsi lime ginger jasmine tea	12-02-01-0078	1	14	12	10						24	133	9:13	22
+Strawberry americano 7up soda	12-01-02-0083	1	18	2	3	4	5	13			24	133	10:13	22
+Strawberry americano 7up soda	12-21-02-0083	1	18	2	3	4	5	13			24	133	11:13	22
+Caramel milk 7up smoothie	12-03-03-0082	1	18	22	6	23	41				24	133	12:13	22
+Strawberry milk 7Up lime  top ovaltine	12-03-03-0083	1	18	19	17	23	41	51			24	133	13:13	22
+											24	133	14:13	22

animation01/sync_1.file

@@ -1,4 +1,4 @@
-total 241228
+total 249484
 -rw-rw---- 1 root sdcard_rw   948282 2023-09-18 18:44 TaoBin2_draft02_art1.mp4
 -rw-rw---- 1 root sdcard_rw  3603060 2023-09-18 18:44 TaoBin2_draft02_art10.mp4
 -rw-rw---- 1 root sdcard_rw  3166935 2023-09-18 18:44 TaoBin2_draft02_art11.mp4
@@ -51,11 +51,12 @@ total 241228
 -rw-rw---- 1 root sdcard_rw  2287421 2023-12-07 10:26 TaoBin2_draft02_art60.mp4
 -rw-rw---- 1 root sdcard_rw  3824693 2024-04-25 15:27 TaoBin2_draft02_art61.mp4
 -rw-rw---- 1 root sdcard_rw  1797839 2024-04-25 17:00 TaoBin2_draft02_art62.mp4
+-rw-rw---- 1 root sdcard_rw  8448873 2024-09-25 13:35 TaoBin2_draft02_art63.mp4
 -rw-rw---- 1 root sdcard_rw  3740266 2023-09-18 18:44 TaoBin2_draft02_art7.mp4
 -rw-rw---- 1 root sdcard_rw  3740266 2023-09-18 18:44 TaoBin2_draft02_art70.mp4
 -rw-rw---- 1 root sdcard_rw  3998856 2023-09-18 18:44 TaoBin2_draft02_art8.mp4
 -rw-rw---- 1 root sdcard_rw  3616423 2023-09-18 18:44 TaoBin2_draft02_art9.mp4
 -rw-rw---- 1 root sdcard_rw  9159813 2024-09-04 13:55 TaoBinShowCoffeeProcess.mp4
 -rw-rw---- 1 root sdcard_rw      326 2024-08-26 13:31 last-cmd
--rw-rw---- 1 root sdcard_rw    71508 2024-09-21 19:45 play_list.tsv
--rw-rw---- 1 root sdcard_rw        0 2024-09-21 20:47 sync_1.file
+-rw-rw---- 1 root sdcard_rw    71508 2024-09-27 14:02 play_list.tsv
+-rw-rw---- 1 root sdcard_rw        0 2021-03-18 15:06 sync_1.file

app/game/sync_1.file

@@ -1,10 +1,16 @@
-total 45412
--rw-rw---- 1 root sdcard_rw  4081021 2024-01-04 11:50 TAMATIAN-01.gif
--rw-rw---- 1 root sdcard_rw 11534336 2024-02-11 21:44 game01.tgz.aa
--rw-rw---- 1 root sdcard_rw 11534336 2024-02-11 21:44 game01.tgz.ab
--rw-rw---- 1 root sdcard_rw 11534336 2024-02-11 21:44 game01.tgz.ac
--rw-rw---- 1 root sdcard_rw  7750768 2024-02-11 21:44 game01.tgz.ad
--rw-rw---- 1 root sdcard_rw       82 2024-01-08 12:50 last-cmd
--rw-rw---- 1 root sdcard_rw       10 2024-01-04 11:50 need_upgrade
--rw-rw---- 1 root sdcard_rw      402 2024-01-04 11:50 readme
--rw-rw---- 1 root sdcard_rw        0 2024-02-11 21:44 sync_1.file
+total 94764
+-rw-rw---- 1 root sdcard_rw  4081021 2024-02-11 21:51 TAMATIAN-01.gif
+-rw-rw---- 1 root sdcard_rw  4778152 2024-08-23 13:54 TAMATIAN-01_en.gif
+-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.aa
+-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ab
+-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ac
+-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ad
+-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ae
+-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.af
+-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ag
+-rw-rw---- 1 root sdcard_rw 10485760 2024-10-16 14:12 game01.tgz.ah
+-rw-rw---- 1 root sdcard_rw  4200190 2024-10-16 14:12 game01.tgz.ai
+-rw-rw---- 1 root sdcard_rw       82 2024-02-11 21:51 last-cmd
+-rw-rw---- 1 root sdcard_rw       10 2024-02-11 21:51 need_upgrade
+-rw-rw---- 1 root sdcard_rw      402 2024-02-11 21:51 readme
+-rw-rw---- 1 root sdcard_rw        0 2024-10-16 14:12 sync_1.file

image/event/image_template3

@@ -1,6 +1,4 @@
-normal_eng=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
-normal_thai=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
-press_eng=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
-press_thai=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
-disable_eng=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
-disable_thai=ROOT/taobin_project/image/event/mom_cocoa/mom_cocoa_banner_
+normal_eng=ROOT/taobin_project/image/event/halloween/halloween.png
+normal_thai=ROOT/taobin_project/image/event/halloween/halloween.png
+disable_eng=ROOT/taobin_project/image/event/halloween/halloween.png
+disable_thai=ROOT/taobin_project/image/event/halloween/halloween.png