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

2025-06-09 10:00:03 +07:00 · 2025-06-09 10:00:03 +07:00 · fd2225caaf
commit fd2225caaf
parent bc9d9af33f 9f0af7f077
179 changed files with 105204 additions and 26985 deletions
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@ -1415,3 +1415,29 @@ Macallan Lumina Mizuwari	11-99-05-0055	1	27	28							24	100	7:40	32
 แอปเปิ้ลอู่หลงร้อน	12-02-01-0101	1	66	16	10						24	100	7:40	32
 แอปเปิ้ลอู่หลงเย็น	12-02-02-0101	1	66	16	10	23					24	100	7:40	32
 แอปเปิ้ลอู่หลงปั่น	12-02-03-0101	1	66	16	10	23	41				24	100	7:40	32
+
+ชานมไต้หวันยูซุร้อน	12-02-01-0109	1	10	70	53						24	100	7:40	32
+ชานมไต้หวันยูซุเย็น	12-02-02-0109	1	10	70	53	23					24	100	7:40	32
+ชานมไต้หวันยูซุปั่น	12-02-03-0109	1	10	70	53	23	41				24	100	7:40	32
+ชานมไต้หวันสตรอเบอรีร้อน	12-02-01-0110	1	10	70	19						24	100	7:40	32
+ชานมไต้หวันสตรอเบอรีเย็น	12-02-02-0110	1	10	70	19	23					24	100	7:40	32
+ชานมไต้หวันสตรอเบอรีปั่น	12-02-03-0110	1	10	70	19	23	41				24	100	7:40	32
+ชานมไต้หวันลิ้นจี่ร้อน	12-02-01-0111	1	10	70	11						24	100	7:40	32
+ชานมไต้หวันลิ้นจี่เย็น	12-02-02-0111	1	10	70	11	23					24	100	7:40	32
+ชานมไต้หวันลิ้นจี่ปั่น	12-02-03-0111	1	10	70	11	23	41				24	100	7:40	32
+ชานมไต้หวันมะพร้าวร้อน	12-02-01-0112	1	10	70	62						24	100	7:40	32
+ชานมไต้หวันมะพร้าวเย็น	12-02-02-0112	1	10	70	62	23					24	100	7:40	32
+ชานมไต้หวันมะพร้าวปั่น	12-02-03-0112	1	10	70	62	23	41				24	100	7:40	32
+ชานมไต้หวันสละร้อน	12-02-01-0113	1	10	70	21						24	100	7:40	32
+ชานมไต้หวันสละเย็น	12-02-02-0113	1	10	70	21	23					24	100	7:40	32
+ชานมไต้หวันสละปั่น	12-02-03-0113	1	10	70	21	23	41				24	100	7:40	32
+ชาไต้หวันยูซุเย็น	12-02-01-0114	1	10	53	23						24	100	7:40	32
+ชาไต้หวันยูซุปั่น	12-02-02-0114	1	10	53	23	41					24	100	7:40	32
+ชาไต้หวันสตรอเบอรีเย็น	12-02-01-0115	1	10	19	23						24	100	7:40	32
+ชาไต้หวันสตรอเบอรีปั่น	12-02-02-0115	1	10	19	23	41					24	100	7:40	32
+ชาไต้หวันลิ้นจี่เย็น	12-02-01-0116	1	10	11	23						24	100	7:40	32
+ชาไต้หวันลิ้นจี่ปั่น	12-02-02-0116	1	10	11	23	41					24	100	7:40	32
+ชาไต้หวันมะพร้าวเย็น	12-02-01-0117	1	10	62	23						24	100	7:40	32
+ชาไต้หวันมะพร้าวปั่น	12-02-02-0117	1	10	62	23	41					24	100	7:40	32
+ชาไต้หวันสละเย็น	12-02-01-0118	1	10	21	23						24	100	7:40	32
+ชาไต้หวันสละปั่น	12-02-02-0118	1	10	21	23	41					24	100	7:40	32
--- a/image/event/image_template2
+++ b/image/event/image_template2
@ -1,3 +1,3 @@
-normal_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png
-press_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png
-disable_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png
+normal_thai=ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png
+press_thai=ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png
+disable_thai=ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png
--- a/image/event/image_template4
+++ b/image/event/image_template4
@ -1,3 +1,3 @@
-normal_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
-press_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
-disable_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
+normal_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png
+press_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png
+disable_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png
--- a/image/event/school_ovaltine/school_ovaltine2.png
+++ b/image/event/school_ovaltine/school_ovaltine2.png
--- a/image/event/taiwanese_tea/taiwanese_tea_banner.png
+++ b/image/event/taiwanese_tea/taiwanese_tea_banner.png
--- a/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_disable_n2/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_disable_n2/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_disable_n2/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_disable_n2/bn_Taiwanese
+++ b/image/page_drink_disable_n2/bn_Taiwanese
--- a/image/page_drink_disable_n2/bn_Taiwanese
+++ b/image/page_drink_disable_n2/bn_Taiwanese
--- a/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Coconut.png
+++ b/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Coconut.png
--- a/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Lychee.png
+++ b/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Lychee.png
--- a/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Salak.png
+++ b/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Salak.png
--- a/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Yuzu.png
+++ b/image/page_drink_disable_n2/bn_Taiwanese_Milk_Tea_Yuzu.png
--- a/image/page_drink_disable_n2/bn_Taiwanese_Tea_Lychee.png
+++ b/image/page_drink_disable_n2/bn_Taiwanese_Tea_Lychee.png
--- a/image/page_drink_disable_n2/bn_Taiwanese_Tea_Salak.png
+++ b/image/page_drink_disable_n2/bn_Taiwanese_Tea_Salak.png
--- a/image/page_drink_disable_n2/bn_Taiwanese_Tea_Yuzu.png
+++ b/image/page_drink_disable_n2/bn_Taiwanese_Tea_Yuzu.png
--- a/image/page_drink_disable_n2/bn_taiwanese_milk_tea_Strawberry.png
+++ b/image/page_drink_disable_n2/bn_taiwanese_milk_tea_Strawberry.png
--- a/image/page_drink_disable_n2/bn_thai_milk_tea_COCOA.png
+++ b/image/page_drink_disable_n2/bn_thai_milk_tea_COCOA.png
--- a/image/page_drink_disable_n2/bn_thai_milk_tea_SALAK.png
+++ b/image/page_drink_disable_n2/bn_thai_milk_tea_SALAK.png
--- a/image/page_drink_n/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_n/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_n/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_n/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_n/bn_Taiwanese
+++ b/image/page_drink_n/bn_Taiwanese
--- a/image/page_drink_n/bn_Taiwanese
+++ b/image/page_drink_n/bn_Taiwanese
--- a/image/page_drink_n/bn_Taiwanese_Milk_Tea_Coconut.png
+++ b/image/page_drink_n/bn_Taiwanese_Milk_Tea_Coconut.png
--- a/image/page_drink_n/bn_Taiwanese_Milk_Tea_Lychee.png
+++ b/image/page_drink_n/bn_Taiwanese_Milk_Tea_Lychee.png
--- a/image/page_drink_n/bn_Taiwanese_Milk_Tea_Salak.png
+++ b/image/page_drink_n/bn_Taiwanese_Milk_Tea_Salak.png
--- a/image/page_drink_n/bn_Taiwanese_Milk_Tea_Yuzu.png
+++ b/image/page_drink_n/bn_Taiwanese_Milk_Tea_Yuzu.png
--- a/image/page_drink_n/bn_Taiwanese_Tea_Lychee.png
+++ b/image/page_drink_n/bn_Taiwanese_Tea_Lychee.png
--- a/image/page_drink_n/bn_Taiwanese_Tea_Salak.png
+++ b/image/page_drink_n/bn_Taiwanese_Tea_Salak.png
--- a/image/page_drink_n/bn_Taiwanese_Tea_Yuzu.png
+++ b/image/page_drink_n/bn_Taiwanese_Tea_Yuzu.png
--- a/image/page_drink_n/bn_taiwanese_milk_tea_Strawberry.png
+++ b/image/page_drink_n/bn_taiwanese_milk_tea_Strawberry.png
--- a/image/page_drink_n/bn_thai_milk_tea_COCOA.png
+++ b/image/page_drink_n/bn_thai_milk_tea_COCOA.png
--- a/image/page_drink_n/bn_thai_milk_tea_SALAK.png
+++ b/image/page_drink_n/bn_thai_milk_tea_SALAK.png
--- a/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_picture2_n/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_picture2_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_picture2_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_picture2_n/bn_Taiwanese
+++ b/image/page_drink_picture2_n/bn_Taiwanese
--- a/image/page_drink_picture2_n/bn_Taiwanese
+++ b/image/page_drink_picture2_n/bn_Taiwanese
--- a/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Coconut.png
+++ b/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Coconut.png
--- a/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Lychee.png
+++ b/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Lychee.png
--- a/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Salak.png
+++ b/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Salak.png
--- a/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Yuzu.png
+++ b/image/page_drink_picture2_n/bn_Taiwanese_Milk_Tea_Yuzu.png
--- a/image/page_drink_picture2_n/bn_Taiwanese_Tea_Lychee.png
+++ b/image/page_drink_picture2_n/bn_Taiwanese_Tea_Lychee.png
--- a/image/page_drink_picture2_n/bn_Taiwanese_Tea_Salak.png
+++ b/image/page_drink_picture2_n/bn_Taiwanese_Tea_Salak.png
--- a/image/page_drink_picture2_n/bn_Taiwanese_Tea_Yuzu.png
+++ b/image/page_drink_picture2_n/bn_Taiwanese_Tea_Yuzu.png
--- a/image/page_drink_picture2_n/bn_taiwan_milk_tea.png
+++ b/image/page_drink_picture2_n/bn_taiwan_milk_tea.png
--- a/image/page_drink_picture2_n/bn_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_picture2_n/bn_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_picture2_n/bn_taiwanese
+++ b/image/page_drink_picture2_n/bn_taiwanese
--- a/image/page_drink_picture2_n/bn_taiwanese_milk_tea_Strawberry.png
+++ b/image/page_drink_picture2_n/bn_taiwanese_milk_tea_Strawberry.png
--- a/image/page_drink_picture2_n/bn_thai_milk_tea_COCOA.png
+++ b/image/page_drink_picture2_n/bn_thai_milk_tea_COCOA.png
--- a/image/page_drink_picture2_n/bn_thai_milk_tea_SALAK.png
+++ b/image/page_drink_picture2_n/bn_thai_milk_tea_SALAK.png
--- a/image/page_drink_press_n/bn_Iced_taiwan_milk_tea.png
+++ b/image/page_drink_press_n/bn_Iced_taiwan_milk_tea.png
--- a/image/page_drink_press_n/bn_Iced_taiwan_milk_tea_cocoa.png
+++ b/image/page_drink_press_n/bn_Iced_taiwan_milk_tea_cocoa.png
--- a/image/page_drink_press_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
+++ b/image/page_drink_press_n/bn_Iced_taiwanese_Tea_Cafe_Latte.png
--- a/image/page_drink_press_n/bn_Taiwanese
+++ b/image/page_drink_press_n/bn_Taiwanese
--- a/image/page_drink_press_n/bn_Taiwanese
+++ b/image/page_drink_press_n/bn_Taiwanese
--- a/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Coconut.png
+++ b/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Coconut.png
--- a/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Lychee.png
+++ b/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Lychee.png
--- a/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Salak.png
+++ b/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Salak.png
--- a/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Yuzu.png
+++ b/image/page_drink_press_n/bn_Taiwanese_Milk_Tea_Yuzu.png
--- a/image/page_drink_press_n/bn_Taiwanese_Tea_Lychee.png
+++ b/image/page_drink_press_n/bn_Taiwanese_Tea_Lychee.png
--- a/image/page_drink_press_n/bn_Taiwanese_Tea_Salak.png
+++ b/image/page_drink_press_n/bn_Taiwanese_Tea_Salak.png
--- a/image/page_drink_press_n/bn_Taiwanese_Tea_Yuzu.png
+++ b/image/page_drink_press_n/bn_Taiwanese_Tea_Yuzu.png
--- a/image/page_drink_press_n/bn_taiwanese_milk_tea_Strawberry.png
+++ b/image/page_drink_press_n/bn_taiwanese_milk_tea_Strawberry.png
--- a/image/page_drink_press_n/bn_thai_milk_tea_COCOA.png
+++ b/image/page_drink_press_n/bn_thai_milk_tea_COCOA.png
--- a/image/page_drink_press_n/bn_thai_milk_tea_SALAK.png
+++ b/image/page_drink_press_n/bn_thai_milk_tea_SALAK.png
--- a/inter/common/animation01/TaoBin2_draft02_art66.mp4
+++ b/inter/common/animation01/TaoBin2_draft02_art66.mp4
--- a/inter/gbr/animation01/play_list.tsv
+++ b/inter/gbr/animation01/play_list.tsv
@ -211,7 +211,6 @@ HOT LYCHEE TEA	55-02-01-0019	1	11	16							24	100	19:40	32
 HOT GINGER TEA	55-02-01-0020	1	10								24	88	1:28	42
 HOT LIME \nGINGER TEA	55-02-01-0021	1	10	12							24	88	1:28	42
 Hot strawberry tea	55-02-01-0022	1	10	19							24	90	1:30	43
-Hot thai milk tea	55-02-01-0024	1	6	7	10						24	78	1:18	25
 Hot thai milk tea	55-02-01-0024	1	6	70	10						24	78	1:18	25
 Hot Taiwanese Tea	55-02-01-0025	1	6	7	10						24	90	1:30	29
 Hot matcha latte	55-02-01-0026	1	6	9	7	8					24	149	2:29	36
@ -856,3 +855,10 @@ ICED Pepsi Lime	55-05-02-0149	1	14	13	12	23					24	100	7:40	32
 Pepsi Lime FRAPPE	55-05-03-0149	1	14	13	12	23	41				24	100	7:40	32
 Pepsi Caramel	55-05-02-0150	1	14	13	22	23					24	100	7:40	32
 Pepsi Caramel FRAPPE	55-05-03-0150	1	14	13	22	23	41				24	100	7:40	32
+
+Iced Apple Americano	55-21-02-0088	1	66	2	3	4	5	23			24	100	7:40	32
+Iced Apple Pure Matcha	55-02-02-0088	1	66	8	9	23					24	100	7:40	32
+Iced Apple Frop Longback	55-21-02-0091	1	66	2	3	4	5	23			24	100	7:40	32
+Iced Apple Oolong Tea	55-02-02-0101	1	66	16	10	23					24	100	7:40	32
+Iced Apple Juice	55-05-02-0134	1	66	16	23						24	100	7:40	32
+Iced Apple Soda	55-05-02-0135	1	66	13	23						24	100	7:40	32
--- a/inter/gbr/image/page_disable_n2/bn_Apple_Americano.png
+++ b/inter/gbr/image/page_disable_n2/bn_Apple_Americano.png
--- a/inter/gbr/image/page_disable_n2/bn_Apple_Frop_Longback.png
+++ b/inter/gbr/image/page_disable_n2/bn_Apple_Frop_Longback.png
--- a/inter/gbr/image/page_disable_n2/bn_Apple_Juice.png
+++ b/inter/gbr/image/page_disable_n2/bn_Apple_Juice.png
--- a/inter/gbr/image/page_disable_n2/bn_Apple_Oolong.png
+++ b/inter/gbr/image/page_disable_n2/bn_Apple_Oolong.png
--- a/inter/gbr/image/page_disable_n2/bn_Apple_Pure_matcha.png
+++ b/inter/gbr/image/page_disable_n2/bn_Apple_Pure_matcha.png
--- a/inter/gbr/image/page_disable_n2/bn_Apple_Soda.png
+++ b/inter/gbr/image/page_disable_n2/bn_Apple_Soda.png
--- a/inter/gbr/image/page_doing/txt_66_en.png
+++ b/inter/gbr/image/page_doing/txt_66_en.png
--- a/inter/gbr/image/page_drink_n/bn_Apple_Americano.png
+++ b/inter/gbr/image/page_drink_n/bn_Apple_Americano.png
--- a/inter/gbr/image/page_drink_n/bn_Apple_Frop_Longback.png
+++ b/inter/gbr/image/page_drink_n/bn_Apple_Frop_Longback.png
--- a/inter/gbr/image/page_drink_n/bn_Apple_Juice.png
+++ b/inter/gbr/image/page_drink_n/bn_Apple_Juice.png
--- a/inter/gbr/image/page_drink_n/bn_Apple_Oolong.png
+++ b/inter/gbr/image/page_drink_n/bn_Apple_Oolong.png
--- a/inter/gbr/image/page_drink_n/bn_Apple_Pure_matcha.png
+++ b/inter/gbr/image/page_drink_n/bn_Apple_Pure_matcha.png
--- a/inter/gbr/image/page_drink_n/bn_Apple_Soda.png
+++ b/inter/gbr/image/page_drink_n/bn_Apple_Soda.png
--- a/inter/gbr/image/page_drink_picture2_n/bn_Apple_Americano.png
+++ b/inter/gbr/image/page_drink_picture2_n/bn_Apple_Americano.png
--- a/inter/gbr/image/page_drink_picture2_n/bn_Apple_Frop_Longback.png
+++ b/inter/gbr/image/page_drink_picture2_n/bn_Apple_Frop_Longback.png
--- a/inter/gbr/image/page_drink_picture2_n/bn_Apple_Juice.png
+++ b/inter/gbr/image/page_drink_picture2_n/bn_Apple_Juice.png
--- a/inter/gbr/image/page_drink_picture2_n/bn_Apple_Oolong.png
+++ b/inter/gbr/image/page_drink_picture2_n/bn_Apple_Oolong.png
--- a/inter/gbr/image/page_drink_picture2_n/bn_Apple_Pure_matcha.png
+++ b/inter/gbr/image/page_drink_picture2_n/bn_Apple_Pure_matcha.png
--- a/inter/gbr/image/page_drink_picture2_n/bn_Apple_Soda.png
+++ b/inter/gbr/image/page_drink_picture2_n/bn_Apple_Soda.png
--- a/inter/gbr/image/page_drink_press_n/bn_Apple_Americano.png
+++ b/inter/gbr/image/page_drink_press_n/bn_Apple_Americano.png
--- a/inter/gbr/image/page_drink_press_n/bn_Apple_Frop_Longback.png
+++ b/inter/gbr/image/page_drink_press_n/bn_Apple_Frop_Longback.png
--- a/inter/gbr/image/page_drink_press_n/bn_Apple_Juice.png
+++ b/inter/gbr/image/page_drink_press_n/bn_Apple_Juice.png
--- a/inter/gbr/image/page_drink_press_n/bn_Apple_Oolong.png
+++ b/inter/gbr/image/page_drink_press_n/bn_Apple_Oolong.png
--- a/inter/gbr/image/page_drink_press_n/bn_Apple_Pure_matcha.png
+++ b/inter/gbr/image/page_drink_press_n/bn_Apple_Pure_matcha.png
--- a/inter/gbr/image/page_drink_press_n/bn_Apple_Soda.png
+++ b/inter/gbr/image/page_drink_press_n/bn_Apple_Soda.png
--- a/inter/gbr/image/payment_cash/bd_pay_with_Staff_Pass.png
+++ b/inter/gbr/image/payment_cash/bd_pay_with_Staff_Pass.png
--- a/inter/gbr/image/payment_cash/bd_staff_pass_number.png
+++ b/inter/gbr/image/payment_cash/bd_staff_pass_number.png
--- a/inter/gbr/image/payment_cash/bn_pay_with_Staff_Pass.png
+++ b/inter/gbr/image/payment_cash/bn_pay_with_Staff_Pass.png
--- a/inter/gbr/image/payment_cash/bn_staff_pass_number.png
+++ b/inter/gbr/image/payment_cash/bn_staff_pass_number.png
--- a/inter/gbr/image/payment_cash/bp_pay_with_Staff_Pass.png
+++ b/inter/gbr/image/payment_cash/bp_pay_with_Staff_Pass.png
--- a/Show more
+++ b/Show more