before merge

This commit is contained in:
wanlop run 2023-12-07 15:19:34 +07:00
parent b2e0285e18
commit 1dd9a25371
7 changed files with 361 additions and 124 deletions

View file

@ -558,8 +558,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim Original"
Var NameDrinkTH = "เต่าติมออริจินอล"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม "
Var DrinkDescription = "Icecream, milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Original.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -638,7 +638,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม " </Value>
</Text>
<Text>
<X> 16 </X>
@ -659,7 +659,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk" </Value>
</Text>
<Image>
<X> 16 </X>
@ -806,8 +806,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim OREO"
Var NameDrinkTH = "เต่าติมโอริโอ้"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และโอริโอ้"
Var DrinkDescription = "Icecream, milk, Oreo"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Oreo.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -886,7 +886,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และโอริโอ้" </Value>
</Text>
<Text>
<X> 16 </X>
@ -907,7 +907,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Oreo" </Value>
</Text>
<Image>
<X> 16 </X>
@ -1054,8 +1054,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim Biscoff"
Var NameDrinkTH = "เต่าติมบิสคอฟ"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และบิสคอฟ"
Var DrinkDescription = "Icecream, milk, Biscoff"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Biskit.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -1134,7 +1134,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และบิสคอฟ" </Value>
</Text>
<Text>
<X> 16 </X>
@ -1155,7 +1155,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Biscoff" </Value>
</Text>
<Image>
<X> 16 </X>
@ -1302,8 +1302,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim Strawberry"
Var NameDrinkTH = "เต่าติมสตอเบอร์รี่"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และสตรอว์เบอร์รี่"
Var DrinkDescription = "Icecream, milk, Strawberry"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_strawberry.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -1382,7 +1382,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และสตรอว์เบอร์รี่" </Value>
</Text>
<Text>
<X> 16 </X>
@ -1403,7 +1403,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Strawberry" </Value>
</Text>
<Image>
<X> 16 </X>
@ -1550,8 +1550,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim Cocoa"
Var NameDrinkTH = "เต่าติมโกโก้"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และโกโก้"
Var DrinkDescription = "Icecream, milk, Cocoa"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Original-1.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -1630,7 +1630,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และโกโก้" </Value>
</Text>
<Text>
<X> 16 </X>
@ -1651,7 +1651,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Cocoa" </Value>
</Text>
<Image>
<X> 16 </X>
@ -1798,8 +1798,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim Matcha"
Var NameDrinkTH = "เต่าติมชาเขียว"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และชาเขียว"
Var DrinkDescription = "Icecream, milk, Matcha"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Matcha.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -1878,7 +1878,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และชาเขียว" </Value>
</Text>
<Text>
<X> 16 </X>
@ -1899,7 +1899,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Matcha" </Value>
</Text>
<Image>
<X> 16 </X>
@ -2046,8 +2046,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim Melon"
Var NameDrinkTH = "เต่าติมเมล่อน"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และน้ำเชื่อมเมล่อน"
Var DrinkDescription = "Icecream, milk, Melon"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Melon.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -2126,7 +2126,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และน้ำเชื่อมเมล่อน" </Value>
</Text>
<Text>
<X> 16 </X>
@ -2147,7 +2147,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Melon" </Value>
</Text>
<Image>
<X> 16 </X>
@ -2294,8 +2294,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim Caramel"
Var NameDrinkTH = "เต่าติมคาราเมล"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และน้ำเชื่อมคาราเมล"
Var DrinkDescription = "Icecream, milk, Caramel"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Caramel.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -2374,7 +2374,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และน้ำเชื่อมคาราเมล" </Value>
</Text>
<Text>
<X> 16 </X>
@ -2395,7 +2395,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Caramel" </Value>
</Text>
<Image>
<X> 16 </X>
@ -2542,8 +2542,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim Yuzu"
Var NameDrinkTH = "เต่าติมยูซุ"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และน้ำเชื่อมยูซุ"
Var DrinkDescription = "Icecream, milk, Yuzu"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Orange.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -2622,7 +2622,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และน้ำเชื่อมยูซุ" </Value>
</Text>
<Text>
<X> 16 </X>
@ -2643,7 +2643,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Yuzu" </Value>
</Text>
<Image>
<X> 16 </X>
@ -2790,8 +2790,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim Mint"
Var NameDrinkTH = "เต่าติมมินต์"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และน้ำเชื่อมมินต์"
Var DrinkDescription = "Icecream, milk, Mint"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Mint.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -2870,7 +2870,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และน้ำเชื่อมมินต์" </Value>
</Text>
<Text>
<X> 16 </X>
@ -2891,7 +2891,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Mint" </Value>
</Text>
<Image>
<X> 16 </X>
@ -3038,8 +3038,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim Peach"
Var NameDrinkTH = "เต่าติมพีช"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และน้ำเชื่อมพีช"
Var DrinkDescription = "Icecream, milk, Peach"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Peach.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -3118,7 +3118,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และน้ำเชื่อมพีช" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3139,7 +3139,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Peach" </Value>
</Text>
<Image>
<X> 16 </X>
@ -3286,8 +3286,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim Espresso"
Var NameDrinkTH = "เต่าติมเอสเพรสโซ่"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และกาแฟ"
Var DrinkDescription = "Icecream, milk, Espresso"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Coffee.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -3366,7 +3366,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และกาแฟ" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3387,7 +3387,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Espresso" </Value>
</Text>
<Image>
<X> 16 </X>
@ -3534,8 +3534,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim Thai Tea"
Var NameDrinkTH = "เต่าติมชาไทย"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และชาไทย"
Var DrinkDescription = "Icecream, milk, Thai Tea"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Thai_Tea.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -3614,7 +3614,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และชาไทย" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3635,7 +3635,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Thai Tea" </Value>
</Text>
<Image>
<X> 16 </X>
@ -3782,8 +3782,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim Lime"
Var NameDrinkTH = "เต่าติมมะนาว"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และมะนาว"
Var DrinkDescription = "Icecream, milk, Lime"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Lime.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -3862,7 +3862,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และมะนาว" </Value>
</Text>
<Text>
<X> 16 </X>
@ -3883,7 +3883,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Lime" </Value>
</Text>
<Image>
<X> 16 </X>
@ -4030,8 +4030,8 @@
<EventOnClick>
Var NameDrink = "Tao Tim Lynchee"
Var NameDrinkTH = "เต่าติมลิ้นจี่"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และน้ำเชื่อมลิ้นจี่"
Var DrinkDescription = "Icecream, milk, Lynchee"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Lychee.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -4110,7 +4110,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และน้ำเชื่อมลิ้นจี่" </Value>
</Text>
<Text>
<X> 16 </X>
@ -4131,7 +4131,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Lynchee" </Value>
</Text>
<Image>
<X> 16 </X>
@ -4276,10 +4276,10 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var NameDrink = "Tao Tim Tokyo Banana"
Var NameDrinkTH = "เต่าติมโตเกียวบานาน่า"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var NameDrink = "Tao Tim Tokyo Banana"
Var NameDrinkTH = "เต่าติมโตเกียว บานาน่า"
Var DrinkDescriptionTH = "ไอศกรีมนม และน้ำเชื่อมโตเกียว บานาน่า"
Var DrinkDescription = "Icecream, milk, Tokyo Banana"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Banana.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -4348,7 +4348,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "เต่าติมโตเกียวบานาน่า" </Value>
<Value> "เต่าติมโตเกียว
บานาน่า" </Value>
</Text>
<Text>
<X> 16 </X>
@ -4358,7 +4359,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และน้ำเชื่อมโตเกียว บานาน่า" </Value>
</Text>
<Text>
<X> 16 </X>
@ -4369,7 +4370,8 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Tao Tim Tokyo Banana" </Value>
<Value> "Tao Tim Tokyo
Banana" </Value>
</Text>
<Text>
<X> 16 </X>
@ -4379,7 +4381,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Tokyo Banana" </Value>
</Text>
<Image>
<X> 16 </X>
@ -4526,8 +4528,8 @@
<EventOnClick>
Var NameDrink = "Tao Time Jasmin Tea"
Var NameDrinkTH = "เต่าติมชามะลิ"
Var DrinkDescriptionTH = ""
Var DrinkDescription = ""
Var DrinkDescriptionTH = "ไอศกรีมนม และชามะลิ"
Var DrinkDescription = "Icecream, milk, Jasmine"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_TAOTIM_Jasmine.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
@ -4606,7 +4608,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "" </Value>
<Value> "ไอศกรีมนม และชามะลิ" </Value>
</Text>
<Text>
<X> 16 </X>
@ -4627,7 +4629,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "" </Value>
<Value> "Icecream, milk, Jasmine" </Value>
</Text>
<Image>
<X> 16 </X>