taiwan

2025-06-11 17:56:01 +07:00 · 2025-06-11 17:56:01 +07:00 · 73044b0ea3
commit 73044b0ea3
parent ff46a370d7
82 changed files with 19935 additions and 18029 deletions
--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@ -166,7 +166,7 @@ If SystemDateMonthInt = 6 Then
        Var SchoolOvaltinePro = 1
    EndIf

-    If SystemDateDayInt <= 15 Then
+    If SystemDateDayInt <= 14 Then
        Var AppleFarmFestivalPro = 1
    Else
        Var TaiwaneseTeaPro = 1
@ -214,7 +214,6 @@ If BoxID = 201729 Then
 EndIf

 If BoxID = 123456 Then
-	Var AppleFarmFestivalPro = 1
 EndIf

 DEBUGVAR ConfigNumer
@ -319,6 +318,7 @@ Else
    Var AppleFarmFestivalPro = 0
 EndIf

+
 If TaiwanesePowderEnable = "true" Then

 Else
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -179,6 +179,7 @@
 	EndIf


+	STRCONTAIN "1060" MaterialAvailable TaiwanesePowderEnable



--- a/xml/page_catalog_beer_trap.xml
+++ b/xml/page_catalog_beer_trap.xml
@ -208,7 +208,6 @@
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
 		Open "ROOT/taobin_project/xml/page_topping_select7.xml"
 </EventClick>
 </Button>
--- a/xml/page_catalog_group_pro_taiwanese_tea.xml
+++ b/xml/page_catalog_group_pro_taiwanese_tea.xml
@ -912,7 +912,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Cocoa Milk Tea" </Value>
+	<Value> "Taiwanese Cocoa
+Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1167,7 +1168,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Yuzu Milk Tea" </Value>
+	<Value> "Taiwanese Yuzu
+Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1328,7 +1330,7 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "Taiwanese Strawberry Milk Tea"
-		Var NameDrinkTH = "ชานมไต้หวันสตรอเบอรี"
+		Var NameDrinkTH = "ชานมไต้หวัน สตรอเบอรี"
 		Var DrinkDescriptionTH = "ชาไต้หวัน สตรอเบอรี นม น้ำตาล"
 		Var DrinkDescription = "Taiwanese Tea Strawberry Milk Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Taiwanese_Milk_Tea_Strawberry.png"
@ -1401,7 +1403,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชานมไต้หวันสตรอเบอรี" </Value>
+	<Value> "ชานมไต้หวัน
+สตรอเบอรี" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1422,7 +1425,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Strawberry Milk Tea" </Value>
+	<Value> "Taiwanese
+Strawberry Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1677,7 +1681,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Lychee Milk Tea" </Value>
+	<Value> "Taiwanese Lychee
+Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1932,7 +1937,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Coconut Milk Tea" </Value>
+	<Value> "Taiwanese Coconut
+Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2187,7 +2193,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Salak Milk Tea" </Value>
+	<Value> "Taiwanese Salak
+Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2347,7 +2354,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Taiwanese Yuzu  Tea"
+		Var NameDrink = "Taiwanese Yuzu Tea"
 		Var NameDrinkTH = "ชาไต้หวันยูซุ"
 		Var DrinkDescriptionTH = "ชาไต้หวัน ยูซุ น้ำตาล"
 		Var DrinkDescription = "Taiwanese Tea Yuzu Sugar"
@ -2442,7 +2449,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Yuzu  Tea" </Value>
+	<Value> "Taiwanese Yuzu Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2697,7 +2704,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Strawberry Tea" </Value>
+	<Value> "Taiwanese
+Strawberry Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2952,7 +2960,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Lychee Tea" </Value>
+	<Value> "Taiwanese
+Lychee Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3207,7 +3216,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Coconut Tea" </Value>
+	<Value> "Taiwanese
+Coconut Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3462,7 +3472,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Salak Tea" </Value>
+	<Value> "Taiwanese
+Salak Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
@ -1940,7 +1940,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Cocoa Milk Tea" </Value>
+	<Value> "Taiwanese Cocoa
+Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2195,7 +2196,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Yuzu Milk Tea" </Value>
+	<Value> "Taiwanese Yuzu
+Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2356,7 +2358,7 @@
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "Taiwanese Strawberry Milk Tea"
-		Var NameDrinkTH = "ชานมไต้หวันสตรอเบอรี"
+		Var NameDrinkTH = "ชานมไต้หวัน สตรอเบอรี"
 		Var DrinkDescriptionTH = "ชาไต้หวัน สตรอเบอรี นม น้ำตาล"
 		Var DrinkDescription = "Taiwanese Tea Strawberry Milk Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Taiwanese_Milk_Tea_Strawberry.png"
@ -2429,7 +2431,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชานมไต้หวันสตรอเบอรี" </Value>
+	<Value> "ชานมไต้หวัน
+สตรอเบอรี" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2450,7 +2453,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Strawberry Milk Tea" </Value>
+	<Value> "Taiwanese
+Strawberry Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2705,7 +2709,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Lychee Milk Tea" </Value>
+	<Value> "Taiwanese Lychee
+Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2960,7 +2965,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Coconut Milk Tea" </Value>
+	<Value> "Taiwanese
+Coconut Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3215,7 +3221,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Salak Milk Tea" </Value>
+	<Value> "Taiwanese Salak
+Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3375,7 +3382,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Taiwanese Yuzu  Tea"
+		Var NameDrink = "Taiwanese Yuzu Tea"
 		Var NameDrinkTH = "ชาไต้หวันยูซุ"
 		Var DrinkDescriptionTH = "ชาไต้หวัน ยูซุ น้ำตาล"
 		Var DrinkDescription = "Taiwanese Tea Yuzu Sugar"
@ -3470,7 +3477,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Yuzu  Tea" </Value>
+	<Value> "Taiwanese Yuzu Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3980,7 +3987,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Lychee Tea" </Value>
+	<Value> "Taiwanese
+Lychee Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -4235,7 +4243,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Coconut Tea" </Value>
+	<Value> "Taiwanese
+Coconut Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -4490,7 +4499,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Taiwanese Salak Tea" </Value>
+	<Value> "Taiwanese
+Salak Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5255,7 +5265,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Matcha Latte Premium" </Value>
+	<Value> "Matcha Latte
+Premium" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>