Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

inter/aus/animation01/play_list.tsv

@@ -289,7 +289,6 @@ ICED THAI TEA	51-02-02-0029	1	16	10	23						24	100	15:40	32
 ICED THAI TEA LIMENADE	51-02-02-0030	1	10	12	23						24	1	1	32
 ชาอู่หลงเย็น	51-02-02-0031	1	10	16	23						24	104	1:44	25
 ชาอู่หลงมะนาว เย็น	51-02-02-0032	1	10	12	16	23					24	104	1:44	25
-nUll	51-02-02-0036										24	1	1	32
 โฮจิฉะลาเต้เย็น	51-02-02-0037	1	6	55	16	23					24	1	1	32
 ชายูซุเย็น	51-02-02-0038	1	10	16	53	23					24	49	2:49	23
 ชาดำปาโป่ง	51-02-02-0043	1	10	12	23	13					24	49	1	23
@@ -327,10 +326,7 @@ Iced matcha latte	51-02-03-0026	1	6	7	9	8	23	41			24	175	2:55	34
 ICED MATCHA	51-02-03-0027	1	9	16	8	23	41				24	100	15:40	32
 ICED MATCHA LIMENADE	51-02-03-0028	1	9	16	8	12	23	41			24	1	1	32
 -	51-02-03-0031	1	10	16							24	90	1:30	29
-	51-02-03-0032
 -	51-02-03-0032	1	10	16							24	104	1:44	25
-nUll	51-02-03-0036										24	1	1	32
-nUll	51-02-03-0037										24	1	1	32
 โฮจิฉะโอริโอ้ภูเขาไฟ	51-02-03-0043	1	17	23	55	40	41				24	120	13:00	23
 ชานมไทยโอริโอ้ภูเขาไฟ	51-02-03-0044	1	17	23	55	40	41				24	120	14:00	23
 ชามะลิลาเต้ปั่น	51-02-03-0046	1	16	7	10	23	41				24	49	1	23
@@ -367,7 +363,6 @@ Iced Kokuto Tea	51-02-83-0006	1	188	187	10	27	23	41			24	131	2:11	25
 Iced Thai milk Tea	51-02-83-0024	1	188	187	10	23	41				24	165	2:45	40
 Iced Taiwanese Tea	51-02-83-0025	1	188	187	10	23	41				24	104	1:44	25
 Iced matcha latte	51-02-83-0026	1	188	187	8	9	23	41			24	175	2:55	34
-nUll	51-02-83-0037										24	1	1	32
 โฮจิฉะโอริโอ้ภูเขาไฟ	51-02-83-0043	1	17	23	55	40	41				24	120	13:00	23
 ชานมไทยโอริโอ้ภูเขาไฟ	51-02-83-0044	1	17	23	55	40	41				24	120	14:00	23
 Hot Caramel milk	51-03-01-0001	1	6	7	22						24	84	1:24	27
@@ -709,21 +704,13 @@ Mysterious\nmusic box	51-99-05-0055	1
 Mysterious\nmusic box	51-99-05-0055	1	14	55	12	23	13				24	120	21:00	23
 Haunted Haze	51-99-05-0056	1
 Haunted Haze	51-99-05-0056	1	14	11	33	12	23	13			24	120	22:00	23
-The Haunting of\nthe Past	51-99-05-0057	1
 The Haunting of\nthe Past	51-99-05-0057	1	14	34	23	13					24	120	23:00	23
-The dark lord	51-99-05-0058	1
 The dark lord	51-99-05-0058	1	14	12	21	23	13				24	120	0:00	23
-Room no.13	51-99-05-0059	1
 Room no.13	51-99-05-0059	1	14	11	12	23	13				24	120	1:00	23
-Haunted Harvest	51-99-05-0060	1
 Haunted Harvest	51-99-05-0060	1	14	8	9	23	13				24	120	2:00	23
-Cursed Coffee	51-99-05-0061	1
 Cursed Coffee	51-99-05-0061	1	14	53	4	5	23	13			24	120	3:00	23
-The Haunting\nHag of village	51-99-05-0062	1
 The Haunting\nHag of village	51-99-05-0062	1	14	10	33	23	13				24	120	4:00	23
-Midnight's Enigma	51-99-05-0064	1
 Midnight's Enigma	51-99-05-0064	1	14	33	12	23	13				24	120	5:00	23
-Unbelievers' Demise	51-99-05-0065	1
 Unbelievers' Demise	51-99-05-0065	1	14	52	55	23	13				24	120	6:00	23
 Hot VANILLA MILK	51-03-01-0039	1	63	6	7						24	120	11:00	23
 Hot VANILLA CARAMEL MILK	51-03-01-0040	1	63	22	6	7					24	120	12:00	23

inter/aus/image/event/image_template1

@@ -1,3 +1,3 @@
-normal_eng=ROOT/taobin_project/inter/aus/image/event/valentine_banner.png
-disable_eng=ROOT/taobin_project/inter/aus/image/event/valentine_banner.png
-press_eng=ROOT/taobin_project/inter/aus/image/event/valentine_banner.png
+normal_eng=ROOT/taobin_project/inter/aus/image/event/autumn_breeze.png
+disable_eng=ROOT/taobin_project/inter/aus/image/event/autumn_breeze.png
+press_eng=ROOT/taobin_project/inter/aus/image/event/autumn_breeze.png