diff --git a/image/page_brew.png b/image/page_brew.png
new file mode 100644
index 00000000..6a6ce631
Binary files /dev/null and b/image/page_brew.png differ
diff --git a/image/page_doing/brewing_txt_adv4.png b/image/page_doing/brewing_txt_adv4.png
index 83eb58f4..4dbba152 100644
Binary files a/image/page_doing/brewing_txt_adv4.png and b/image/page_doing/brewing_txt_adv4.png differ
diff --git a/image/page_doing/brewing_txt_adv4_en.png b/image/page_doing/brewing_txt_adv4_en.png
index 64c94869..49e6b348 100644
Binary files a/image/page_doing/brewing_txt_adv4_en.png and b/image/page_doing/brewing_txt_adv4_en.png differ
diff --git a/image/page_drink_disable_n2/bn_Mint_Americano.png b/image/page_drink_disable_n2/bn_Mint_Americano.png
new file mode 100644
index 00000000..40e7049e
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Mint_Americano.png differ
diff --git a/image/page_drink_disable_n2/bn_Mint_Cocoa.png b/image/page_drink_disable_n2/bn_Mint_Cocoa.png
new file mode 100644
index 00000000..5e32b224
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Mint_Cocoa.png differ
diff --git a/image/page_drink_disable_n2/bn_Mint_Lime_Black_tea.png b/image/page_drink_disable_n2/bn_Mint_Lime_Black_tea.png
new file mode 100644
index 00000000..012a73d1
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Mint_Lime_Black_tea.png differ
diff --git a/image/page_drink_disable_n2/bn_Mint_Lychee_lime_soda.png b/image/page_drink_disable_n2/bn_Mint_Lychee_lime_soda.png
new file mode 100644
index 00000000..23968673
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Mint_Lychee_lime_soda.png differ
diff --git a/image/page_drink_disable_n2/bn_Mint_Matcha_Latte.png b/image/page_drink_disable_n2/bn_Mint_Matcha_Latte.png
new file mode 100644
index 00000000..78056d6a
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Mint_Matcha_Latte.png differ
diff --git a/image/page_drink_disable_n2/bn_Mint_Milk.png b/image/page_drink_disable_n2/bn_Mint_Milk.png
new file mode 100644
index 00000000..09136e47
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Mint_Milk.png differ
diff --git a/image/page_drink_disable_n2/bn_Mint_Milk_Straw.png b/image/page_drink_disable_n2/bn_Mint_Milk_Straw.png
new file mode 100644
index 00000000..b3ee59eb
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Mint_Milk_Straw.png differ
diff --git a/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png b/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png
new file mode 100644
index 00000000..43ce6bd2
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png differ
diff --git a/image/page_drink_disable_n2/bn_Mint_Plum_limenade_Soda.png b/image/page_drink_disable_n2/bn_Mint_Plum_limenade_Soda.png
new file mode 100644
index 00000000..f160fd1a
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Mint_Plum_limenade_Soda.png differ
diff --git a/image/page_drink_disable_n2/bn_Mint_Strawberry_Soda.png b/image/page_drink_disable_n2/bn_Mint_Strawberry_Soda.png
new file mode 100644
index 00000000..ab9bf95b
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Mint_Strawberry_Soda.png differ
diff --git a/image/page_drink_disable_n2/bn_Mint_Yuzu_Soda.png b/image/page_drink_disable_n2/bn_Mint_Yuzu_Soda.png
new file mode 100644
index 00000000..15e86d9a
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Mint_Yuzu_Soda.png differ
diff --git a/image/page_drink_disable_n2/bn_Mint_cafe_Latte.png b/image/page_drink_disable_n2/bn_Mint_cafe_Latte.png
new file mode 100644
index 00000000..d56989b0
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Mint_cafe_Latte.png differ
diff --git a/image/page_drink_disable_n2/bn_Mint_pepsi.png b/image/page_drink_disable_n2/bn_Mint_pepsi.png
new file mode 100644
index 00000000..9f7989d1
Binary files /dev/null and b/image/page_drink_disable_n2/bn_Mint_pepsi.png differ
diff --git a/image/page_drink_disable_n2/bn_iced_mint_lime_soda.png b/image/page_drink_disable_n2/bn_iced_mint_lime_soda.png
new file mode 100644
index 00000000..f3e3370c
Binary files /dev/null and b/image/page_drink_disable_n2/bn_iced_mint_lime_soda.png differ
diff --git a/image/page_drink_n/bn_Mint_Americano.png b/image/page_drink_n/bn_Mint_Americano.png
index 0fda8924..5298e988 100644
Binary files a/image/page_drink_n/bn_Mint_Americano.png and b/image/page_drink_n/bn_Mint_Americano.png differ
diff --git a/image/page_drink_n/bn_Mint_Cocoa.png b/image/page_drink_n/bn_Mint_Cocoa.png
index 3895b972..d5111d4f 100644
Binary files a/image/page_drink_n/bn_Mint_Cocoa.png and b/image/page_drink_n/bn_Mint_Cocoa.png differ
diff --git a/image/page_drink_n/bn_Mint_Lime_Black_tea.png b/image/page_drink_n/bn_Mint_Lime_Black_tea.png
new file mode 100644
index 00000000..5d1809ed
Binary files /dev/null and b/image/page_drink_n/bn_Mint_Lime_Black_tea.png differ
diff --git a/image/page_drink_n/bn_Mint_Lychee_lime_soda.png b/image/page_drink_n/bn_Mint_Lychee_lime_soda.png
new file mode 100644
index 00000000..6f83f391
Binary files /dev/null and b/image/page_drink_n/bn_Mint_Lychee_lime_soda.png differ
diff --git a/image/page_drink_n/bn_Mint_Matcha_Latte.png b/image/page_drink_n/bn_Mint_Matcha_Latte.png
index db8a1a76..a7a69eee 100644
Binary files a/image/page_drink_n/bn_Mint_Matcha_Latte.png and b/image/page_drink_n/bn_Mint_Matcha_Latte.png differ
diff --git a/image/page_drink_n/bn_Mint_Milk.png b/image/page_drink_n/bn_Mint_Milk.png
index 7241e24f..3ae4b2dd 100644
Binary files a/image/page_drink_n/bn_Mint_Milk.png and b/image/page_drink_n/bn_Mint_Milk.png differ
diff --git a/image/page_drink_n/bn_Mint_Milk_Straw.png b/image/page_drink_n/bn_Mint_Milk_Straw.png
new file mode 100644
index 00000000..07054ab7
Binary files /dev/null and b/image/page_drink_n/bn_Mint_Milk_Straw.png differ
diff --git a/image/page_drink_n/bn_Mint_Oreo_smoothie.png b/image/page_drink_n/bn_Mint_Oreo_smoothie.png
new file mode 100644
index 00000000..8b0dba14
Binary files /dev/null and b/image/page_drink_n/bn_Mint_Oreo_smoothie.png differ
diff --git a/image/page_drink_n/bn_Mint_Plum_limenade_Soda.png b/image/page_drink_n/bn_Mint_Plum_limenade_Soda.png
new file mode 100644
index 00000000..192f581b
Binary files /dev/null and b/image/page_drink_n/bn_Mint_Plum_limenade_Soda.png differ
diff --git a/image/page_drink_n/bn_Mint_Strawberry_Soda.png b/image/page_drink_n/bn_Mint_Strawberry_Soda.png
new file mode 100644
index 00000000..4843dac9
Binary files /dev/null and b/image/page_drink_n/bn_Mint_Strawberry_Soda.png differ
diff --git a/image/page_drink_n/bn_Mint_Yuzu_Soda.png b/image/page_drink_n/bn_Mint_Yuzu_Soda.png
new file mode 100644
index 00000000..55f2dcf7
Binary files /dev/null and b/image/page_drink_n/bn_Mint_Yuzu_Soda.png differ
diff --git a/image/page_drink_n/bn_Mint_cafe_Latte.png b/image/page_drink_n/bn_Mint_cafe_Latte.png
index 94ed79f1..8b02cfb6 100644
Binary files a/image/page_drink_n/bn_Mint_cafe_Latte.png and b/image/page_drink_n/bn_Mint_cafe_Latte.png differ
diff --git a/image/page_drink_n/bn_Mint_pepsi.png b/image/page_drink_n/bn_Mint_pepsi.png
new file mode 100644
index 00000000..bdc11a2f
Binary files /dev/null and b/image/page_drink_n/bn_Mint_pepsi.png differ
diff --git a/image/page_drink_n/bn_iced_mint_lime_soda.png b/image/page_drink_n/bn_iced_mint_lime_soda.png
new file mode 100644
index 00000000..e2f1133f
Binary files /dev/null and b/image/page_drink_n/bn_iced_mint_lime_soda.png differ
diff --git a/image/page_drink_picture2_n/bn_Icebn_Mint_Americano.png b/image/page_drink_picture2_n/bn_Icebn_Mint_Americano.png
new file mode 100644
index 00000000..09e27a9a
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Icebn_Mint_Americano.png differ
diff --git a/image/page_drink_picture2_n/bn_Lychee_lime_soda.png b/image/page_drink_picture2_n/bn_Lychee_lime_soda.png
index 867ab93a..8b114479 100644
Binary files a/image/page_drink_picture2_n/bn_Lychee_lime_soda.png and b/image/page_drink_picture2_n/bn_Lychee_lime_soda.png differ
diff --git a/image/page_drink_picture2_n/bn_Mint_Cocoa.png b/image/page_drink_picture2_n/bn_Mint_Cocoa.png
new file mode 100644
index 00000000..3e6d3bd4
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Mint_Cocoa.png differ
diff --git a/image/page_drink_picture2_n/bn_Mint_Lime_Black_tea.png b/image/page_drink_picture2_n/bn_Mint_Lime_Black_tea.png
new file mode 100644
index 00000000..ac8d3571
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Mint_Lime_Black_tea.png differ
diff --git a/image/page_drink_picture2_n/bn_Mint_Matcha_Latte.png b/image/page_drink_picture2_n/bn_Mint_Matcha_Latte.png
new file mode 100644
index 00000000..ea3eb359
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Mint_Matcha_Latte.png differ
diff --git a/image/page_drink_picture2_n/bn_Mint_Milk.png b/image/page_drink_picture2_n/bn_Mint_Milk.png
new file mode 100644
index 00000000..9813b084
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Mint_Milk.png differ
diff --git a/image/page_drink_picture2_n/bn_Mint_Milk_Straw.png b/image/page_drink_picture2_n/bn_Mint_Milk_Straw.png
new file mode 100644
index 00000000..cac0da96
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Mint_Milk_Straw.png differ
diff --git a/image/page_drink_picture2_n/bn_Mint_Mint cafe Latte.png b/image/page_drink_picture2_n/bn_Mint_Mint cafe Latte.png
new file mode 100644
index 00000000..fe4bf077
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Mint_Mint cafe Latte.png differ
diff --git a/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie.png b/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie.png
new file mode 100644
index 00000000..9d30f58f
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Mint_Oreo_smoothie.png differ
diff --git a/image/page_drink_picture2_n/bn_Mint_Plum_limenade_Soda.png b/image/page_drink_picture2_n/bn_Mint_Plum_limenade_Soda.png
new file mode 100644
index 00000000..9baad271
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Mint_Plum_limenade_Soda.png differ
diff --git a/image/page_drink_picture2_n/bn_Mint_Strawberry_Soda.png b/image/page_drink_picture2_n/bn_Mint_Strawberry_Soda.png
new file mode 100644
index 00000000..e3447960
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Mint_Strawberry_Soda.png differ
diff --git a/image/page_drink_picture2_n/bn_Mint_Yuzu_Soda.png b/image/page_drink_picture2_n/bn_Mint_Yuzu_Soda.png
new file mode 100644
index 00000000..143fcbdc
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Mint_Yuzu_Soda.png differ
diff --git a/image/page_drink_picture2_n/bn_Mint_pepsi.png b/image/page_drink_picture2_n/bn_Mint_pepsi.png
new file mode 100644
index 00000000..542b4d21
Binary files /dev/null and b/image/page_drink_picture2_n/bn_Mint_pepsi.png differ
diff --git a/image/page_drink_picture2_n/bn_iced_mint_lime_soda.png b/image/page_drink_picture2_n/bn_iced_mint_lime_soda.png
new file mode 100644
index 00000000..119884e6
Binary files /dev/null and b/image/page_drink_picture2_n/bn_iced_mint_lime_soda.png differ
diff --git a/image/page_drink_press_n/bn_Mint_Americano.png b/image/page_drink_press_n/bn_Mint_Americano.png
new file mode 100644
index 00000000..21995e16
Binary files /dev/null and b/image/page_drink_press_n/bn_Mint_Americano.png differ
diff --git a/image/page_drink_press_n/bn_Mint_Cocoa.png b/image/page_drink_press_n/bn_Mint_Cocoa.png
new file mode 100644
index 00000000..65011424
Binary files /dev/null and b/image/page_drink_press_n/bn_Mint_Cocoa.png differ
diff --git a/image/page_drink_press_n/bn_Mint_Lime_Black_tea.png b/image/page_drink_press_n/bn_Mint_Lime_Black_tea.png
new file mode 100644
index 00000000..09afdc4b
Binary files /dev/null and b/image/page_drink_press_n/bn_Mint_Lime_Black_tea.png differ
diff --git a/image/page_drink_press_n/bn_Mint_Lychee_lime_soda.png b/image/page_drink_press_n/bn_Mint_Lychee_lime_soda.png
new file mode 100644
index 00000000..21a44de3
Binary files /dev/null and b/image/page_drink_press_n/bn_Mint_Lychee_lime_soda.png differ
diff --git a/image/page_drink_press_n/bn_Mint_Matcha_Latte.png b/image/page_drink_press_n/bn_Mint_Matcha_Latte.png
new file mode 100644
index 00000000..504c49ae
Binary files /dev/null and b/image/page_drink_press_n/bn_Mint_Matcha_Latte.png differ
diff --git a/image/page_drink_press_n/bn_Mint_Milk.png b/image/page_drink_press_n/bn_Mint_Milk.png
new file mode 100644
index 00000000..4c0748cf
Binary files /dev/null and b/image/page_drink_press_n/bn_Mint_Milk.png differ
diff --git a/image/page_drink_press_n/bn_Mint_Milk_Straw.png b/image/page_drink_press_n/bn_Mint_Milk_Straw.png
new file mode 100644
index 00000000..abaabc40
Binary files /dev/null and b/image/page_drink_press_n/bn_Mint_Milk_Straw.png differ
diff --git a/image/page_drink_press_n/bn_Mint_Oreo_smoothie.png b/image/page_drink_press_n/bn_Mint_Oreo_smoothie.png
new file mode 100644
index 00000000..e2e50fb0
Binary files /dev/null and b/image/page_drink_press_n/bn_Mint_Oreo_smoothie.png differ
diff --git a/image/page_drink_press_n/bn_Mint_Plum_limenade_Soda.png b/image/page_drink_press_n/bn_Mint_Plum_limenade_Soda.png
new file mode 100644
index 00000000..0182e669
Binary files /dev/null and b/image/page_drink_press_n/bn_Mint_Plum_limenade_Soda.png differ
diff --git a/image/page_drink_press_n/bn_Mint_Strawberry_Soda.png b/image/page_drink_press_n/bn_Mint_Strawberry_Soda.png
new file mode 100644
index 00000000..661554ad
Binary files /dev/null and b/image/page_drink_press_n/bn_Mint_Strawberry_Soda.png differ
diff --git a/image/page_drink_press_n/bn_Mint_Yuzu_Soda.png b/image/page_drink_press_n/bn_Mint_Yuzu_Soda.png
new file mode 100644
index 00000000..5fbf4c7c
Binary files /dev/null and b/image/page_drink_press_n/bn_Mint_Yuzu_Soda.png differ
diff --git a/image/page_drink_press_n/bn_Mint_cafe_Latte.png b/image/page_drink_press_n/bn_Mint_cafe_Latte.png
new file mode 100644
index 00000000..08f9a118
Binary files /dev/null and b/image/page_drink_press_n/bn_Mint_cafe_Latte.png differ
diff --git a/image/page_drink_press_n/bn_Mint_pepsi.png b/image/page_drink_press_n/bn_Mint_pepsi.png
new file mode 100644
index 00000000..850ee3b6
Binary files /dev/null and b/image/page_drink_press_n/bn_Mint_pepsi.png differ
diff --git a/image/page_drink_press_n/bn_iced_mint_lime_soda.png b/image/page_drink_press_n/bn_iced_mint_lime_soda.png
new file mode 100644
index 00000000..fe848f3c
Binary files /dev/null and b/image/page_drink_press_n/bn_iced_mint_lime_soda.png differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art10.mp4 b/inter/common/animation01/TaoBin2_draft02_art10.mp4
new file mode 100644
index 00000000..0b84c7e2
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art10.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art11.mp4 b/inter/common/animation01/TaoBin2_draft02_art11.mp4
new file mode 100644
index 00000000..03293313
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art11.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art12.mp4 b/inter/common/animation01/TaoBin2_draft02_art12.mp4
new file mode 100644
index 00000000..35b4f151
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art12.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art13.mp4 b/inter/common/animation01/TaoBin2_draft02_art13.mp4
new file mode 100644
index 00000000..e9c5976c
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art13.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art14.mp4 b/inter/common/animation01/TaoBin2_draft02_art14.mp4
new file mode 100644
index 00000000..504cf80a
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art14.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art15.mp4 b/inter/common/animation01/TaoBin2_draft02_art15.mp4
new file mode 100644
index 00000000..6a9bb1ff
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art15.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art16.mp4 b/inter/common/animation01/TaoBin2_draft02_art16.mp4
new file mode 100644
index 00000000..50afceee
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art16.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art17.mp4 b/inter/common/animation01/TaoBin2_draft02_art17.mp4
new file mode 100644
index 00000000..79e018ee
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art17.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art19.mp4 b/inter/common/animation01/TaoBin2_draft02_art19.mp4
new file mode 100644
index 00000000..14574fb2
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art19.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art2.mp4 b/inter/common/animation01/TaoBin2_draft02_art2.mp4
new file mode 100644
index 00000000..ecd17fec
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art2.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art21.mp4 b/inter/common/animation01/TaoBin2_draft02_art21.mp4
new file mode 100644
index 00000000..52b3441e
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art21.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art22.mp4 b/inter/common/animation01/TaoBin2_draft02_art22.mp4
new file mode 100644
index 00000000..1ff176cf
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art22.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art23.mp4 b/inter/common/animation01/TaoBin2_draft02_art23.mp4
new file mode 100644
index 00000000..cfc6a4d8
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art23.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art24.mp4 b/inter/common/animation01/TaoBin2_draft02_art24.mp4
new file mode 100644
index 00000000..8ee0df6d
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art24.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art25.mp4 b/inter/common/animation01/TaoBin2_draft02_art25.mp4
new file mode 100644
index 00000000..6c76718b
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art25.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art26.mp4 b/inter/common/animation01/TaoBin2_draft02_art26.mp4
new file mode 100644
index 00000000..292abd7e
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art26.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art27.mp4 b/inter/common/animation01/TaoBin2_draft02_art27.mp4
new file mode 100644
index 00000000..2a102b6c
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art27.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art28.mp4 b/inter/common/animation01/TaoBin2_draft02_art28.mp4
new file mode 100644
index 00000000..4556d122
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art28.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art3.mp4 b/inter/common/animation01/TaoBin2_draft02_art3.mp4
new file mode 100644
index 00000000..cc82d679
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art3.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art31.mp4 b/inter/common/animation01/TaoBin2_draft02_art31.mp4
new file mode 100644
index 00000000..fd135e27
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art31.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art33.mp4 b/inter/common/animation01/TaoBin2_draft02_art33.mp4
new file mode 100644
index 00000000..9510f162
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art33.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art34.mp4 b/inter/common/animation01/TaoBin2_draft02_art34.mp4
new file mode 100644
index 00000000..5f344983
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art34.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art35.mp4 b/inter/common/animation01/TaoBin2_draft02_art35.mp4
new file mode 100644
index 00000000..998ae200
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art35.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art36.mp4 b/inter/common/animation01/TaoBin2_draft02_art36.mp4
new file mode 100644
index 00000000..4e1ff8c1
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art36.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art4.mp4 b/inter/common/animation01/TaoBin2_draft02_art4.mp4
new file mode 100644
index 00000000..110042a9
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art4.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art40.mp4 b/inter/common/animation01/TaoBin2_draft02_art40.mp4
new file mode 100644
index 00000000..0a12c28b
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art40.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art41.mp4 b/inter/common/animation01/TaoBin2_draft02_art41.mp4
new file mode 100644
index 00000000..3c7931b5
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art41.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art42.mp4 b/inter/common/animation01/TaoBin2_draft02_art42.mp4
new file mode 100644
index 00000000..dd6b5352
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art42.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art43.mp4 b/inter/common/animation01/TaoBin2_draft02_art43.mp4
new file mode 100644
index 00000000..ea94dba4
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art43.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art44.mp4 b/inter/common/animation01/TaoBin2_draft02_art44.mp4
new file mode 100644
index 00000000..35e0dea2
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art44.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art45.mp4 b/inter/common/animation01/TaoBin2_draft02_art45.mp4
new file mode 100644
index 00000000..919e695c
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art45.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art46.mp4 b/inter/common/animation01/TaoBin2_draft02_art46.mp4
new file mode 100644
index 00000000..f588e190
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art46.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art47.mp4 b/inter/common/animation01/TaoBin2_draft02_art47.mp4
new file mode 100644
index 00000000..aec9d994
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art47.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art48.mp4 b/inter/common/animation01/TaoBin2_draft02_art48.mp4
new file mode 100644
index 00000000..bfbf095d
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art48.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art49.mp4 b/inter/common/animation01/TaoBin2_draft02_art49.mp4
new file mode 100644
index 00000000..dab65e23
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art49.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art5.mp4 b/inter/common/animation01/TaoBin2_draft02_art5.mp4
new file mode 100644
index 00000000..276a8348
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art5.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art50.mp4 b/inter/common/animation01/TaoBin2_draft02_art50.mp4
new file mode 100644
index 00000000..4fcf6b3e
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art50.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art51.mp4 b/inter/common/animation01/TaoBin2_draft02_art51.mp4
new file mode 100644
index 00000000..59974bbd
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art51.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art53.mp4 b/inter/common/animation01/TaoBin2_draft02_art53.mp4
new file mode 100644
index 00000000..e337a7ca
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art53.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art55.mp4 b/inter/common/animation01/TaoBin2_draft02_art55.mp4
new file mode 100644
index 00000000..0b84c7e2
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art55.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art57.mp4 b/inter/common/animation01/TaoBin2_draft02_art57.mp4
new file mode 100644
index 00000000..74bdfa70
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art57.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art58.mp4 b/inter/common/animation01/TaoBin2_draft02_art58.mp4
new file mode 100644
index 00000000..0b84c7e2
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art58.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art7.mp4 b/inter/common/animation01/TaoBin2_draft02_art7.mp4
new file mode 100644
index 00000000..36ed729c
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art7.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art70.mp4 b/inter/common/animation01/TaoBin2_draft02_art70.mp4
new file mode 100644
index 00000000..36ed729c
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art70.mp4 differ
diff --git a/inter/common/animation01/TaoBin2_draft02_art8.mp4 b/inter/common/animation01/TaoBin2_draft02_art8.mp4
new file mode 100644
index 00000000..16713f16
Binary files /dev/null and b/inter/common/animation01/TaoBin2_draft02_art8.mp4 differ
diff --git a/inter/common/animation01/TaoBin_7up.mp4 b/inter/common/animation01/TaoBin_7up.mp4
new file mode 100644
index 00000000..998ae200
Binary files /dev/null and b/inter/common/animation01/TaoBin_7up.mp4 differ
diff --git a/inter/common/animation01/TaoBin_Chocolatte.mp4 b/inter/common/animation01/TaoBin_Chocolatte.mp4
new file mode 100644
index 00000000..6a9bb1ff
Binary files /dev/null and b/inter/common/animation01/TaoBin_Chocolatte.mp4 differ
diff --git a/inter/common/animation01/TaoBin_Ice.mp4 b/inter/common/animation01/TaoBin_Ice.mp4
new file mode 100644
index 00000000..cfc6a4d8
Binary files /dev/null and b/inter/common/animation01/TaoBin_Ice.mp4 differ
diff --git a/inter/common/animation01/TaoBin_Protien.mp4 b/inter/common/animation01/TaoBin_Protien.mp4
new file mode 100644
index 00000000..292abd7e
Binary files /dev/null and b/inter/common/animation01/TaoBin_Protien.mp4 differ
diff --git a/inter/common/animation01/TaoBin_caramel.mp4 b/inter/common/animation01/TaoBin_caramel.mp4
new file mode 100644
index 00000000..1ff176cf
Binary files /dev/null and b/inter/common/animation01/TaoBin_caramel.mp4 differ
diff --git a/inter/common/animation01/TaoBin_lime.mp4 b/inter/common/animation01/TaoBin_lime.mp4
new file mode 100644
index 00000000..35b4f151
Binary files /dev/null and b/inter/common/animation01/TaoBin_lime.mp4 differ
diff --git a/inter/common/animation01/TaoBin_lynchee.mp4 b/inter/common/animation01/TaoBin_lynchee.mp4
new file mode 100644
index 00000000..03293313
Binary files /dev/null and b/inter/common/animation01/TaoBin_lynchee.mp4 differ
diff --git a/inter/common/animation01/TaoBin_matcha.mp4 b/inter/common/animation01/TaoBin_matcha.mp4
new file mode 100644
index 00000000..16713f16
Binary files /dev/null and b/inter/common/animation01/TaoBin_matcha.mp4 differ
diff --git a/inter/common/animation01/TaoBin_milk foam.mp4 b/inter/common/animation01/TaoBin_milk foam.mp4
new file mode 100644
index 00000000..36ed729c
Binary files /dev/null and b/inter/common/animation01/TaoBin_milk foam.mp4 differ
diff --git a/inter/common/animation01/TaoBin_milk.mp4 b/inter/common/animation01/TaoBin_milk.mp4
new file mode 100644
index 00000000..79e018ee
Binary files /dev/null and b/inter/common/animation01/TaoBin_milk.mp4 differ
diff --git a/inter/common/animation01/TaoBin_oreo.mp4 b/inter/common/animation01/TaoBin_oreo.mp4
new file mode 100644
index 00000000..0a12c28b
Binary files /dev/null and b/inter/common/animation01/TaoBin_oreo.mp4 differ
diff --git a/inter/common/animation01/TaoBin_salak.mp4 b/inter/common/animation01/TaoBin_salak.mp4
new file mode 100644
index 00000000..52b3441e
Binary files /dev/null and b/inter/common/animation01/TaoBin_salak.mp4 differ
diff --git a/inter/common/animation01/TaoBin_soda.mp4 b/inter/common/animation01/TaoBin_soda.mp4
new file mode 100644
index 00000000..e9c5976c
Binary files /dev/null and b/inter/common/animation01/TaoBin_soda.mp4 differ
diff --git a/inter/common/animation01/TaoBin_strawberry.mp4 b/inter/common/animation01/TaoBin_strawberry.mp4
new file mode 100644
index 00000000..14574fb2
Binary files /dev/null and b/inter/common/animation01/TaoBin_strawberry.mp4 differ
diff --git a/inter/common/animation01/TaoBin_tea.mp4 b/inter/common/animation01/TaoBin_tea.mp4
new file mode 100644
index 00000000..0b84c7e2
Binary files /dev/null and b/inter/common/animation01/TaoBin_tea.mp4 differ
diff --git a/inter/common/animation01/TaoBin_water.mp4 b/inter/common/animation01/TaoBin_water.mp4
new file mode 100644
index 00000000..50afceee
Binary files /dev/null and b/inter/common/animation01/TaoBin_water.mp4 differ
diff --git a/inter/common/animation01/Taobin_pick up.mp4 b/inter/common/animation01/Taobin_pick up.mp4
new file mode 100644
index 00000000..8ee0df6d
Binary files /dev/null and b/inter/common/animation01/Taobin_pick up.mp4 differ
diff --git a/landscape/xml/menu_list.xml b/landscape/xml/menu_list.xml
new file mode 100644
index 00000000..532e5a44
--- /dev/null
+++ b/landscape/xml/menu_list.xml
@@ -0,0 +1,36 @@
+
+ "Enable"
+ 1920
+ 1080
+ "0xeae6e1"
+ SoundVolume
+
+
+ SAVELOG "Landscape mode"
+ RootLayoutVisible 2 "show"
+
+ 60000
+
+
+ Open "ROOT/taobin_project/landscape/xml/menu_list.xml"
+
+
+
+
+
+ Open "ROOT/taobin_project/landscape/xml/menu_list.xml"
+
+
+
+
+
+
+
diff --git a/landscape/xml/startup.xml b/landscape/xml/startup.xml
new file mode 100644
index 00000000..a73a0d44
--- /dev/null
+++ b/landscape/xml/startup.xml
@@ -0,0 +1,17 @@
+
+ 1080
+ 1920
+
+
+
+
+ 1000
+
+
+ Open "ROOT/taobin_project/landscape/xml/menu_list.xml"
+
+
+
+
+
+
diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv
index 34616306..a09741ec 100644
--- a/menu/new-layout.tsv
+++ b/menu/new-layout.tsv
@@ -4,7 +4,7 @@ Name=recommend,file=page_catalog_group_recommend.skt
TAGESP
ชานมไทย THAI MILK TEA ชาไทย และ นม Thai tea, Sugar, milk 12-02-01-0039 12-02-02-0039 12-02-03-0039 bn_thai_milk_tea_SingPark.png - - - ฿35.00 ฿40.00 ฿45.00 TRUE TRUE
TAGESP
- โอริโอ้ปั่นภูเขาไฟ OREO SMOOTHIE \nVOLCANO นม น้ำตาล โอริโอ้ \n Milk, Sugar, Oreo - - 12-03-03-0009 bn_smoothie_oreo.png - - - posi1 - - ฿55.00 NN NN
+ โอริโอ้ปั่นภูเขาไฟ OREO SMOOTHIE \nVOLCANO นม น้ำตาล โอริโอ้ \n Milk, Sugar, Oreo - - 12-03-03-0009 bn_smoothie_oreo.png - - - posi2 - - ฿55.00 NN NN
โกโก้ COCOA โกโก้ นมและน้ำตาล Milk, Cocoa, Sugar 12-03-01-0002 12-03-02-0002 12-03-03-0002 bn_iced_cocoa.png - - - posi1 ฿30.00 ฿35.00 ฿40.00 TRUE TRUE
นมโอ๊ตสตรอว์เบอร์รี่ Strawberry Oat Milk นมโอ๊ต น้ำเชื่อมสตรอว์เบอร์รี่\nและน้ำแข็ง Oat Milk, Strawberry Syrup - 12-03-82-0011 12-03-83-0011 bn_smoothie_Strawberry_Oat_smoothie.png - - -
@@ -111,8 +111,8 @@ Name=Coffee,file=page_catalog_group_coffee.skt
ยูซุกาโน่ YUZUCANO กาแฟ น้ำ และ ยูซุ Espresso, Yuzu,\nSugar, Water 12-01-01-0040 12-01-02-0040 - bn_Yuzu_americano.png 12-21-01-0040 12-21-02-0040 - posi1 ฿30.00 ฿35.00 - TRUE NN
posi1
ลาเต้โตเกียวบานาน่า TOKYO BANANA \nLATTE กาแฟ น้ำ นม และ กล้วย Espresso, Tokyo Banana Syrup,\nSugar, Water 12-01-01-0042 12-01-02-0042 12-01-03-0042 bn_hot_Banana_cafe_latte.png 12-21-01-0042 12-21-02-0042 12-21-03-0042 posi1 ฿40.00 ฿45.00 ฿50.00 TRUE TRUE
- กาแฟมินต์ลาเต้ MINT CAFE LATTE กาแฟ น้ำ นม และ มิ้นท์ Espresso, Mint Syrup,\nSugar, Milk 12-01-01-0057 12-01-02-0057 12-01-03-0057 - - - - posi1
- มินต์กาโน่ MINTCANO กาแฟ น้ำ และ มิ้นท์ Espresso, Mint Syrup,\nSugar, Water 12-01-01-0058 12-01-02-0058 - - - - - posi1
+ กาแฟมินต์ลาเต้ MINT CAFE LATTE กาแฟ น้ำ นม และ มินต์ Espresso, Mint Syrup,\nSugar, Milk 12-01-01-0057 12-01-02-0057 12-01-03-0057 bn_Mint_cafe_Latte.png 12-21-01-0057 12-21-02-0057 12-21-03-0057 posi1
+ มินต์กาโน่ MINTCANO กาแฟ น้ำ และ มินต์ Espresso, Mint Syrup,\nSugar, Water 12-01-01-0058 12-01-02-0058 - bn_Mint_Americano.png 12-21-01-0058 12-21-02-0058 - posi1
พีชกาโน่ PEACH AMERICANO กาแฟ น้ำ และ พีช Espresso, Peach Syrup ,\nSugar, Water 12-01-01-0059 12-01-02-0059 - - - - - posi1
กาแฟพีชลาเต้ PEACH CAFE LATTE กาแฟ น้ำ นม และ พีช Espresso, Peach Syrup,\nSugar, Milk 12-01-01-0060 12-01-02-0060 12-01-03-0060 - - - - posi1
@@ -128,7 +128,7 @@ Name=Milk,file=page_catalog_group_oreo.skt
ลาเต้ปั่น\n โอริโอ้ภูเขาไฟ CAFE LATTE OREO VOLCANO กาแฟ นม น้ำตาล \n Oero Coffee, Milk, \nSugar, Oreo - - 12-01-03-0043 bn_Cafe_Latte_Oreo_smoothie.png - - - - - #REF! NN #REF!
นมชมพูปั่น\nโอริโอ้ภูเขาไฟ PINK MILK\nOREO VOLCANO น้ำแดงกลิ่นสละ นม น้ำตาล \n Oreo Salak Syrup, Milk,\nSugar Oreo - - 12-03-03-0026 bn_PinkOreo_smoothie.png - - - - - ฿50.00 NN NN
ชานมไทย\nโอริโอ้ภูเขาไฟ THAI MILK TEA OREO VOLCANO ชาไทย นม น้ำตาล \n Oreo Thai Tea, Milk,\nSugar, Oreo - - 12-02-03-0045 bn_ThaiTeaOreo_smoothie.png - - - - - #REF! NN #REF!
- มินต์โอริโอ้ภูเขาไฟ MINT OREO VOLCANO น้ำเชื่อมมิ้นท์ นม น้ำตาล \n Oreo Mint Syrup, Milk,\nSugar, Oreo - - 12-03-03-0034 bn_Mint_Oreo_smoothie.png
+ มินต์โอริโอ้ภูเขาไฟ MINT OREO VOLCANO น้ำเชื่อมมินต์ นม น้ำตาล \n Oreo Mint Syrup, Milk,\nSugar, Oreo - - 12-03-03-0034 bn_Mint_Oreo_smoothie.png - - -
พีชโอริโอ้ภูเขาไฟ PEACH OREO น้ำเชื่อมพีช นม น้ำตาล \n Oreo Peach Syrup, Milk,\nSugar, Oreo - - 12-03-03-0040
Name=Milk,file=page_catalog_group_milk.skt
@@ -154,10 +154,10 @@ Name=Milk,file=page_catalog_group_milk.skt
นมชมพูปั่น\nโอริโอ้ภูเขาไฟ PINK MILK\nOREO VOLCANO น้ำแดงกลิ่นสละ นม น้ำตาล \n Oreo Salak Syrup, Milk,\nSugar Oreo - - 12-03-03-0026 bn_PinkOreo_smoothie.png - - - - - ฿50.00 NN NN
นมโตเกียวบานาน่า TOKYO\nBANANA MILK น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล Tokyo Banana Syrup, Milk, Sugar 12-03-01-0023 12-03-02-0023 12-03-03-0023 bn_Banana_milk.png - - -
นมช็อกโกโตเกียว\nบานาน่า CHOCO TOKYO\nBANANA MILK โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล Tokyo Banana Syrup, Milk, Sugar 12-03-01-0024 12-03-02-0024 12-03-03-0024 bn_ChocoBanana_milk.png - - -
- มินต์โอริโอ้ภูเขาไฟ MINT OREO VOLCANO น้ำเชื่อมมิ้นท์ นม น้ำตาล \n Oreo Mint Syrup, Milk,\nSugar, Oreo - - 12-03-03-0034 bn_Mint_Oreo_smoothie.png - - -
- โกโก้มินต์ COCOA MINT น้ำเชื่อมมิ้นท์ นม น้ำตาล และโกโก้ Mint Syrup, Milk,\nSugar, Cocoa 12-03-01-0035 12-03-02-0035 12-03-03-0035 bn_Mint_Cocoa.png - - -
- นมมินต์ MINT MILK น้ำเชื่อมมิ้นท์ และนม Mint Syrup and Milk 12-03-01-0036 12-03-02-0036 12-03-03-0036 bn_Mint_Milk.png - - -
- นมสตรอร์เบอร์รี่มินต์ STRAWBERRY MINT MILK น้ำเชื่อมมิ้นท์ นม น้ำตาล และโกโก้ Mint Syrup, Milk,\nStrawberry Syrup - 12-03-02-0037 12-03-03-0037 bn_Mint_Milk_Straw.png - - -
+ มินต์โอริโอ้ภูเขาไฟ MINT OREO VOLCANO น้ำเชื่อมมินต์ นม น้ำตาล \n Oreo Mint Syrup, Milk,\nSugar, Oreo - - 12-03-03-0034 bn_Mint_Oreo_smoothie.png - - -
+ โกโก้มินต์ COCOA MINT น้ำเชื่อมมินต์ นม น้ำตาล และโกโก้ Mint Syrup, Milk,\nSugar, Cocoa 12-03-01-0035 12-03-02-0035 12-03-03-0035 bn_Mint_Cocoa.png - - -
+ นมมินต์ MINT MILK น้ำเชื่อมมินต์ และนม Mint Syrup and Milk 12-03-01-0036 12-03-02-0036 12-03-03-0036 bn_Mint_Milk.png - - -
+ นมสตรอร์เบอร์รี่มินต์ STRAWBERRY MINT MILK น้ำเชื่อมมินต์ นม น้ำตาล และโกโก้ Mint Syrup, Milk,\nStrawberry Syrup - 12-03-02-0037 12-03-03-0037 bn_Mint_Milk_Straw.png - - -
นมพีช PEACH MILK น้ำเชื่อมพีช และนม Mint Syrup and Milk 12-03-01-0038 12-03-02-0038 12-03-03-0038 - - - -
โกโก้พีช PEACH COCAO MILK น้ำเชื่อมพีช นม น้ำตาล และโกโก้ Mint Syrup, Milk,\nSugar, Cocoa - 12-03-02-0039 12-03-03-0039 - - - -
พีชโอริโอ้ภูเขาไฟ PEACH OREO น้ำเชื่อมพีช นม น้ำตาล \n Oreo Peach Syrup, Milk,\nSugar, Oreo - - 12-03-03-0040 - - - -
@@ -187,9 +187,9 @@ Name=Tea,file=page_catalog_group_tea.skt
ชาเขียวญี่ปุ่นมะนาว\n MATCHA \nLIMENADE ชาเชียว น้ำ มะนาว Matcha, Limenade, Water 12-02-01-0012 12-02-02-0012 12-02-03-0012 bn_hot_lime_Matcha.png - - - ฿25.00 ฿30.00 ฿35.00 TRUE TRUE
ชามะลิ JASMINE TEA ชามะลิ น้ำ Jasmine Tea ,Water 12-02-01-0045 12-02-02-0045 12-02-03-0046 bn_jasmine_tea.png - - -
ชามะลิลาเต้ JASMINE MILK TEA ชามะลิ และนม Jasmine Tea & Milk 12-02-01-0046 12-02-02-0046 12-02-03-0047 bn_jasmine_milk_tea.png - - -
- มัทฉะลาเต้มินต์ MATCHA LATTE MINT ชาเขียวมัทฉะ น้ำเชื่อมมิ้นท์และ นมอุ่น Matcha, Mint Syrup &Milk 12-02-01-0050 12-02-02-0050 12-02-03-0050 bn_Mint_Matcha_Latte.png - - - #N/A #N/A #REF! #N/A #N/A
- ชาพีช PEACH TEA ชาไทย และน้ำเชื่อมพีช Thai Tea, Peach Syrup & Water 12-02-01-0051 12-02-02-0051 12-02-03-0051
- ชามะลิพีช PEACH JASMINE TEA ชามะลิ และน้ำเชื่อมพีช Jasmine Tea, Peach Syrup &Milk - 12-02-02-0052 -
+ มัทฉะลาเต้มินต์ MATCHA LATTE MINT ชาเขียวมัทฉะ น้ำเชื่อมมินต์ และนมอุ่น Matcha, Mint Syrup &Milk 12-02-01-0050 12-02-02-0050 12-02-03-0050 bn_Mint_Matcha_Latte.png - - - #N/A #N/A #REF! #N/A #N/A
+ ชาพีช PEACH TEA ชาไทย และน้ำเชื่อมพีช Thai Tea, Peach Syrup & Water 12-02-01-0051 12-02-02-0051 12-02-03-0051 - - - -
+ ชามะลิพีช PEACH JASMINE TEA ชามะลิ และน้ำเชื่อมพีช Jasmine Tea, Peach Syrup &Milk - 12-02-02-0052 - - - - -
ชาบราวน์ชูการ์ BROWN SUGAR \nTEA ชาไทย น้ำเชื่อมน้ำตาลแดง\n นม Thai tea, Milk, Kokuto syrup 12-02-01-0006 12-02-02-0006 12-02-03-0006 bn_hot_Black_Sugar_Milk_Tea.png - - - ฿35.00 ฿40.00 ฿45.00 TRUE TRUE
@@ -214,7 +214,7 @@ Name=Tea,file=page_catalog_group_tea.skt
- #oreo_menu_pro
+
@@ -251,12 +251,12 @@ Name=Other,file=page_catalog_group_other.skt
ขิงมะนาวโซดา GINGER LIME \nSODA ขิง มะนาว โซดา Ginger, Lime, Soda & Ice - 12-05-02-0039 12-05-03-0039 bn_iced_Gingerlime_soda.png - - - - ฿25.00 ฿30.00 NN TRUE
ขิงโซดา GINGER SODA ขิง โซดา Ginger, Soda & Ice - 12-05-02-0051 - bn_iced_Ginger_soda_Doikum.png - - - - ฿25.00 - NN NN
ขิงมะนาวโซดา GINGER LIME \nSODA ขิง มะนาว โซดา Ginger, Lime, Soda & Ice - 12-05-02-0052 - bn_iced_Gingerlime_soda_Doikum.png - - - - ฿30.00 - NN NN
- มินต์มะนาวโซดา MINT LIME SODA น้ำเชื่อมมิ้นท์ มะนาว และโซดา Mint Syrup, Lime, Soda & Ice - 12-05-02-0060 - - - -
- สตรอเบอร์รี่มินต์โซดา STRAWBERRY MINT SODA น้ำเชื่อมมิ้นท์ น้ำเชื่อมสตรอเบอร์รี่ มะนาว และโซดา Mint Syrup, Strawberry Syrup, Lime, Soda & Ice - 12-05-02-0063 - - - -
- ยูซุมินต์โซดา YUZU MINT SODA น้ำเชื่อมมิ้นท์ น้ำเชื่อมยูซุ และโซดา Mint Syrup, Yuzu Syrup Soda & Ice - 12-05-02-0064 - - - -
- บ๊วยมะนาวมินต์โซดา PLUM LIMENADE MINT SODA น้ำเชื่อมมิ้นท์ น้ำเชื่อมบ๊วย มะนาว และโซดา Mint Syrup, Ume Syrup, Lime, Soda & Ice - 12-05-02-0065 - - - -
- มินต์ลิ้นจี่มะนาวโซดา MINT LYCHEE LEMON SODA น้ำเชื่อมมิ้นท์ น้ำเชื่อมลิ้นจี่ มะนาว และโซดา Mint Syrup,Lychee Syrup, Lime, Soda & Ice - 12-05-02-0066 - - - -
- เป๊ปซี่มินต์ PEPSI MINT เป๊ปซี่ น้ำเชื่อมมิ้นท์ และโซดา Pepsi, Mint Syrup& Ice - 12-05-02-0067 - - - -
+ มินต์มะนาวโซดา MINT LIME SODA น้ำเชื่อมมินต์ มะนาว และโซดา Mint Syrup, Lime, Soda & Ice - 12-05-02-0060 - bn_iced_mint_lime_soda.png - - -
+ สตรอเบอร์รี่\nมินต์โซดา STRAWBERRY\nMINT SODA น้ำเชื่อมมินต์ น้ำเชื่อมสตรอเบอร์รี่ มะนาว และโซดา Mint Syrup, Strawberry Syrup, Lime, Soda & Ice - 12-05-02-0063 - bn_Mint_Strawberry_Soda.png - - -
+ ยูซุมินต์โซดา YUZU MINT SODA น้ำเชื่อมมินต์ น้ำเชื่อมยูซุ และโซดา Mint Syrup, Yuzu Syrup Soda & Ice - 12-05-02-0064 - bn_Mint_Yuzu_Soda.png - - -
+ บ๊วยมะนาว\nมินต์โซดา PLUM LIMENADE\nMINT SODA น้ำเชื่อมมินต์ น้ำเชื่อมบ๊วย มะนาว และโซดา Mint Syrup, Ume Syrup, Lime, Soda & Ice - 12-05-02-0065 - bn_Mint_Plum_limenade_Soda.png - - -
+ มินต์ลิ้นจี่\nมะนาวโซดา MINT LYCHEE\nLEMON SODA น้ำเชื่อมมินต์ น้ำเชื่อมลิ้นจี่ มะนาว และโซดา Mint Syrup,Lychee Syrup, Lime, Soda & Ice - 12-05-02-0066 - bn_Mint_Lychee_lime_soda.png - - -
+ เป๊ปซี่มินต์ PEPSI MINT เป๊ปซี่ น้ำเชื่อมมินต์ และโซดา Pepsi, Mint Syrup& Ice - 12-05-02-0067 - bn_Mint_pepsi.png - - -
พีชโซดา PEACH SODA น้ำเชื่อมพีช และโซดา Peach Syrup& Ice - 12-05-02-0069 - - - -
พีชมิ้นท์โซดา PEACH MINT SODA น้ำเชื่อมพีช น้ำเชื่อมมิ้นท์ และโซดา Peach Syrup, Mint Syrup& Ice - - - - - -
พีชมะนาวโซดา PEACH LIME SODA น้ำเชื่อมพีท มะนาว และโซดา Peach Syrup, Lime, Soda & Ice - 12-05-02-0071 - - - -
@@ -289,7 +289,7 @@ Name=Other,file=page_catalog_group_other.skt
โจ๊กผักฮ้องกง HONGKONG CONGEE ข้าว ผัก โปรตีนจากพืช น้ำ Rice, Plant-based protein, Water 12-06-01-0002 - - - - - #N/A - - #N/A NN
น้ำแข็ง ICE น้ำแข็ง Ice - 12-05-02-0017 - bn_iced.png - - - - ฿10.00 - NN NN
น้ำดื่ม DRINKING WATER น้ำ Water - 12-05-02-0016 - bn_water_roomtemp.png - - - - ฿10.00 - NN NN
- น้ำ WATER น้ำ Water 12-05-01-0002 12-05-02-0018 - bn_water_roomtemp.png - - - ฿10.00 ฿10.00 - FALSE NN
+ น้ำ (น้ำร้อน / น้ำเย็น) WATER (HOT WATER / WATER WITH ICED) น้ำ (น้ำร้อน / น้ำ และน้ำแข็ง) Water (HOT WATER / WATER WITH ICED) 12-05-01-0002 12-05-02-0018 - bn_water_roomtemp.png - - - ฿10.00 ฿10.00 - FALSE NN
- - -
- - -
- - -
diff --git a/video/brewing_adv4.mp4 b/video/brewing_adv4.mp4
old mode 100644
new mode 100755
index d6d4f3b6..b1e772b7
Binary files a/video/brewing_adv4.mp4 and b/video/brewing_adv4.mp4 differ
diff --git a/video/brewing_txt_adv4.png b/video/brewing_txt_adv4.png
index 0c2d0708..4dbba152 100644
Binary files a/video/brewing_txt_adv4.png and b/video/brewing_txt_adv4.png differ
diff --git a/video/brewing_txt_adv4_en.png b/video/brewing_txt_adv4_en.png
index 2ab31529..49e6b348 100644
Binary files a/video/brewing_txt_adv4_en.png and b/video/brewing_txt_adv4_en.png differ
diff --git a/video/main_page_event.mp4 b/video/main_page_event.mp4
old mode 100644
new mode 100755
diff --git a/video/script1.ev b/video/script1.ev
index 59827eab..9b154398 100644
--- a/video/script1.ev
+++ b/video/script1.ev
@@ -1,8 +1,10 @@
Var MainfileSize = 0
DEBUGVAR BoxID
Var EventMatch = 0
+Var TeaserBottleEnable = 0
If SystemDateMonthInt = 11 Then
+ Var TeaserBottleEnable = 1
If SystemDateDayInt > 14 Then
If SystemDateDayInt < 28 Then
Var EventMatch = 1
diff --git a/video/script3_brew.ev b/video/script3_brew.ev
index 1652250d..4fd1569c 100644
--- a/video/script3_brew.ev
+++ b/video/script3_brew.ev
@@ -2,12 +2,12 @@
; Need var brew_txt2
-If PepweenEnable = 1 Then
+If TeaserBottleEnable = 1 Then
GetFileSizeK "taobin_project/video/brewing_adv4.mp4" brewing_adv_size
DEBUGVAR brewing_adv_size
- If brewing_adv_size = 17891818 Then
+ If brewing_adv_size = 18433289 Then
Var adver_brewing_play_index = 1
Var adver_brewing_count_down = 16
diff --git a/video/sync_1.file b/video/sync_1.file
index 116c8666..1215cce8 100644
--- a/video/sync_1.file
+++ b/video/sync_1.file
@@ -1,28 +1,29 @@
-total 148588
--rw-rw---- 1 root sdcard_rw 14292128 2022-12-29 13:13 brewing_adv1.mp4
+total 154044
-rw-rw---- 1 root sdcard_rw 9526548 2023-09-18 18:44 brewing_adv3.mp4
--rw-rw---- 1 root sdcard_rw 17891818 2023-10-11 16:30 brewing_adv4.mp4
+-rw-rw---- 1 root sdcard_rw 18433289 2023-10-27 16:00 brewing_adv4.mp4
-rw-rw---- 1 root sdcard_rw 23569 2023-09-18 18:44 brewing_txt_adv1.png
-rw-rw---- 1 root sdcard_rw 28097 2023-09-18 18:44 brewing_txt_adv1_en.png
-rw-rw---- 1 root sdcard_rw 30982 2023-09-18 18:44 brewing_txt_adv3.png
-rw-rw---- 1 root sdcard_rw 35550 2023-09-18 18:44 brewing_txt_adv3_en.png
--rw-rw---- 1 root sdcard_rw 37204 2023-10-14 08:01 brewing_txt_adv4.png
--rw-rw---- 1 root sdcard_rw 28712 2023-10-14 07:59 brewing_txt_adv4_en.png
--rw-rw---- 1 root sdcard_rw 6546655 2023-09-18 18:44 event_1.mp4
+-rw-rw---- 1 root sdcard_rw 35899 2023-11-14 13:51 brewing_txt_adv4.png
+-rw-rw---- 1 root sdcard_rw 34729 2023-11-14 13:51 brewing_txt_adv4_en.png
-rw-rw---- 1 root sdcard_rw 23054056 2023-09-18 18:44 event_2.mp4
--rw-rw---- 1 root sdcard_rw 9268737 2022-09-28 15:26 main_page.mp4
+-rw-rw---- 1 root sdcard_rw 7265712 2021-03-18 15:00 main_page.mp4
-rw-rw---- 1 root sdcard_rw 19087285 2023-09-18 18:44 main_page_en.mp4
-rw-rw---- 1 root sdcard_rw 8679952 2022-09-28 02:41 main_page_event.mp4
--rw-rw---- 1 root sdcard_rw 8679952 2022-09-28 02:41 main_page_event_alter.mp4
--rw-rw---- 1 root sdcard_rw 7185758 2023-05-23 11:02 main_page_event_en.mp4
--rw-rw---- 1 root sdcard_rw 648 2023-11-13 22:54 script1.ev
+-rw-rw---- 1 root sdcard_rw 703 2023-11-14 13:18 script1.ev
-rw-rw---- 1 root sdcard_rw 314 2023-11-09 21:50 script2.ev
--rw-rw---- 1 root sdcard_rw 490 2023-10-14 08:20 script3_brew.ev
--rw-rw---- 1 root sdcard_rw 0 2023-10-17 16:16 sync_1.file
+-rw-rw---- 1 root sdcard_rw 495 2023-11-14 13:18 script3_brew.ev
+-rw-rw---- 1 root sdcard_rw 0 2023-11-18 09:45 sync_1.file
+-rw-rw---- 1 root sdcard_rw 14168973 2021-03-18 15:00 taobin_adv1.mp4
+-rw-rw---- 1 root sdcard_rw 9135672 2021-03-18 15:00 taobin_adv2.mp4
+-rw-rw---- 1 root sdcard_rw 8980019 2021-03-18 15:00 taobin_adv2_1.mp4
+-rw-rw---- 1 root sdcard_rw 13986695 2021-03-18 15:00 taobin_adv3.mp4
+-rw-rw---- 1 root sdcard_rw 557065 2021-03-18 15:00 taobin_brewing.mov
+-rw-rw---- 1 root sdcard_rw 920095 2021-03-18 15:00 taobin_drink_ok.mov
-rw-rw---- 1 root sdcard_rw 4806758 2023-09-18 18:44 taobin_save_world1.mp4
-rw-rw---- 1 root sdcard_rw 6428830 2023-09-18 18:44 taobin_save_world2.mp4
-rw-rw---- 1 root sdcard_rw 4634942 2023-09-18 18:44 taobin_save_world3.mp4
-rw-rw---- 1 root sdcard_rw 2084830 2023-09-18 18:44 taobin_thank1.mp4
-rw-rw---- 1 root sdcard_rw 3999239 2022-09-27 02:04 taobin_thank1_event.mp4
--rw-rw---- 1 root sdcard_rw 3999239 2022-09-27 02:04 taobin_thank1_event_alter.mp4
-rw-rw---- 1 root sdcard_rw 1631940 2023-09-18 18:44 taobin_thank2.mp4
diff --git a/video/taobin_thank1_event.mp4 b/video/taobin_thank1_event.mp4
old mode 100644
new mode 100755
diff --git a/xml/event/promotion_15THB.xml b/xml/event/promotion_15THB.xml
index 168b098f..a6c0fbc5 100644
--- a/xml/event/promotion_15THB.xml
+++ b/xml/event/promotion_15THB.xml
@@ -1834,7 +1834,7 @@
"ROOT/taobin_project/image/page_drink_n//bn_smoothie_oreo.png"
"ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_oreo.png"
"ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_oreo.png"
- xmlpro( 12-03-03-0009, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png")
+ xmlpro( 12-03-03-0009, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi2.png")
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
@@ -1853,7 +1853,7 @@
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = "Disable2"
Var PD_STAGE_3 = $12-03-03-0009.Button
- Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0009, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+ Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0009, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi2.png")
DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
diff --git a/xml/event/promotion_oreo_welcome_drink.xml b/xml/event/promotion_oreo_welcome_drink.xml
index 23b756c9..43ca7760 100644
--- a/xml/event/promotion_oreo_welcome_drink.xml
+++ b/xml/event/promotion_oreo_welcome_drink.xml
@@ -1834,7 +1834,7 @@
"ROOT/taobin_project/image/page_drink_n//bn_smoothie_oreo.png"
"ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_oreo.png"
"ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_oreo.png"
- xmlpro( 12-03-03-0009, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png")
+ xmlpro( 12-03-03-0009, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi2.png")
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
@@ -1853,7 +1853,7 @@
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = "Disable2"
Var PD_STAGE_3 = $12-03-03-0009.Button
- Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0009, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+ Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0009, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi2.png")
DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
diff --git a/xml/event/promotion_pepween.xml b/xml/event/promotion_pepween.xml
index 2b4bfe31..38556ebf 100644
--- a/xml/event/promotion_pepween.xml
+++ b/xml/event/promotion_pepween.xml
@@ -1834,7 +1834,7 @@
"ROOT/taobin_project/image/page_drink_n//bn_smoothie_oreo.png"
"ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_oreo.png"
"ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_oreo.png"
- xmlpro( 12-03-03-0009, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png")
+ xmlpro( 12-03-03-0009, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi2.png")
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
@@ -1853,7 +1853,7 @@
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = "Disable2"
Var PD_STAGE_3 = $12-03-03-0009.Button
- Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0009, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+ Var OverlayMenuFilter !assigned xmlpro( 12-03-03-0009, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi2.png")
DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml
index cc12081f..0b402e53 100644
--- a/xml/page_catalog_group_coffee.xml
+++ b/xml/page_catalog_group_coffee.xml
@@ -19971,18 +19971,18 @@ Sugar, Water"
Flag( 12-01-01-0057.Button,12-01-02-0057.Button,12-01-03-0057.Button,$Sum120101005712010200571201030057)