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

inter/aus/xml/page_member_topup.lxml

@@ -508,10 +508,10 @@
 </Button>
 
 <QRCode>
-<X> 445 </X>
-<Y> 958 </Y>
-<Width> 200 </Width>
-<Height> 200 </Height>
+<X> 415 </X>
+<Y> 975 </Y>
+<Width> 250 </Width>
+<Height> 250 </Height>
 <State> QRCODEImageState </State>
 <Service> testservice </Service>
 </QRCode>

inter/hkg/animation01/play_list.tsv

@@ -885,24 +885,24 @@ PEPSI Max BANANA	54-05-02-0077
 PEPSI Max YUZU	54-05-02-0076
 PEPSI MINT	54-05-02-0068
 
-7UP SODA	12-05-02-0095	1	23	18							24	49	0:49	23
-7UP ENERGY PLUM LIME SODA	12-05-02-0096	1	18	12	33	23	13				24	120	19:00	23
-7UP PLUM LIME SODA	12-05-02-0097	1	18	33	23	13					24	120	20:00	23
-7UP PLUM LIME COFFEE	12-01-02-0069	1	18	12	2	3	5	23			24	120	21:00	23
-7UP PLUM SALAK LIME COFFEE	12-01-02-0070	1	18	12	21	2	3	5	23		24	120	22:00	23
-7UP PLUM LIME COFFEE	12-21-02-0069	1	18	12	2	3	5	23			24	120	23:00	23
-7UP PLUM SALAK LIME COFFEE	12-21-02-0070	1	18	12	21	2	3	5	23		24	120	0:00	23
-7UP SALAK LIME PLUM  SODA	12-05-02-0100	1	18	21	33	12	23	13			24	120	1:00	23
-7UP PLUM STRAW LIME SODA	12-05-02-0101	1	18	19	12	23	13				24	120	2:00	23
-7UP YUZU LIME	12-05-02-0102	1	18	53	12	23					24	120	3:00	23
-7UP COCONUT	12-05-02-0103	1	62	18	23						24	120	4:00	23
-7UP LYCHEE LIME	12-05-02-0115	1	11	18	12	23					24	120	5:00	23
-7UP MINT LIME	12-05-02-0116	1	59	18	23						24	120	6:00	23
+7UP SODA	54-05-02-0095	1	23	18							24	49	0:49	23
+7UP ENERGY PLUM LIME SODA	54-05-02-0096	1	18	12	33	23	13				24	120	19:00	23
+7UP PLUM LIME SODA	54-05-02-0097	1	18	33	23	13					24	120	20:00	23
+7UP PLUM LIME COFFEE	54-01-02-0069	1	18	12	2	3	5	23			24	120	21:00	23
+7UP PLUM SALAK LIME COFFEE	54-01-02-0070	1	18	12	21	2	3	5	23		24	120	22:00	23
+7UP PLUM LIME COFFEE	54-21-02-0069	1	18	12	2	3	5	23			24	120	23:00	23
+7UP PLUM SALAK LIME COFFEE	54-21-02-0070	1	18	12	21	2	3	5	23		24	120	0:00	23
+7UP SALAK LIME PLUM  SODA	54-05-02-0100	1	18	21	33	12	23	13			24	120	1:00	23
+7UP PLUM STRAW LIME SODA	54-05-02-0101	1	18	19	12	23	13				24	120	2:00	23
+7UP YUZU LIME	54-05-02-0102	1	18	53	12	23					24	120	3:00	23
+7UP COCONUT	54-05-02-0103	1	62	18	23						24	120	4:00	23
+7UP LYCHEE LIME	54-05-02-0115	1	11	18	12	23					24	120	5:00	23
+7UP MINT LIME	54-05-02-0116	1	59	18	23						24	120	6:00	23
 
-7UP MINT SODA	12-05-02-0121	1	18	59	23	13					24	120	2:00	23
-7UP BANANA	12-05-02-0118	1	18	56	23	13					24	120	2:00	23
-7UP MELON	12-05-02-0119	1	18	52	23	13					24	120	2:00	23
-7UP PEACH	12-05-02-0120	1	18	60	23	12					24	120	2:00	23
+7UP MINT SODA	54-05-02-0121	1	18	59	23	13					24	120	2:00	23
+7UP BANANA	54-05-02-0118	1	18	56	23	13					24	120	2:00	23
+7UP MELON	54-05-02-0119	1	18	52	23	13					24	120	2:00	23
+7UP PEACH	54-05-02-0120	1	18	60	23	12					24	120	2:00	23
 
 HOT GINGER MILK TEA	54-02-01-0053	1	6	70	10						24	120	2:00	23
 HOT GINGER YUZU TEA	54-02-01-0054	1	53								24	120	2:00	23
@@ -910,3 +910,14 @@ HOT GINGER STRAWBERRY 7UP	54-02-01-0079	1	19	18							24	120	2:00	23
 HOT GINGER MILK TEA OREO SMOOTHIE	54-02-03-0056	1	6	70	10						24	120	2:00	23
 ICED SANTA GINGER	54-03-02-0081	1	6	70	22	10					24	120	2:00	23
 HOT GINGER CAFE LATTE	54-21-01-0061	1	2	3	4	5	6	70			24	120	2:00	23
+Pepsi	54-05-02-0094	1	23	14							24	120	2:00	23
+Pepsi	54-05-03-0094	1	23	14	41						24	120	2:00	23
+ICED PEPSI PLUM	54-05-02-0104	1	14	33	23	13					24	120	2:00	23
+PEPSI PLUM SMOOTHIE	54-05-03-0104	1	14	33	23	41	13				24	120	2:00	23
+ICED PEPSI MELON	54-05-02-0105	1	14	52	23	13					24	120	2:00	23
+PEPSI MELON SMOOTHIE	54-05-03-0105	1	14	52	23	41	13				24	120	2:00	23
+PEPSI YUZU	54-05-02-0106	1	14	53	23	13					24	120	2:00	23
+PEPSI BANANA	54-05-02-0107	1	14	56	23	13					24	120	2:00	23
+PEPSI PEACH	54-05-02-0109	1	14	60	12	23					24	120	2:00	23
+ICED COCONUT PEPSI	54-05-02-0114	1	23	62	14						24	120	2:00	23
+COCONUT PEPSI SMOOTHIE	54-05-03-0114	1	23	62	14	41					24	120	2:00	23