THAI INTER: Merge branch masterpiece -> th_mmr

2024-12-12 17:35:05 +07:00 · 2024-12-12 17:35:05 +07:00 · 3c994e2ed1
commit 3c994e2ed1
parent 1a455f3e83 899db59317
548 changed files with 161156 additions and 52934 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,5 @@
 cip
 video/_main_page.mp4
 .DS_Store
-.vscode
+.vscode
+.zed
--- a/adv/sync_1.file
+++ b/adv/sync_1.file
@ -1,5 +1,5 @@
-total 143056
-rw-rw---- 1 root sdcard_rw        0 2024-11-25 17:27 sync_1.file
+total 143068
+-rw-rw---- 1 root sdcard_rw        0 2024-12-04 17:12 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  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
--- 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/game01.tgz.ae
+++ b/app/game/game01.tgz.ae
--- a/app/game/game01.tgz.af
+++ b/app/game/game01.tgz.af
--- a/app/game/game01.tgz.ag
+++ b/app/game/game01.tgz.ag
--- a/app/game/game01.tgz.ah
+++ b/app/game/game01.tgz.ah
--- a/app/game/game01.tgz.ai
+++ b/app/game/game01.tgz.ai
--- a/app/game/last-cmd
+++ b/app/game/last-cmd
@ -1 +0,0 @@
-cd /mnt/sdcard/coffeevending/taobin_project/app/game; cat game01.tgz.a* | tar -xz
--- a/app/game/sync_1.file
+++ b/app/game/sync_1.file
@ -1,16 +1,16 @@
-total 99672
-rw-rw---- 1 root sdcard_rw  4081021 2024-10-16 14:18 TAMATIAN-01.gif
-rw-rw---- 1 root sdcard_rw  4778152 2024-10-16 14:18 TAMATIAN-01_en.gif
-rw-rw---- 1 root sdcard_rw 10485760 2024-11-25 17:11 game01.tgz.aa
-rw-rw---- 1 root sdcard_rw 10485760 2024-11-25 17:11 game01.tgz.ab
-rw-rw---- 1 root sdcard_rw 10485760 2024-11-25 17:11 game01.tgz.ac
-rw-rw---- 1 root sdcard_rw 10485760 2024-11-25 17:11 game01.tgz.ad
-rw-rw---- 1 root sdcard_rw 10485760 2024-11-25 17:11 game01.tgz.ae
-rw-rw---- 1 root sdcard_rw 10485760 2024-11-25 17:11 game01.tgz.af
-rw-rw---- 1 root sdcard_rw 10485760 2024-11-25 17:11 game01.tgz.ag
-rw-rw---- 1 root sdcard_rw 10485760 2024-11-25 17:11 game01.tgz.ah
-rw-rw---- 1 root sdcard_rw  9222856 2024-11-25 17:11 game01.tgz.ai
-rw-rw---- 1 root sdcard_rw       82 2024-10-16 14:18 last-cmd
-rw-rw---- 1 root sdcard_rw       10 2024-10-16 14:18 need_upgrade
-rw-rw---- 1 root sdcard_rw      402 2024-10-16 14:18 readme
-rw-rw---- 1 root sdcard_rw        0 2024-11-25 17:11 sync_1.file
+total 99668
+-rw-rw---- 1 root sdcard_rw  4081021 2024-11-25 17:12 TAMATIAN-01.gif
+-rw-rw---- 1 root sdcard_rw  4778152 2024-11-25 17:12 TAMATIAN-01_en.gif
+-rw-rw---- 1 root sdcard_rw 10485760 2024-11-28 10:48 game01.tgz.aa
+-rw-rw---- 1 root sdcard_rw 10485760 2024-11-28 10:48 game01.tgz.ab
+-rw-rw---- 1 root sdcard_rw 10485760 2024-11-28 10:48 game01.tgz.ac
+-rw-rw---- 1 root sdcard_rw 10485760 2024-11-28 10:48 game01.tgz.ad
+-rw-rw---- 1 root sdcard_rw 10485760 2024-11-28 10:48 game01.tgz.ae
+-rw-rw---- 1 root sdcard_rw 10485760 2024-11-28 10:48 game01.tgz.af
+-rw-rw---- 1 root sdcard_rw 10485760 2024-11-28 10:48 game01.tgz.ag
+-rw-rw---- 1 root sdcard_rw 10485760 2024-11-28 10:48 game01.tgz.ah
+-rw-rw---- 1 root sdcard_rw  9222856 2024-11-28 10:48 game01.tgz.ai
+-rw-rw---- 1 root sdcard_rw       82 2024-11-25 17:12 last-cmd
+-rw-rw---- 1 root sdcard_rw       10 2024-11-25 17:12 need_upgrade
+-rw-rw---- 1 root sdcard_rw      402 2024-11-25 17:12 readme
+-rw-rw---- 1 root sdcard_rw        0 2024-11-28 10:48 sync_1.file
--- a/image/event/image_template3
+++ b/image/event/image_template3
@ -1,4 +1,4 @@
-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
+normal_eng=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
+normal_thai=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
+disable_eng=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
+disable_thai=ROOT/taobin_project/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
--- a/image/event/thick_tea_by_brewer/thick_tea_by_brewer.mp4
+++ b/image/event/thick_tea_by_brewer/thick_tea_by_brewer.mp4
--- a/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
+++ b/image/event/thick_tea_by_brewer/thick_tea_by_brewer_img.png
--- a/image/page_doing/brewing_txt_adv11.png
+++ b/image/page_doing/brewing_txt_adv11.png
--- a/image/page_doing/brewing_txt_adv11_en.png
+++ b/image/page_doing/brewing_txt_adv11_en.png
--- a/image/page_doing/brewing_txt_adv4.png
+++ b/image/page_doing/brewing_txt_adv4.png
--- a/image/page_doing/brewing_txt_adv4_en.png
+++ b/image/page_doing/brewing_txt_adv4_en.png
--- a/image/page_drink_disable_n2/bn_7UP_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_disable_n2/bn_7UP_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_disable_n2/bn_Almost_Umeshu.png
+++ b/image/page_drink_disable_n2/bn_Almost_Umeshu.png
--- a/image/page_drink_disable_n2/bn_Beachy_Mint.png
+++ b/image/page_drink_disable_n2/bn_Beachy_Mint.png
--- a/image/page_drink_disable_n2/bn_Black_Menthe.png
+++ b/image/page_drink_disable_n2/bn_Black_Menthe.png
--- a/image/page_drink_disable_n2/bn_Cafe_Avec_Liqueur.png
+++ b/image/page_drink_disable_n2/bn_Cafe_Avec_Liqueur.png
--- a/image/page_drink_disable_n2/bn_Cocoa_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_disable_n2/bn_Cocoa_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_disable_n2/bn_Coffee_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_disable_n2/bn_Coffee_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_disable_n2/bn_Espresso_Martini.png
+++ b/image/page_drink_disable_n2/bn_Espresso_Martini.png
--- a/image/page_drink_disable_n2/bn_Ginger_lemon_tea_Doikum.png
+++ b/image/page_drink_disable_n2/bn_Ginger_lemon_tea_Doikum.png
--- a/image/page_drink_disable_n2/bn_Ginger_tea_Doikum.png
+++ b/image/page_drink_disable_n2/bn_Ginger_tea_Doikum.png
--- a/image/page_drink_disable_n2/bn_Lychee_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_disable_n2/bn_Lychee_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_disable_n2/bn_Matcha_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_disable_n2/bn_Matcha_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_disable_n2/bn_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_disable_n2/bn_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_disable_n2/bn_Neon_Spark.png
+++ b/image/page_drink_disable_n2/bn_Neon_Spark.png
--- a/image/page_drink_disable_n2/bn_Russian_Mojito.png
+++ b/image/page_drink_disable_n2/bn_Russian_Mojito.png
--- a/image/page_drink_disable_n2/bn_Sala_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_disable_n2/bn_Sala_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_disable_n2/bn_Strawberry_Martini.png
+++ b/image/page_drink_disable_n2/bn_Strawberry_Martini.png
--- a/image/page_drink_disable_n2/bn_Summer_Chill.png
+++ b/image/page_drink_disable_n2/bn_Summer_Chill.png
--- a/image/page_drink_disable_n2/bn_Thai_Tea_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_disable_n2/bn_Thai_Tea_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_disable_n2/bn_Wakeup_Call.png
+++ b/image/page_drink_disable_n2/bn_Wakeup_Call.png
--- a/image/page_drink_disable_n2/bn_Yuzu_Highball.png
+++ b/image/page_drink_disable_n2/bn_Yuzu_Highball.png
--- a/image/page_drink_disable_n2/bn_Yuzu_Martini.png
+++ b/image/page_drink_disable_n2/bn_Yuzu_Martini.png
--- a/image/page_drink_disable_n2/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_disable_n2/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_disable_n2/bn_choco_snow_flake_smoothie.png
+++ b/image/page_drink_disable_n2/bn_choco_snow_flake_smoothie.png
--- a/image/page_drink_disable_n2/bn_hot_blackcoffee.png
+++ b/image/page_drink_disable_n2/bn_hot_blackcoffee.png
--- a/image/page_drink_disable_n2/bn_hot_coffee_thai_milk_tea.png
+++ b/image/page_drink_disable_n2/bn_hot_coffee_thai_milk_tea.png
--- a/image/page_drink_disable_n2/bn_iced_Ginger_soda_Doikum.png
+++ b/image/page_drink_disable_n2/bn_iced_Ginger_soda_Doikum.png
--- a/image/page_drink_disable_n2/bn_iced_Gingerlime_soda_Doikum.png
+++ b/image/page_drink_disable_n2/bn_iced_Gingerlime_soda_Doikum.png
--- a/image/page_drink_disable_n2/bn_iced_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_disable_n2/bn_iced_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_disable_n2/bn_iced_christmas_cafe_latte.png
+++ b/image/page_drink_disable_n2/bn_iced_christmas_cafe_latte.png
--- a/image/page_drink_disable_n2/bn_limeblack_tea_SingPark_Healthy.png
+++ b/image/page_drink_disable_n2/bn_limeblack_tea_SingPark_Healthy.png
--- a/image/page_drink_disable_n2/bn_reindeer_peppermint_smoothie.png
+++ b/image/page_drink_disable_n2/bn_reindeer_peppermint_smoothie.png
--- a/image/page_drink_disable_n2/bn_royal_milk_tea.png
+++ b/image/page_drink_disable_n2/bn_royal_milk_tea.png
--- a/image/page_drink_disable_n2/bn_santa_ginger.png
+++ b/image/page_drink_disable_n2/bn_santa_ginger.png
--- a/image/page_drink_disable_n2/bn_southern_fusion_tea.png
+++ b/image/page_drink_disable_n2/bn_southern_fusion_tea.png
--- a/image/page_drink_disable_n2/bn_super_oreo_volcano.png
+++ b/image/page_drink_disable_n2/bn_super_oreo_volcano.png
--- a/image/page_drink_disable_n2/bn_thai_black_tea_SingPark_Healthy.png
+++ b/image/page_drink_disable_n2/bn_thai_black_tea_SingPark_Healthy.png
--- a/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark_Healthy.png
+++ b/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark_Healthy.png
--- a/image/page_drink_disable_n2/bn_traditional_green_tea.png
+++ b/image/page_drink_disable_n2/bn_traditional_green_tea.png
--- a/image/page_drink_n/bn_7UP_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_n/bn_7UP_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_n/bn_Almost_Umeshu.png
+++ b/image/page_drink_n/bn_Almost_Umeshu.png
--- a/image/page_drink_n/bn_Beachy_Mint.png
+++ b/image/page_drink_n/bn_Beachy_Mint.png
--- a/image/page_drink_n/bn_Black_Menthe.png
+++ b/image/page_drink_n/bn_Black_Menthe.png
--- a/image/page_drink_n/bn_Cafe_Avec_Liqueur.png
+++ b/image/page_drink_n/bn_Cafe_Avec_Liqueur.png
--- a/image/page_drink_n/bn_Cocoa_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_n/bn_Cocoa_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_n/bn_Coffee_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_n/bn_Coffee_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_n/bn_Espresso_Martini.png
+++ b/image/page_drink_n/bn_Espresso_Martini.png
--- a/image/page_drink_n/bn_Ginger_lemon_tea_Doikum.png
+++ b/image/page_drink_n/bn_Ginger_lemon_tea_Doikum.png
--- a/image/page_drink_n/bn_Ginger_tea_Doikum.png
+++ b/image/page_drink_n/bn_Ginger_tea_Doikum.png
--- a/image/page_drink_n/bn_Lychee_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_n/bn_Lychee_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_n/bn_Matcha_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_n/bn_Matcha_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_n/bn_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_n/bn_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_n/bn_Neon_Spark.png
+++ b/image/page_drink_n/bn_Neon_Spark.png
--- a/image/page_drink_n/bn_Russian_Mojito.png
+++ b/image/page_drink_n/bn_Russian_Mojito.png
--- a/image/page_drink_n/bn_Sala_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_n/bn_Sala_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_n/bn_Strawberry_Martini.png
+++ b/image/page_drink_n/bn_Strawberry_Martini.png
--- a/image/page_drink_n/bn_Summer_Chill.png
+++ b/image/page_drink_n/bn_Summer_Chill.png
--- a/image/page_drink_n/bn_Thai_Tea_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_n/bn_Thai_Tea_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_n/bn_Wakeup_Call.png
+++ b/image/page_drink_n/bn_Wakeup_Call.png
--- a/image/page_drink_n/bn_Yuzu_Highball.png
+++ b/image/page_drink_n/bn_Yuzu_Highball.png
--- a/image/page_drink_n/bn_Yuzu_Martini.png
+++ b/image/page_drink_n/bn_Yuzu_Martini.png
--- a/image/page_drink_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_n/bn_bn_iced_Super_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_n/bn_choco_snow_flake_smoothie.png
+++ b/image/page_drink_n/bn_choco_snow_flake_smoothie.png
--- a/image/page_drink_n/bn_hot_blackcoffee.png
+++ b/image/page_drink_n/bn_hot_blackcoffee.png
--- a/image/page_drink_n/bn_hot_coffee_thai_milk_tea.png
+++ b/image/page_drink_n/bn_hot_coffee_thai_milk_tea.png
--- a/image/page_drink_n/bn_iced_Ginger_soda_Doikum.png
+++ b/image/page_drink_n/bn_iced_Ginger_soda_Doikum.png
--- a/image/page_drink_n/bn_iced_Gingerlime_soda_Doikum.png
+++ b/image/page_drink_n/bn_iced_Gingerlime_soda_Doikum.png
--- a/image/page_drink_n/bn_iced_Ovaltine_cocoa_smoothie.png
+++ b/image/page_drink_n/bn_iced_Ovaltine_cocoa_smoothie.png
--- a/image/page_drink_n/bn_iced_christmas_cafe_latte.png
+++ b/image/page_drink_n/bn_iced_christmas_cafe_latte.png
--- a/image/page_drink_n/bn_limeblack_tea_SingPark_Healthy.png
+++ b/image/page_drink_n/bn_limeblack_tea_SingPark_Healthy.png
--- a/image/page_drink_n/bn_reindeer_peppermint_smoothie.png
+++ b/image/page_drink_n/bn_reindeer_peppermint_smoothie.png
--- a/image/page_drink_n/bn_royal_milk_tea.png
+++ b/image/page_drink_n/bn_royal_milk_tea.png
--- a/image/page_drink_n/bn_santa_ginger.png
+++ b/image/page_drink_n/bn_santa_ginger.png
--- a/image/page_drink_n/bn_southern_fusion_tea.png
+++ b/image/page_drink_n/bn_southern_fusion_tea.png
--- a/image/page_drink_n/bn_super_oreo_volcano.png
+++ b/image/page_drink_n/bn_super_oreo_volcano.png
--- a/image/page_drink_n/bn_thai_black_tea_SingPark_Healthy.png
+++ b/image/page_drink_n/bn_thai_black_tea_SingPark_Healthy.png
--- a/image/page_drink_n/bn_thai_milk_tea_SingPark_Healthy.png
+++ b/image/page_drink_n/bn_thai_milk_tea_SingPark_Healthy.png
--- a/image/page_drink_n/bn_traditional_green_tea.png
+++ b/image/page_drink_n/bn_traditional_green_tea.png
--- a/image/page_drink_picture2_n/bn_7UP_Milk_Sugar_BISCOFF.png
+++ b/image/page_drink_picture2_n/bn_7UP_Milk_Sugar_BISCOFF.png
--- a/image/page_drink_picture2_n/bn_Almost_Umeshu.png
+++ b/image/page_drink_picture2_n/bn_Almost_Umeshu.png
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				`cd /mnt/sdcard/coffeevending/taobin_project/app/game; cat game01.tgz.a* \| tar -xz`