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

2024-02-12 09:41:18 +07:00 · 2024-02-12 09:41:18 +07:00 · d4eb035c23
commit d4eb035c23
parent 5e551669bd 6b191ecb87
212 changed files with 16328 additions and 781 deletions
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@ -918,31 +918,31 @@ PEACH MINT SODA	12-05-02-0070										24	120	15:00	23
 พีชสตรอเบอร์รี่โซดา	12-05-02-0073	1	19	60	23	13					24	120	15:00	23
 โกโก้พีชปั่น	12-03-03-0039	1	7	15	60	16	23	41			24	120	15:00	23

-เต่าติมออริจินอล	12-41-03-0001
-เต่าติมโอริโอ้	12-41-03-0002
-เต่าติมบิสคอฟ	12-41-03-0003
-เต่าติมสตรอว์เบอร์รี่	12-41-03-0004
-เต่าติมโกโก้	12-41-03-0005
-เต่าติมชาเขียว	12-41-03-0006
-เต่าติมเมล่อน	12-41-03-0007
-เต่าติมคาราเมล	12-41-03-0008
-เต่าติมยูซุ	12-41-03-0009
-เต่าติมมินต์	12-41-03-0010
-เต่าติมพีช	12-41-03-0011
-เต่าติมเอสเพรสโซ่	12-41-03-0012
-เต่าติมชาไทย	12-41-03-0013
-เต่าติมโอวัลติน	12-41-03-0014
-เต่าติมโกโก้มินต์	12-41-03-0015
-เต่าติมมะนาว	12-41-03-0016
-เต่าติมทรงพลัง	12-41-03-0017
-เต่าติมสลัชชี่	12-41-03-0018
-เต่าติมสละ	12-41-03-0019
-เต่าติมบ๊วย	12-41-03-0020
-เต่าติมลิ้นจี่	12-41-03-0021
-เต่าติมโตเกียวบานาน่า	12-41-03-0022
-เต่าติมชามะลิ	12-41-03-0023
-เต่าติมโฮจิฉะ	12-41-03-0024
-TAO TIM GINGER	12-41-03-0025
+เต่าติมออริจินอล	12-41-03-0001	1									24	120	15:00	23
+เต่าติมโอริโอ้	12-41-03-0002	1									24	120	16:00	23
+เต่าติมบิสคอฟ	12-41-03-0003	1									24	120	17:00	23
+เต่าติมสตรอว์เบอร์รี่	12-41-03-0004	1									24	120	18:00	23
+เต่าติมโกโก้	12-41-03-0005	1									24	120	19:00	23
+เต่าติมชาเขียว	12-41-03-0006	1									24	120	20:00	23
+เต่าติมเมล่อน	12-41-03-0007	1									24	120	21:00	23
+เต่าติมคาราเมล	12-41-03-0008	1									24	120	22:00	23
+เต่าติมยูซุ	12-41-03-0009	1									24	120	23:00	23
+เต่าติมมินต์	12-41-03-0010	1									24	120	0:00	23
+เต่าติมพีช	12-41-03-0011	1									24	120	1:00	23
+เต่าติมเอสเพรสโซ่	12-41-03-0012	1									24	120	2:00	23
+เต่าติมชาไทย	12-41-03-0013	1									24	120	3:00	23
+เต่าติมโอวัลติน	12-41-03-0014	1									24	120	4:00	23
+เต่าติมโกโก้มินต์	12-41-03-0015	1									24	120	5:00	23
+เต่าติมมะนาว	12-41-03-0016	1									24	120	6:00	23
+เต่าติมทรงพลัง	12-41-03-0017	1									24	120	7:00	23
+เต่าติมสลัชชี่	12-41-03-0018	1									24	120	8:00	23
+เต่าติมสละ	12-41-03-0019	1									24	120	9:00	23
+เต่าติมบ๊วย	12-41-03-0020	1									24	120	10:00	23
+เต่าติมลิ้นจี่	12-41-03-0021	1									24	120	11:00	23
+เต่าติมโตเกียวบานาน่า	12-41-03-0022	1									24	120	12:00	23
+เต่าติมชามะลิ	12-41-03-0023	1									24	120	13:00	23
+เต่าติมโฮจิฉะ	12-41-03-0024	1									24	120	14:00	23
+TAO TIM GINGER	12-41-03-0025	1									24	120	15:00	23

 HOT GINGER CAFE LATTE	12-21-01-0061	1	10	6	2	3	4	5			24	120	15:00	23
 ICED GINGER CAFE LATTE	12-21-02-0061	1	10	6	2	3	4	5	23		24	120	15:00	23
@ -953,3 +953,18 @@ ICED GINGER YUZU TEA	12-02-02-0054	1	10	53	23						24	120	15:00	23
 ICED GINGER MATCHA	12-02-02-0055	1	8	9	10	23					24	120	15:00	23
 GINGER MILK TEA SMOOTHIE	12-02-03-0053	1	6	10	23	41					24	120	15:00	23
 GINGER MILK TEA OREO SMOOTHIE	12-02-03-0056	1	6	10	40	23	40	41			24	120	15:00	23
+
+
+tokyo banana mocha	12-01-02-0061	1	56	2	3	5	15	23			24	120	15:00	23
+tokyo banana mocha	12-01-03-0061	1	56	2	3	5	15	23	41		24	120	16:00	23
+tokyo banana mocha	12-21-02-0061	1	56	2	3	5	15	23			24	120	17:00	23
+tokyo banana mocha	12-21-03-0061	1	56	2	3	5	15	23	41		24	120	18:00	23
+tokyo banana matcha cafe latte	12-01-02-0062	1	56	9	3	5	15	23			24	120	19:00	23
+tokyo banana matcha cafe latte	12-21-02-0062	1	56	9	3	5	15	23			24	120	20:00	23
+tokyo banana straw cocoa	12-03-03-0044	1	56	15	19	23					24	120	21:00	23
+tokyo banana straw milk	12-03-03-0045	1	56	6	19	23					24	120	22:00	23
+Banana Milk Oreo Smoothie	12-03-03-0029	1	56	6	40	41					24	120	23:00	23
+tokyo banana ginger tea	12-02-02-0053	1	56	10	23						24	120	0:00	23
+tokyo banana thai milk tea	12-02-02-0054	1	56	6	10	23					24	120	1:00	23
+tokyo banana matcha	12-02-02-0055	1	56	9	23						24	120	2:00	23
+tokyo banana power drink soda	12-05-02-0078	1	56	34	13	23					24	120	3:00	23
--- a/app/game/game01.apk
+++ b/app/game/game01.apk
--- a/app/game/game01.tgz.aa
+++ b/app/game/game01.tgz.aa
--- a/app/game/game01.tgz.ab
+++ b/app/game/game01.tgz.ab
--- a/app/game/game01.tgz.ac
+++ b/app/game/game01.tgz.ac
--- a/app/game/game01.tgz.ad
+++ b/app/game/game01.tgz.ad
--- a/app/game/sync_1.file
+++ b/app/game/sync_1.file
@ -1,11 +1,10 @@
-total 46108
-rw-rw---- 1 root sdcard_rw  4081021 2024-01-04 10:11 TAMATIAN-01.gif
-rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 15:13 game01.tgz.aa
-rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 15:13 game01.tgz.ab
-rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 15:13 game01.tgz.ac
-rw-rw---- 1 root sdcard_rw 10485760 2021-03-19 15:13 game01.tgz.ad
-rw-rw---- 1 root sdcard_rw  1131810 2021-03-19 15:13 game01.tgz.ae
-rw-rw---- 1 root sdcard_rw       28 2024-01-04 10:11 last-cmd
-rw-rw---- 1 root sdcard_rw       10 2024-01-04 10:10 need_upgrade
-rw-rw---- 1 root sdcard_rw      402 2024-01-04 10:11 readme
-rw-rw---- 1 root sdcard_rw        0 2021-03-19 15:14 sync_1.file
+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
--- a/image/collectiing/text_44.png
+++ b/image/collectiing/text_44.png
--- a/image/collectiing/text_45.png
+++ b/image/collectiing/text_45.png
--- a/image/collectiing_en/text_44.png
+++ b/image/collectiing_en/text_44.png
--- a/image/collectiing_en/text_45.png
+++ b/image/collectiing_en/text_45.png
--- a/image/display_get_free_en/img_popup2-SGP.png
+++ b/image/display_get_free_en/img_popup2-SGP.png
--- a/image/display_get_free_en/img_popup3-SGP.png
+++ b/image/display_get_free_en/img_popup3-SGP.png
--- a/image/display_point/imgCoupon120.png
+++ b/image/display_point/imgCoupon120.png
--- a/image/display_point/imgCoupon121.png
+++ b/image/display_point/imgCoupon121.png
--- a/image/display_point_en/imgCoupon120.png
+++ b/image/display_point_en/imgCoupon120.png
--- a/image/display_point_en/imgCoupon121.png
+++ b/image/display_point_en/imgCoupon121.png
--- a/image/event/bad_valentine/bad_valentine_en.mp4
+++ b/image/event/bad_valentine/bad_valentine_en.mp4
--- a/image/event/bad_valentine/bad_valentine_th.mp4
+++ b/image/event/bad_valentine/bad_valentine_th.mp4
--- a/image/event/bad_valentine/bad_valentine_th.png
+++ b/image/event/bad_valentine/bad_valentine_th.png
--- a/image/event/bad_valentine/display_point/bg.png
+++ b/image/event/bad_valentine/display_point/bg.png
--- a/image/event/bad_valentine/display_point/bn_random.png
+++ b/image/event/bad_valentine/display_point/bn_random.png
--- a/image/event/bad_valentine/display_point/bp_random.png
+++ b/image/event/bad_valentine/display_point/bp_random.png
--- a/image/event/bad_valentine/display_point/discount_50.png
+++ b/image/event/bad_valentine/display_point/discount_50.png
--- a/image/event/bad_valentine/display_point/get_glass.png
+++ b/image/event/bad_valentine/display_point/get_glass.png
--- a/image/event/bad_valentine/display_point/ghost_broken_heart.png
+++ b/image/event/bad_valentine/display_point/ghost_broken_heart.png
--- a/image/event/bad_valentine/display_point/img_popup1.png
+++ b/image/event/bad_valentine/display_point/img_popup1.png
--- a/image/event/bad_valentine/display_point/img_popup3.png
+++ b/image/event/bad_valentine/display_point/img_popup3.png
--- a/image/event/bad_valentine/display_point/point_active.png
+++ b/image/event/bad_valentine/display_point/point_active.png
--- a/image/event/bad_valentine/display_point/point_active_new.png
+++ b/image/event/bad_valentine/display_point/point_active_new.png
--- a/image/event/bad_valentine/display_point/point_deactive.png
+++ b/image/event/bad_valentine/display_point/point_deactive.png
--- a/image/event/bad_valentine/display_point/random_pattern_1.png
+++ b/image/event/bad_valentine/display_point/random_pattern_1.png
--- a/image/event/bad_valentine/display_point/random_pattern_2.png
+++ b/image/event/bad_valentine/display_point/random_pattern_2.png
--- a/image/event/bad_valentine/display_point/random_pattern_3.png
+++ b/image/event/bad_valentine/display_point/random_pattern_3.png
--- a/image/event/bad_valentine/display_point/sub_title.png
+++ b/image/event/bad_valentine/display_point/sub_title.png
--- a/image/event/bad_valentine/display_point/text7.png
+++ b/image/event/bad_valentine/display_point/text7.png
--- a/image/event/bad_valentine/display_point/text8.png
+++ b/image/event/bad_valentine/display_point/text8.png
--- a/image/event/bad_valentine/display_point_en/discount_50.png
+++ b/image/event/bad_valentine/display_point_en/discount_50.png
--- a/image/event/bad_valentine/display_point_en/get_glass.png
+++ b/image/event/bad_valentine/display_point_en/get_glass.png
--- a/image/event/bad_valentine/display_point_en/ghost_broken_heart.png
+++ b/image/event/bad_valentine/display_point_en/ghost_broken_heart.png
--- a/image/event/bad_valentine/display_point_en/img_popup1.png
+++ b/image/event/bad_valentine/display_point_en/img_popup1.png
--- a/image/event/bad_valentine/display_point_en/img_popup3.png
+++ b/image/event/bad_valentine/display_point_en/img_popup3.png
--- a/image/event/bad_valentine/display_point_en/list_point_deactive.png
+++ b/image/event/bad_valentine/display_point_en/list_point_deactive.png
--- a/image/event/bad_valentine/display_point_en/point_active.png
+++ b/image/event/bad_valentine/display_point_en/point_active.png
--- a/image/event/bad_valentine/display_point_en/point_active_new.png
+++ b/image/event/bad_valentine/display_point_en/point_active_new.png
--- a/image/event/bad_valentine/display_point_en/point_deactive.png
+++ b/image/event/bad_valentine/display_point_en/point_deactive.png
--- a/image/event/bad_valentine/display_point_en/random_pattern_1.png
+++ b/image/event/bad_valentine/display_point_en/random_pattern_1.png
--- a/image/event/bad_valentine/display_point_en/random_pattern_2.png
+++ b/image/event/bad_valentine/display_point_en/random_pattern_2.png
--- a/image/event/bad_valentine/display_point_en/random_pattern_3.png
+++ b/image/event/bad_valentine/display_point_en/random_pattern_3.png
--- a/image/event/bad_valentine/display_point_en/sub_title.png
+++ b/image/event/bad_valentine/display_point_en/sub_title.png
--- a/image/event/bad_valentine/display_point_en/text7.png
+++ b/image/event/bad_valentine/display_point_en/text7.png
--- a/image/event/bad_valentine/display_point_en/text8.png
+++ b/image/event/bad_valentine/display_point_en/text8.png
--- a/image/event/bad_valentine/error/bg.png
+++ b/image/event/bad_valentine/error/bg.png
--- a/image/event/bad_valentine/error/bn_confirm.png
+++ b/image/event/bad_valentine/error/bn_confirm.png
--- a/image/event/bad_valentine/error/bp_confirm.png
+++ b/image/event/bad_valentine/error/bp_confirm.png
--- a/image/event/bad_valentine/error/img.png
+++ b/image/event/bad_valentine/error/img.png
--- a/image/event/bad_valentine/error/img2.png
+++ b/image/event/bad_valentine/error/img2.png
--- a/image/event/bad_valentine/error/text_fail.png
+++ b/image/event/bad_valentine/error/text_fail.png
--- a/image/event/bad_valentine/error/text_fail2.png
+++ b/image/event/bad_valentine/error/text_fail2.png
--- a/image/event/bad_valentine/error/title_text_fail.png
+++ b/image/event/bad_valentine/error/title_text_fail.png
--- a/image/event/bad_valentine/error/title_text_fail2.png
+++ b/image/event/bad_valentine/error/title_text_fail2.png
--- a/image/event/bad_valentine/error_en/bg.png
+++ b/image/event/bad_valentine/error_en/bg.png
--- a/image/event/bad_valentine/error_en/bn_confirm.png
+++ b/image/event/bad_valentine/error_en/bn_confirm.png
--- a/image/event/bad_valentine/error_en/bp_confirm.png
+++ b/image/event/bad_valentine/error_en/bp_confirm.png
--- a/image/event/bad_valentine/error_en/img.png
+++ b/image/event/bad_valentine/error_en/img.png
--- a/image/event/bad_valentine/error_en/img2.png
+++ b/image/event/bad_valentine/error_en/img2.png
--- a/image/event/bad_valentine/error_en/text_fail.png
+++ b/image/event/bad_valentine/error_en/text_fail.png
--- a/image/event/bad_valentine/error_en/text_fail2.png
+++ b/image/event/bad_valentine/error_en/text_fail2.png
--- a/image/event/bad_valentine/error_en/title_text_fail.png
+++ b/image/event/bad_valentine/error_en/title_text_fail.png
--- a/image/event/bad_valentine/error_en/title_text_fail2.png
+++ b/image/event/bad_valentine/error_en/title_text_fail2.png
--- a/image/event/image_template2
+++ b/image/event/image_template2
@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/pro_15THB_en.png
-normal_thai=ROOT/taobin_project/image/event/pro_15THB_th.png
-press_eng=ROOT/taobin_project/image/event/pro_15THB_en.png
-press_thai=ROOT/taobin_project/image/event/pro_15THB_th.png
-disable_eng=ROOT/taobin_project/image/event/pro_15THB_en.png
-disable_thai=ROOT/taobin_project/image/event/pro_15THB_th.png
+normal_eng=ROOT/taobin_project/image/event/bad_valentine/bad_valentine_th.png
+normal_thai=ROOT/taobin_project/image/event/bad_valentine/bad_valentine_th.png
+press_eng=ROOT/taobin_project/image/event/bad_valentine/bad_valentine_th.png
+press_thai=ROOT/taobin_project/image/event/bad_valentine/bad_valentine_th.png
+disable_eng=ROOT/taobin_project/image/event/bad_valentine/bad_valentine_th.png
+disable_thai=ROOT/taobin_project/image/event/bad_valentine/bad_valentine_th.png
--- a/image/event/pro_peach_en.mp4
+++ b/image/event/pro_peach_en.mp4
--- a/image/event/pro_peach_th.mp4
+++ b/image/event/pro_peach_th.mp4
--- a/image/event/pro_rerun.mp4
+++ b/image/event/pro_rerun.mp4
--- a/image/page_drink_disable_n2/bn_BananaOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_BananaOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_BananaOreo_smoothie_bad_valentine.png
+++ b/image/page_drink_disable_n2/bn_BananaOreo_smoothie_bad_valentine.png
--- a/image/page_drink_disable_n2/bn_Choco_straw_banana_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Choco_straw_banana_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_Ginger_TokyoBanana.png
+++ b/image/page_drink_disable_n2/bn_iced_Ginger_TokyoBanana.png
--- a/image/page_drink_disable_n2/bn_iced_Mocha_Tokyobanana_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_Mocha_Tokyobanana_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_ThaiTea_TokyoBanana.png
+++ b/image/page_drink_disable_n2/bn_iced_ThaiTea_TokyoBanana.png
--- a/image/page_drink_disable_n2/bn_iced_energy_drink_Banana_soda.png
+++ b/image/page_drink_disable_n2/bn_iced_energy_drink_Banana_soda.png
--- a/image/page_drink_disable_n2/bn_iced_matcha_Latte_TokyoBanana.png
+++ b/image/page_drink_disable_n2/bn_iced_matcha_Latte_TokyoBanana.png
--- a/image/page_drink_disable_n2/bn_iced_matcha_TokyoBanana.png
+++ b/image/page_drink_disable_n2/bn_iced_matcha_TokyoBanana.png
--- a/image/page_drink_disable_n2/bn_iced_strawberry_Tokyobanana_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberry_Tokyobanana_smoothie.png
--- a/image/page_drink_n/bn_BananaOreo_smoothie_bad_valentine.png
+++ b/image/page_drink_n/bn_BananaOreo_smoothie_bad_valentine.png
--- a/image/page_drink_n/bn_Choco_straw_banana_smoothie.png
+++ b/image/page_drink_n/bn_Choco_straw_banana_smoothie.png
--- a/image/page_drink_n/bn_iced_Ginger_TokyoBanana.png
+++ b/image/page_drink_n/bn_iced_Ginger_TokyoBanana.png
--- a/image/page_drink_n/bn_iced_Mocha_Tokyobanana_smoothie.png
+++ b/image/page_drink_n/bn_iced_Mocha_Tokyobanana_smoothie.png
--- a/image/page_drink_n/bn_iced_ThaiTea_TokyoBanana.png
+++ b/image/page_drink_n/bn_iced_ThaiTea_TokyoBanana.png
--- a/image/page_drink_n/bn_iced_energy_drink_Banana_soda.png
+++ b/image/page_drink_n/bn_iced_energy_drink_Banana_soda.png
--- a/image/page_drink_n/bn_iced_matcha_Latte_TokyoBanana.png
+++ b/image/page_drink_n/bn_iced_matcha_Latte_TokyoBanana.png
--- a/image/page_drink_n/bn_iced_matcha_TokyoBanana.png
+++ b/image/page_drink_n/bn_iced_matcha_TokyoBanana.png
--- a/image/page_drink_n/bn_iced_strawberry_Tokyobanana_smoothie.png
+++ b/image/page_drink_n/bn_iced_strawberry_Tokyobanana_smoothie.png
--- a/image/page_drink_picture2_n/bn_BananaOreo_smoothie.png
+++ b/image/page_drink_picture2_n/bn_BananaOreo_smoothie.png
--- a/image/page_drink_picture2_n/bn_BananaOreo_smoothie_bad_valentine.png
+++ b/image/page_drink_picture2_n/bn_BananaOreo_smoothie_bad_valentine.png
--- a/image/page_drink_picture2_n/bn_Choco_straw_banana_smoothie.png
+++ b/image/page_drink_picture2_n/bn_Choco_straw_banana_smoothie.png
--- a/image/page_drink_picture2_n/bn_iced_Ginger_TokyoBanana.png
+++ b/image/page_drink_picture2_n/bn_iced_Ginger_TokyoBanana.png
--- a/image/page_drink_picture2_n/bn_iced_Mocha_Tokyobanana_smoothie.png
+++ b/image/page_drink_picture2_n/bn_iced_Mocha_Tokyobanana_smoothie.png
--- a/image/page_drink_picture2_n/bn_iced_ThaiTea_TokyoBanana.png
+++ b/image/page_drink_picture2_n/bn_iced_ThaiTea_TokyoBanana.png
--- a/image/page_drink_picture2_n/bn_iced_energy_drink_Banana_soda.png
+++ b/image/page_drink_picture2_n/bn_iced_energy_drink_Banana_soda.png
--- a/Show more
+++ b/Show more