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

animation01/play_list.tsv

@@ -1363,3 +1363,14 @@ Macallan Lumina Mizuwari	11-99-05-0055	1	27	28							24	100	7:40	32
 
 
 ผลไม้ปั่น	12-01-07-0001	1	41	41	41	41	41				24	100	7:40	32
+
+
+โอวัลตินกาแฟ	12-01-03-0092	1	51	17	2	3	4	5	23	41	24	100	7:40	32
+โอวัลตินกาแฟ	12-21-03-0092	1	51	17	2	3	4	5	23	41	24	100	7:40	32
+โอวัลตินชาไทยนม	12-02-03-0105	1	51	17	10	23	41				24	100	7:40	32
+โอวัลตินมัทฉะลาเต้	12-02-03-0106	1	51	17	8	9	23	41			24	100	7:40	32
+โอวัลตินชานม	12-02-03-0107	1	51	17	10	23	41				24	100	7:40	32
+โอวัลตินมะลิ	12-02-03-0108	1	51	17	10	23	41				24	100	7:40	32
+โอวัลตินน้ำแดง	12-03-03-0108	1	51	17	21	23	41				24	100	7:40	32
+โอวัลตินคาราเมล	12-03-03-0109	1	51	17	22	23	41				24	100	7:40	32
+โอวัลตินมะพร้าว	12-03-03-0110	1	51	17	62	23	41				24	100	7:40	32

image/event/image_template4

@@ -1,3 +1,3 @@
-normal_thai=ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png
-press_thai=ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png
-disable_thai=ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png
+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

inter/aus/menu/lang.tsv

@@ -17,6 +17,7 @@ TextID	Note	English	Thai
 000010		Healthier\nChoice	ทางเลือกสุขภาพ\n[\nคุมจำนวน ไขมัน น้ำตาล โซเดียม\nแคลอรี่ต่ำ###Font=KanitRegular,Size=12,Align=Center]
 000011		Kid Menu	เมนูเด็ก
 000012		App Fast	แอพ ฟาสท์
+000025		Dessert	ของหวาน
 
 	Menu 
 		Font=Kanit,Type=Regular,Size=16,Color=0x5A5A5A,Align=center-vertical-horizontal	Font=Kanit,Type=Regular,Size=32,Color=0x5A5A5A,Align=center-vertical-horizontal
@@ -38,6 +39,8 @@ TextID	Note	English	Thai
 000024		Cocktail	ค็อกเทล
 
 
+
+
 	page_toopping_select
 		Font=Kanit,Type=Regular,Size=22,Color=0x513C2F,Align=Center	Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center
 		Font=Kanit,Type=Medium,Size=22,Color=0x513C2F,Align=Center	Font=Kanit,Type=Medium,Size=24,Color=0x513C2F,Align=Center

inter/aus/video/script_video.ev

@@ -2,6 +2,7 @@ Var MainfileSize = 0
 Var EventNewYear = 0
 Var EventAO = 0
 Var StPatrickEvent = 0
+Var HappyEasterEvent = 0
 
 
 

inter/aus/xml/menu_catalog_new.lxml

@@ -121,7 +121,7 @@
    If CountryName = "Australia" Then
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-        Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
+        Var DirImageAlterAus = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
         Var DirImage = "ROOT/taobin_project/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
@@ -266,8 +266,8 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu4Selected </State>
-        <Filename> Var( DirImageAlterMilk + "/bn_cho_ca2.png") </Filename>
-        <FilenamePress> Var( DirImageAlterMilk + "/bp_cho_ca2.png") </FilenamePress>
+        <Filename> Var( DirImageAlterAus + "/bn_cho_ca2.png") </Filename>
+        <FilenamePress> Var( DirImageAlterAus + "/bp_cho_ca2.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>
@@ -364,28 +364,23 @@
         </EventClick>
         </Button>
 
-
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu22Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_health.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_health.png") </FilenamePress>
+        <Filename> Var( DirImageAlterAus + "/bn_dessert.png") </Filename>
+        <FilenamePress> Var( DirImageAlterAus + "/bp_dessert.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>
             Var NextPage = "-"
-            ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml"
+            ;Open "ROOT/taobin_project/xml/page_catalog_group_dessert.lxml"
 
-            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml"
+            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_dessert.lxml"
 
             DEBUGVAR CountryRootPath
             DEBUGVAR OpenFileXML
 
-            If CountryName = "Thailand" Then
-                Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml"
-            Else
-                Open OpenFileXML
-            EndIf
+            Open OpenFileXML
         </EventClick>
         </Button>
 

inter/aus/xml/page_catalog.lxml

@@ -523,22 +523,22 @@
 <X> 564 </X>
 <Y> 1532 </Y>
 <State> "Enable" </State>
-<Filename> Var(DirImage + "/bn_HealthyOption.png") </Filename>
-<FilenamePress> Var(DirImage + "/bp_HealthyOption.png") </FilenamePress>
+<Filename> Var(DirImageAUS + "/bn_dessert.png") </Filename>
+<FilenamePress> Var(DirImageAUS + "/bp_dessert.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 
-	;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml"
+	;Open "ROOT/taobin_project/xml/page_catalog_group_dessert.lxml"
 
 
-	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml"
+	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_dessert.lxml"
 	Open OpenFileXML
 
 </EventClick>
 <Language>
-	<ID> 000010 </ID>
+	<ID> 000025 </ID>
 	<X> 28 </X>
 	<Y> 202 </Y>
 	<Width> 241 </Width>

inter/aus/xml/page_catalog_group_coffee.lxml

@@ -23815,13 +23815,13 @@
 	<State> Flag( 51-21-01-0081.Button,51-21-02-0081.Button,51-21-03-0081.Button,$Sum512101008151210200815121030081) </State> 
 	<Button>
 	<State> $Sum512101008151210200815121030081 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_AMERICANO.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_AMERICANO.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_AMERICANO.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_COCONUT_LATTE.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_COCONUT_LATTE.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_COCONUT_LATTE.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_AMERICANO.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_COCONUT_LATTE.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-21-01-0081.Price
 		Var PriceD2 = $51-21-02-0081.Price