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

2024-12-03 15:08:26 +07:00 · 2024-12-03 15:08:26 +07:00 · 6ea6c9dc10
commit 6ea6c9dc10
parent 77a21f1e57 09546a6b0c
9221 changed files with 673077 additions and 21007 deletions
--- a/inter/aus/animation01/play_list.tsv
+++ b/inter/aus/animation01/play_list.tsv
@ -966,3 +966,5 @@ ICED COCONUT PEPSI	51-05-02-0091	1	62	14	13	23					24	120	17:00	23
 COCONUT PEPSI FRAPPE	51-05-03-0091	1	23	62	14	41					24	120	17:00	23
 ICED COCONUT LYCHEE SODA	51-05-02-0093	1	62	11	13	23					24	120	17:00	23
 ICED COCONUT PEPSI MAX	51-05-02-0117	1	62	14	13	23					24	120	17:00	23
+HOT JASMINE LIME	51-02-01-0048	1	16	10	12						24	120	17:00	23
+ICED JASMINE LIME	51-02-02-0049	1	16	10	12	23					24	120	17:00	23
--- a/inter/aus/image/page_drink_disable_n2/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Pie.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Pie.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_AMERICANO.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_AMERICANO.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_CHOCOLATE_MILK.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_CHOCOLATE_MILK.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LYCHEE_SODA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_LYCHEE_SODA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MILK.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MILK.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SMOOTHIE.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SMOOTHIE.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SODA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SODA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_MILK_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_MILK_TEA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Caramel_choc_espresso.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Caramel_choc_espresso.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Choc_caramel_crumble.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Choc_caramel_crumble.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Melon_matcha_iced_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Melon_matcha_iced_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Biscoff.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Biscoff.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Biscoff.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Biscoff.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Oreo_smoothie.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Yuzu_matcha_iced_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Yuzu_matcha_iced_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_Bananoffee_milkshake.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_Bananoffee_milkshake.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_JASMINE_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_JASMINE_TEA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_caramel_latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_latte_with_twist.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_latte_with_twist.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Caramel_mocha.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Caramel_mocha.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_matcha_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_matcha_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Melon_jasmine_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Melon_jasmine_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Yuzu_jasmine_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Yuzu_jasmine_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_caramel_Biscoff.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_caramel_Biscoff.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Melon_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Melon_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda-1.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda-1.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Lychee.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Lychee.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_strawberry_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_strawberry_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_jasmine_lime_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_jasmine_lime_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_limeblack_tea_SingPark.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_Vanilla.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_Vanilla.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_espresso_caramel.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_espresso_caramel.png
--- a/inter/aus/image/page_drink_disable_n2/bn_smoothie_oreo.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_smoothie_oreo.png
--- a/inter/aus/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_thai_black_tea_SingPark.png
--- a/inter/aus/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_thai_milk_tea_SingPark.png
--- a/inter/aus/image/page_drink_n/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_n/bn_Banana_Cheesecake_Royale_Banana_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_n/bn_Bananoffee_Latte.png
+++ b/inter/aus/image/page_drink_n/bn_Bananoffee_Latte.png
--- a/inter/aus/image/page_drink_n/bn_Bananoffee_Pie.png
+++ b/inter/aus/image/page_drink_n/bn_Bananoffee_Pie.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_AMERICANO.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_AMERICANO.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_CHOCOLATE_MILK.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_CHOCOLATE_MILK.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_JASMINE_MILK_TEA.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_JASMINE_MILK_TEA.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_LYCHEE_SODA.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_LYCHEE_SODA.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_MILK.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_MILK.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_PEPSI.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_PEPSI.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_SMOOTHIE.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_SMOOTHIE.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_SODA.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_SODA.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_THAI_BLACK_TEA.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_THAI_BLACK_TEA.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_THAI_MILK_TEA.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_THAI_MILK_TEA.png
--- a/inter/aus/image/page_drink_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_n/bn_Caramel_choc_espresso.png
+++ b/inter/aus/image/page_drink_n/bn_Caramel_choc_espresso.png
--- a/inter/aus/image/page_drink_n/bn_Choc_caramel_crumble.png
+++ b/inter/aus/image/page_drink_n/bn_Choc_caramel_crumble.png
--- a/inter/aus/image/page_drink_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_n/bn_Melon_matcha_iced_tea.png
+++ b/inter/aus/image/page_drink_n/bn_Melon_matcha_iced_tea.png
--- a/inter/aus/image/page_drink_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_n/bn_Mint_Milk_Biscoff.png
+++ b/inter/aus/image/page_drink_n/bn_Mint_Milk_Biscoff.png
--- a/inter/aus/image/page_drink_n/bn_Mint_Milk_Straw_Biscoff.png
+++ b/inter/aus/image/page_drink_n/bn_Mint_Milk_Straw_Biscoff.png
--- a/inter/aus/image/page_drink_n/bn_Mint_Oreo_smoothie.png
+++ b/inter/aus/image/page_drink_n/bn_Mint_Oreo_smoothie.png
--- a/inter/aus/image/page_drink_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_n/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png
+++ b/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png
--- a/inter/aus/image/page_drink_n/bn_Yuzu_matcha_iced_tea.png
+++ b/inter/aus/image/page_drink_n/bn_Yuzu_matcha_iced_tea.png
--- a/inter/aus/image/page_drink_n/bn_hot_Bananoffee_milkshake.png
+++ b/inter/aus/image/page_drink_n/bn_hot_Bananoffee_milkshake.png
--- a/inter/aus/image/page_drink_n/bn_hot_COCONUT_JASMINE_TEA.png
+++ b/inter/aus/image/page_drink_n/bn_hot_COCONUT_JASMINE_TEA.png
--- a/inter/aus/image/page_drink_n/bn_hot_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_n/bn_hot_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_n/bn_hot_caramel_latte.png
+++ b/inter/aus/image/page_drink_n/bn_hot_caramel_latte.png
--- a/inter/aus/image/page_drink_n/bn_hot_latte_with_twist.png
+++ b/inter/aus/image/page_drink_n/bn_hot_latte_with_twist.png
--- a/inter/aus/image/page_drink_n/bn_iced_Caramel_mocha.png
+++ b/inter/aus/image/page_drink_n/bn_iced_Caramel_mocha.png
--- a/inter/aus/image/page_drink_n/bn_iced_Lychee.png
+++ b/inter/aus/image/page_drink_n/bn_iced_Lychee.png
--- a/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea.png
+++ b/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea.png
--- a/inter/aus/image/page_drink_n/bn_iced_Lychee_matcha_tea.png
+++ b/inter/aus/image/page_drink_n/bn_iced_Lychee_matcha_tea.png
--- a/inter/aus/image/page_drink_n/bn_iced_Lychee_soda.png
+++ b/inter/aus/image/page_drink_n/bn_iced_Lychee_soda.png
--- a/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png
--- a/inter/aus/image/page_drink_n/bn_iced_Yuzu_jasmine_tea.png
+++ b/inter/aus/image/page_drink_n/bn_iced_Yuzu_jasmine_tea.png
--- a/inter/aus/image/page_drink_n/bn_iced_caramel_Biscoff.png
+++ b/inter/aus/image/page_drink_n/bn_iced_caramel_Biscoff.png
--- a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png
+++ b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png
--- a/Show more
+++ b/Show more