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

2022-12-31 15:30:26 +07:00 · 2022-12-31 15:30:26 +07:00 · 0de594e51f
commit 0de594e51f
parent 04d338e6bb 1616007459
221 changed files with 3550 additions and 1043 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
+video/_main_page.mp4
 .DS_Store
--- a/adv/sync_1.file
+++ b/adv/sync_1.file
@ -1,5 +1,5 @@
-total 229760
-rw-rw---- 1 root sdcard_rw        0 2022-11-21 07:10 sync_1.file
+total 237532
+-rw-rw---- 1 root sdcard_rw        0 2022-12-28 14:21 sync_1.file
 -rw-rw---- 1 root sdcard_rw  3772465 2021-07-07 16:02 taobin_adv_00.mp4
 -rw-rw---- 1 root sdcard_rw  3647528 2021-07-06 15:30 taobin_adv_01.mp4
 -rw-rw---- 1 root sdcard_rw  3184464 2021-06-22 14:08 taobin_adv_02.mp4
@ -10,7 +10,7 @@ total 229760
 -rw-rw---- 1 root sdcard_rw  1637056 2021-09-21 09:57 taobin_adv_07.mp4
 -rw-rw---- 1 root sdcard_rw  1962660 2021-09-17 16:42 taobin_adv_08.mp4
 -rw-rw---- 1 root sdcard_rw  2461527 2022-06-10 14:31 taobin_adv_09.mp4
-rw-rw---- 1 root sdcard_rw  6807878 2022-11-09 11:12 taobin_adv_10.mp4
+-rw-rw---- 1 root sdcard_rw 10011292 2022-12-19 15:25 taobin_adv_10.mp4
 -rw-rw---- 1 root sdcard_rw  2133473 2022-06-10 14:32 taobin_adv_11.mp4
 -rw-rw---- 1 root sdcard_rw  2671705 2022-06-10 17:22 taobin_adv_12.mp4
 -rw-rw---- 1 root sdcard_rw  2756221 2022-06-10 14:32 taobin_adv_13.mp4
@ -31,7 +31,7 @@ total 229760
 -rw-rw---- 1 root sdcard_rw  1653061 2021-09-21 10:00 taobin_adv_menu2_07.mp4
 -rw-rw---- 1 root sdcard_rw  2098002 2021-09-17 16:42 taobin_adv_menu2_08.mp4
 -rw-rw---- 1 root sdcard_rw  2197656 2022-06-10 14:34 taobin_adv_menu2_09.mp4
-rw-rw---- 1 root sdcard_rw  4049510 2022-11-09 11:12 taobin_adv_menu2_10.mp4
+-rw-rw---- 1 root sdcard_rw  6392776 2022-12-19 15:25 taobin_adv_menu2_10.mp4
 -rw-rw---- 1 root sdcard_rw  1914492 2022-06-10 14:35 taobin_adv_menu2_11.mp4
 -rw-rw---- 1 root sdcard_rw  1801226 2022-06-10 17:21 taobin_adv_menu2_12.mp4
 -rw-rw---- 1 root sdcard_rw  2264499 2022-06-10 14:36 taobin_adv_menu2_13.mp4
@ -52,7 +52,7 @@ total 229760
 -rw-rw---- 1 root sdcard_rw  1805549 2021-09-21 10:00 taobin_adv_menu_07.mp4
 -rw-rw---- 1 root sdcard_rw  1873183 2021-09-17 16:42 taobin_adv_menu_08.mp4
 -rw-rw---- 1 root sdcard_rw  1954754 2022-06-10 14:37 taobin_adv_menu_09.mp4
-rw-rw---- 1 root sdcard_rw  4279445 2022-11-09 11:12 taobin_adv_menu_10.mp4
+-rw-rw---- 1 root sdcard_rw  6688846 2022-12-19 15:25 taobin_adv_menu_10.mp4
 -rw-rw---- 1 root sdcard_rw  1818488 2022-06-10 14:37 taobin_adv_menu_11.mp4
 -rw-rw---- 1 root sdcard_rw  1911441 2022-06-10 17:21 taobin_adv_menu_12.mp4
 -rw-rw---- 1 root sdcard_rw  2145648 2022-06-10 14:36 taobin_adv_menu_13.mp4
--- a/adv/taobin_adv_10.mp4
+++ b/adv/taobin_adv_10.mp4
--- a/adv/taobin_adv_menu2_10.mp4
+++ b/adv/taobin_adv_menu2_10.mp4
--- a/adv/taobin_adv_menu_10.mp4
+++ b/adv/taobin_adv_menu_10.mp4
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@ -198,6 +198,7 @@ ROSALYN ALMOST DIRTY	12-01-02-0037	1	7	50	2	3	4	5			24	66	6:06	32
 														
 นมลิ้นจี่ปั่น	12-03-03-0024	1	17	23	11	41					24	120	2:00	23
 นมลิ้นจี่เย็น	12-03-02-0024	1	17	23	11						24	120	2:00	23
+นมลิ้นจี่ร้อน	12-03-01-0024	1	17	11										
 นมยูซุร้อน	12-03-01-0023	1	53	6	16						24	120	3:00	23
 นมยูซุเย็น	12-03-02-0023	1	53	6	23						24	120	4:00	23
 นมยูซุปั่น	12-03-03-0023	1	53	6	23	41					24	120	5:00	23
@ -332,16 +333,17 @@ nUll	12-02-03-0037										24	1	1	32
 														
 														
 														
+อเมริกาโนยูซุร้อน	12-01-01-0040	1	53	3	5	6	7				24	49	0:49	23
+อเมริกาโนยูซุเย็น	12-01-02-0040	1	53	3	5	6	7	23			24	49	0:49	23
+ชายูซุร้อน	12-02-01-0038	1	10	16	53						24	49	1:49	23
+ชายูซุเย็น	12-02-02-0038	1	10	16	53	23					24	49	2:49	23
+โกโก้ยูซุเย็น	12-03-02-0025	1	15	7	53						24	49	3:49	23
+โกโก้ยูซุร้อน	12-03-01-0025	1	15	7	53	23					24	49	4:49	23
+โกโก้ยูซุปั่น	12-03-03-0025	1	15	7	53	23	41				24	49	5:49	23
 														
-														
-														
-														
-														
-														
-														
-														
-														
-														
+HOT BANANA CAFE LATTE	12-01-01-0042													
+ICED BANANA CAFE LATTE	12-01-02-0042													
+BANANA CAFE LATTE	12-01-03-0042													
 														
 														
 														
--- a/animation01/sync_1.file
+++ b/animation01/sync_1.file
@ -49,6 +49,6 @@ total 201928
 -rw-rw---- 1 root sdcard_rw  3740266 2020-11-15 19:57 TaoBin2_draft02_art7.mp4
 -rw-rw---- 1 root sdcard_rw  3998856 2020-11-15 20:01 TaoBin2_draft02_art8.mp4
 -rw-rw---- 1 root sdcard_rw  3616423 2020-11-15 20:01 TaoBin2_draft02_art9.mp4
-rw-rw---- 1 root sdcard_rw    32861 2022-10-24 15:24 play_list.tsv
+-rw-rw---- 1 root sdcard_rw    33545 2022-12-27 10:47 play_list.tsv
 -rw-rw---- 1 root sdcard_rw    32861 2022-10-24 15:23 play_list2.tsv
-rw-rw---- 1 root sdcard_rw        0 2022-10-24 15:30 sync_1.file
+-rw-rw---- 1 root sdcard_rw        0 2022-12-28 14:21 sync_1.file
--- a/font/Montserrat/Montserrat-Black.ttf
+++ b/font/Montserrat/Montserrat-Black.ttf
--- a/font/Montserrat/Montserrat-BlackItalic.ttf
+++ b/font/Montserrat/Montserrat-BlackItalic.ttf
--- a/font/Montserrat/Montserrat-Bold.ttf
+++ b/font/Montserrat/Montserrat-Bold.ttf
--- a/font/Montserrat/Montserrat-BoldItalic.ttf
+++ b/font/Montserrat/Montserrat-BoldItalic.ttf
--- a/font/Montserrat/Montserrat-ExtraBold.ttf
+++ b/font/Montserrat/Montserrat-ExtraBold.ttf
--- a/font/Montserrat/Montserrat-ExtraBoldItalic.ttf
+++ b/font/Montserrat/Montserrat-ExtraBoldItalic.ttf
--- a/font/Montserrat/Montserrat-ExtraLight.ttf
+++ b/font/Montserrat/Montserrat-ExtraLight.ttf
--- a/font/Montserrat/Montserrat-ExtraLightItalic.ttf
+++ b/font/Montserrat/Montserrat-ExtraLightItalic.ttf
--- a/font/Montserrat/Montserrat-Italic.ttf
+++ b/font/Montserrat/Montserrat-Italic.ttf
--- a/font/Montserrat/Montserrat-Light.ttf
+++ b/font/Montserrat/Montserrat-Light.ttf
--- a/font/Montserrat/Montserrat-LightItalic.ttf
+++ b/font/Montserrat/Montserrat-LightItalic.ttf
--- a/font/Montserrat/Montserrat-Medium.ttf
+++ b/font/Montserrat/Montserrat-Medium.ttf
--- a/font/Montserrat/Montserrat-MediumItalic.ttf
+++ b/font/Montserrat/Montserrat-MediumItalic.ttf
--- a/font/Montserrat/Montserrat-Regular.ttf
+++ b/font/Montserrat/Montserrat-Regular.ttf
--- a/font/Montserrat/Montserrat-SemiBold.ttf
+++ b/font/Montserrat/Montserrat-SemiBold.ttf
--- a/font/Montserrat/Montserrat-SemiBoldItalic.ttf
+++ b/font/Montserrat/Montserrat-SemiBoldItalic.ttf
--- a/font/Montserrat/Montserrat-Thin.ttf
+++ b/font/Montserrat/Montserrat-Thin.ttf
--- a/font/Montserrat/Montserrat-ThinItalic.ttf
+++ b/font/Montserrat/Montserrat-ThinItalic.ttf
--- a/image/collectiing/img_popupDtac.png
+++ b/image/collectiing/img_popupDtac.png
--- a/image/collectiing/text22-2.png
+++ b/image/collectiing/text22-2.png
--- a/image/collectiing/text22.png
+++ b/image/collectiing/text22.png
--- a/image/collectiing/text23.png
+++ b/image/collectiing/text23.png
--- a/image/collectiing_en/img_popupDtac.png
+++ b/image/collectiing_en/img_popupDtac.png
--- a/image/collectiing_en/text22-2.png
+++ b/image/collectiing_en/text22-2.png
--- a/image/collectiing_en/text22.png
+++ b/image/collectiing_en/text22.png
--- a/image/collectiing_en/text23.png
+++ b/image/collectiing_en/text23.png
--- a/image/lang/bn_china_lang.png
+++ b/image/lang/bn_china_lang.png
--- a/image/lang/bn_eng_lang.png
+++ b/image/lang/bn_eng_lang.png
--- a/image/lang/bn_japan_lang.png
+++ b/image/lang/bn_japan_lang.png
--- a/image/lang/bn_thai_lang.png
+++ b/image/lang/bn_thai_lang.png
--- a/image/lang/lang_bg_bottom.png
+++ b/image/lang/lang_bg_bottom.png
--- a/image/lang/lang_bg_center.png
+++ b/image/lang/lang_bg_center.png
--- a/image/lang/lang_bg_top.png
+++ b/image/lang/lang_bg_top.png
--- a/image/lang/world.png
+++ b/image/lang/world.png
--- a/image/page2_inter/bn_HealthyOption.png
+++ b/image/page2_inter/bn_HealthyOption.png
--- a/image/page2_inter/bn_appfast.png
+++ b/image/page2_inter/bn_appfast.png
--- a/image/page2_inter/bn_cho_caramel.png
+++ b/image/page2_inter/bn_cho_caramel.png
--- a/image/page2_inter/bn_coffee.png
+++ b/image/page2_inter/bn_coffee.png
--- a/image/page2_inter/bn_diy.png
+++ b/image/page2_inter/bn_diy.png
--- a/image/page2_inter/bn_kidmenu.png
+++ b/image/page2_inter/bn_kidmenu.png
--- a/image/page2_inter/bn_protein.png
+++ b/image/page2_inter/bn_protein.png
--- a/image/page2_inter/bn_soda_coke.png
+++ b/image/page2_inter/bn_soda_coke.png
--- a/image/page2_inter/bn_tea.png
+++ b/image/page2_inter/bn_tea.png
--- a/image/page2_inter/bn_vending_machine.png
+++ b/image/page2_inter/bn_vending_machine.png
--- a/image/page2_inter/bp_HealthyOption.png
+++ b/image/page2_inter/bp_HealthyOption.png
--- a/image/page2_inter/bp_appfast.png
+++ b/image/page2_inter/bp_appfast.png
--- a/image/page2_inter/bp_cho_caramel.png
+++ b/image/page2_inter/bp_cho_caramel.png
--- a/image/page2_inter/bp_coffee.png
+++ b/image/page2_inter/bp_coffee.png
--- a/image/page2_inter/bp_diy.png
+++ b/image/page2_inter/bp_diy.png
--- a/image/page2_inter/bp_kidmenu.png
+++ b/image/page2_inter/bp_kidmenu.png
--- a/image/page2_inter/bp_protein.png
+++ b/image/page2_inter/bp_protein.png
--- a/image/page2_inter/bp_soda_coke.png
+++ b/image/page2_inter/bp_soda_coke.png
--- a/image/page2_inter/bp_tea.png
+++ b/image/page2_inter/bp_tea.png
--- a/image/page2_inter/bp_vending_machine.png
+++ b/image/page2_inter/bp_vending_machine.png
--- a/image/page_campaign/video_desc.mp4
+++ b/image/page_campaign/video_desc.mp4
--- a/image/page_doing/bn_get_lid.png
+++ b/image/page_doing/bn_get_lid.png
--- a/image/page_doing/bn_get_lid_en.png
+++ b/image/page_doing/bn_get_lid_en.png
--- a/image/page_doing/bp_get_lid.png
+++ b/image/page_doing/bp_get_lid.png
--- a/image/page_doing/bp_get_lid_en.png
+++ b/image/page_doing/bp_get_lid_en.png
--- a/image/page_doing/brewing_txt_adv1.png
+++ b/image/page_doing/brewing_txt_adv1.png
--- a/image/page_doing/brewing_txt_adv1_en.png
+++ b/image/page_doing/brewing_txt_adv1_en.png
--- a/image/page_doing/brewing_txt_adv2.png
+++ b/image/page_doing/brewing_txt_adv2.png
--- a/image/page_doing/brewing_txt_adv2_en.png
+++ b/image/page_doing/brewing_txt_adv2_en.png
--- a/image/page_doing/tao_adv1.png
+++ b/image/page_doing/tao_adv1.png
--- a/image/page_doing/txt_15.png
+++ b/image/page_doing/txt_15.png
--- a/image/page_doing/txt_15_en.png
+++ b/image/page_doing/txt_15_en.png
--- a/image/page_doing/txt_17.png
+++ b/image/page_doing/txt_17.png
--- a/image/page_doing/txt_17_en.png
+++ b/image/page_doing/txt_17_en.png
--- a/image/page_doing/txt_6.png
+++ b/image/page_doing/txt_6.png
--- a/image/page_doing/txt_6_en.png
+++ b/image/page_doing/txt_6_en.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Bedroom_Story.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Bedroom_Story.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Forever_Love.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Forever_Love.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Gale_Jail.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Gale_Jail.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Good_Night_Kiss.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Good_Night_Kiss.png
--- a/image/page_drink_disable_n2/bn_Alcohol_ILYSB.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_ILYSB.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Long_Night.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Long_Night.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Love_Potion.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Love_Potion.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Oriental_Kink.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Oriental_Kink.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Pinky_Promise.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Pinky_Promise.png
--- a/image/page_drink_disable_n2/bn_Alcohol_Third_Behind_Bars.png
+++ b/image/page_drink_disable_n2/bn_Alcohol_Third_Behind_Bars.png
--- a/image/page_drink_disable_n2/bn_Banana_milk.png
+++ b/image/page_drink_disable_n2/bn_Banana_milk.png
--- a/image/page_drink_disable_n2/bn_ChocoBanana_milk.png
+++ b/image/page_drink_disable_n2/bn_ChocoBanana_milk.png
--- a/image/page_drink_disable_n2/bn_ChocoYuzu_milk.png
+++ b/image/page_drink_disable_n2/bn_ChocoYuzu_milk.png
--- a/image/page_drink_disable_n2/bn_Melon_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Melon_smoothie.png
--- a/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png
+++ b/image/page_drink_disable_n2/bn_PinkOreo_smoothie.png
--- a/image/page_drink_disable_n2/bn_Pinky
+++ b/image/page_drink_disable_n2/bn_Pinky
--- a/image/page_drink_disable_n2/bn_Yuzu_americano.png
+++ b/image/page_drink_disable_n2/bn_Yuzu_americano.png
--- a/image/page_drink_disable_n2/bn_Yuzu_smoothie.png
+++ b/image/page_drink_disable_n2/bn_Yuzu_smoothie.png
--- a/image/page_drink_disable_n2/bn_hot_Yuzu_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_Yuzu_tea.png
--- a/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_Milk_Lychee_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_black.png
+++ b/image/page_drink_disable_n2/bn_iced_black.png
--- a/image/page_drink_disable_n2/bn_iced_soda_black.png
+++ b/image/page_drink_disable_n2/bn_iced_soda_black.png
--- a/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
--- a/Show more
+++ b/Show more