diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv
index ce96f9b8..04d8d4cd 100644
--- a/menu/new-layout.tsv
+++ b/menu/new-layout.tsv
@@ -1,4 +1,4 @@
- ลำดับ Name Description Name Description ร้อน เย็น ปั่น ภาพ ร้อน เย็น ปั่น ราคาร้อน ราคาเย็น ราคาปั่น
+ ลำดับ Name Name Description Description ร้อน เย็น ปั่น ภาพ ร้อน เย็น ปั่น ราคาร้อน ราคาเย็น ราคาปั่น
Name=recommend,file=page_catalog_group_recommend.skt
TAGESP
@@ -370,23 +370,23 @@ Name=Momday,file=page_catalog_momday.skt
Name=CockTail,file=page_catalog_group_cocktail.skt
- STX On The Beach Pineapple juice, Limeade, \nSoda, Ice, Malibu STX On The Beach Pineapple juice, Limeade, \nSoda, Ice, Malibu - 11-99-05-0001 - bn_Alcohol_ILYSB.png - - - - #N/A - #N/A #N/A
- Noxious Nitrous Mint syrup, Limeade, Ice, Rum Noxious Nitrous Mint syrup, Limeade, Ice, Rum - 11-99-05-0002 - bn_Alcohol_Gale_Jail.png - - - - #N/A - #N/A #N/A
- Sea Level RISE Strawberry syrup, Limeade, \nSoda, Malibu Sea Level RISE Strawberry syrup, Limeade, \nSoda, Malibu - 11-99-05-0003 - bn_Alcohol_Third_Behind_Bars.png - - - - #N/A - #N/A #N/A
- Methane Bubbles Lychee, Limeade, Soda, \nMount Gay Rum Methane Bubbles Lychee, Limeade, Soda, \nMount Gay Rum - 11-99-05-0004 - bn_Alcohol_Pinky_Promise.png - - - - #N/A - #N/A #N/A
- Carbon Bonds Pineapple juice, Limeade, \nSoda, Ice, Mount Gay Rum My Carbon Footprint Pineapple juice, Limeade, \nSoda, Ice, Mount Gay Rum - 11-99-05-0005 - bn_Alcohol_Love_Potion.png - - - - #N/A - #N/A #N/A
- Fossil Fuel Coffee, Milk Ice, Rum Fossil Fuel Coffee, Milk Ice, Rum - 11-99-05-0006 - bn_Alcohol_Bedroom_Story.png - - - - #N/A - #N/A #N/A
- Stinky Sulphur Melon, Rum Stinky Sulphur Melon, Rum - 11-99-05-0007 - bn_Alcohol_Oriental_Kink.png - - - - #N/A - #N/A #N/A
- Net Zero Strawberry syrup, Pineaple \njuice Ice, Malibu Biofuel Strawberry syrup, Pineaple \njuice Ice, Malibu - 11-99-05-0008 - bn_Alcohol_Long_Night.png - - - - #N/A - #N/A #N/A
- Coal Story Bro Black sugar syrup, Milk, Ice, \nMount Gay Rum Coal Story Bro Black sugar syrup, Milk, Ice, \nMount Gay Rum - 11-99-05-0009 - bn_Alcohol_Good_Night_Kiss.png - - - - #N/A - #N/A #N/A
- Big Kid Lychee juice, Pineaple juice, \nIce, Mount Gay Rum Bangkok Underwater Lychee juice, Pineaple juice, \nIce, Mount Gay Rum - 11-99-05-0010 - bn_Alcohol_Forever_Love.png - - - - #N/A - #N/A #N/A
- Blue lable, soda Blue lable, soda Druzhba Pipe Blue lable, soda - 11-99-05-0012 - bn_iced_soda_blue.png - - - - #N/A - #N/A #N/A
- Blue lable, water Blue lable, water 2050 Blue lable, water - 11-99-05-0013 - bn_iced_blue.png - - - - #N/A - #N/A #N/A
- Gold lable, soda Gold lable, soda Petrol Fumes Gold lable, soda - 11-99-05-0017 - bn_iced_soda_gold.png - - -
- Gold lable, water Gold lable, water Big Kid Gold lable, water - 11-99-05-0018 - bn_iced_gold.png - - -
- Black lable, soda Black lable, soda Tailpipe Emissions Black lable, soda - 11-99-05-0016 - bn_iced_soda_black.png - - - - #N/A - #N/A #N/A
- Black lable, water Black lable, water Greenwash Black lable, water - 11-99-05-0014 - bn_iced_black.png - - - - #N/A - #N/A #N/A
- Pinky Promise Pinky Promise Methane Bubbles Lychee, Limeade, Soda, \nMount Gay Rum - 11-99-05-0015 - bn_Alcohol_Pinky_Promise.png - - - - #N/A - #N/A #N/A
+ STX On The Beach STX On The Beach Pineapple juice, Limeade, \nSoda, Ice, Malibu Pineapple juice, Limeade, \nSoda, Ice, Malibu - 11-99-05-0001 - bn_Alcohol_ILYSB.png - - - - #N/A - #N/A #N/A
+ Noxious Nitrous Noxious Nitrous Mint syrup, Limeade, Ice, Rum Mint syrup, Limeade, Ice, Rum - 11-99-05-0002 - bn_Alcohol_Gale_Jail.png - - - - #N/A - #N/A #N/A
+ Sea Level RISE Sea Level RISE Strawberry syrup, Limeade, \nSoda, Malibu Strawberry syrup, Limeade, \nSoda, Malibu - 11-99-05-0003 - bn_Alcohol_Third_Behind_Bars.png - - - - #N/A - #N/A #N/A
+ Methane Bubbles Methane Bubbles Lychee, Limeade, Soda, \nMount Gay Rum Lychee, Limeade, Soda, \nMount Gay Rum - 11-99-05-0004 - bn_Alcohol_Pinky_Promise.png - - - - #N/A - #N/A #N/A
+ My Carbon\nFootprint My Carbon\nFootprint Pineapple juice, Limeade, \nSoda, Ice, Mount Gay Rum Pineapple juice, Limeade, \nSoda, Ice, Mount Gay Rum - 11-99-05-0005 - bn_Alcohol_Love_Potion.png - - - - #N/A - #N/A #N/A
+ Fossil Fuel Fossil Fuel Coffee, Milk Ice, Rum Coffee, Milk Ice, Rum - 11-99-05-0006 - bn_Alcohol_Bedroom_Story.png - - - - #N/A - #N/A #N/A
+ Stinky Sulphur Stinky Sulphur Melon, Rum Melon, Rum - 11-99-05-0007 - bn_Alcohol_Oriental_Kink.png - - - - #N/A - #N/A #N/A
+ Biofuel Biofuel Strawberry syrup, Pineaple \njuice Ice, Malibu Strawberry syrup, Pineaple \njuice Ice, Malibu - 11-99-05-0008 - bn_Alcohol_Long_Night.png - - - - #N/A - #N/A #N/A
+ Coal Story Bro Coal Story Bro Black sugar syrup, Milk, Ice, \nMount Gay Rum Black sugar syrup, Milk, Ice, \nMount Gay Rum - 11-99-05-0009 - bn_Alcohol_Good_Night_Kiss.png - - - - #N/A - #N/A #N/A
+ Bangkok\nUnderwater Bangkok\nUnderwater Lychee juice, Pineaple juice, \nIce, Mount Gay Rum Lychee juice, Pineaple juice, \nIce, Mount Gay Rum - 11-99-05-0010 - bn_Alcohol_Forever_Love.png - - - - #N/A - #N/A #N/A
+ Druzhba Pipe Druzhba Pipe Blue lable, soda Blue lable, soda - 11-99-05-0012 - bn_iced_soda_blue.png - - - - #N/A - #N/A #N/A
+ 2050 2050 Blue lable, water Blue lable, water - 11-99-05-0013 - bn_iced_blue.png - - - - #N/A - #N/A #N/A
+ Petrol Fumes Petrol Fumes Gold lable, soda Gold lable, soda - 11-99-05-0017 - bn_iced_soda_gold.png - - -
+ Big Kid Big Kid Gold lable, water Gold lable, water - 11-99-05-0018 - bn_iced_gold.png - - -
+ Tailpipe Emissions Tailpipe Emissions Black lable, soda Black lable, soda - 11-99-05-0015 - bn_iced_soda_black.png - - - - #N/A - #N/A #N/A
+ Greenwash Greenwash Black lable, water Black lable, water - 11-99-05-0014 - bn_iced_black.png - - - - #N/A - #N/A #N/A
+
Name=Obsolete,file=page_obsolete.skt
diff --git a/xml/page_catalog_group_cocktail.skt b/xml/page_catalog_group_cocktail.skt
index 94052aa4..c84fce1d 100644
--- a/xml/page_catalog_group_cocktail.skt
+++ b/xml/page_catalog_group_cocktail.skt
@@ -11,7 +11,7 @@
; On open
Var Menu8Selected = "PressForever"
@@ -23,7 +23,7 @@
diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml
index 14753681..d3c5a38e 100644
--- a/xml/page_catalog_group_cocktail.xml
+++ b/xml/page_catalog_group_cocktail.xml
@@ -539,7 +539,7 @@
Var block_index_override = 0
Var block_index_move = 0
-; menu_new_list 17
+; menu_new_list 16
; ==================> Len = 16
; - 11-99-05-0001 -
@@ -556,9 +556,9 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Pineapple juice, Limeade, Soda, Ice, Malibu"
+ Var NameDrink = "STX On The Beach"
Var NameDrinkTH = "STX On The Beach"
- Var DrinkDescriptionTH = "STX On The Beach"
+ Var DrinkDescriptionTH = "Pineapple juice, Limeade, Soda, Ice, Malibu"
Var DrinkDescription = "Pineapple juice, Limeade, Soda, Ice, Malibu"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_ILYSB.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -638,7 +638,8 @@
KanitMediumTTF
0x6F5F51
showthaiText
- "STX On The Beach"
+ "Pineapple juice, Limeade,
+Soda, Ice, Malibu"
16
@@ -649,8 +650,7 @@
KanitMediumTTF
0x322B26
showengText
- "Pineapple juice, Limeade,
-Soda, Ice, Malibu"
+ "STX On The Beach"
16
@@ -806,9 +806,9 @@ Soda, Ice, Malibu"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Mint syrup, Limeade, Ice, Rum"
+ Var NameDrink = "Noxious Nitrous"
Var NameDrinkTH = "Noxious Nitrous"
- Var DrinkDescriptionTH = "Noxious Nitrous"
+ Var DrinkDescriptionTH = "Mint syrup, Limeade, Ice, Rum"
Var DrinkDescription = "Mint syrup, Limeade, Ice, Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Gale_Jail.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -888,7 +888,7 @@ Soda, Ice, Malibu"
KanitMediumTTF
0x6F5F51
showthaiText
- "Noxious Nitrous"
+ "Mint syrup, Limeade, Ice, Rum"
16
@@ -899,7 +899,7 @@ Soda, Ice, Malibu"
KanitMediumTTF
0x322B26
showengText
- "Mint syrup, Limeade, Ice, Rum"
+ "Noxious Nitrous"
16
@@ -1054,9 +1054,9 @@ Soda, Ice, Malibu"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Strawberry syrup, Limeade, Soda, Malibu"
+ Var NameDrink = "Sea Level RISE"
Var NameDrinkTH = "Sea Level RISE"
- Var DrinkDescriptionTH = "Sea Level RISE"
+ Var DrinkDescriptionTH = "Strawberry syrup, Limeade, Soda, Malibu"
Var DrinkDescription = "Strawberry syrup, Limeade, Soda, Malibu"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Third_Behind_Bars.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -1136,7 +1136,8 @@ Soda, Ice, Malibu"
KanitMediumTTF
0x6F5F51
showthaiText
- "Sea Level RISE"
+ "Strawberry syrup, Limeade,
+Soda, Malibu"
16
@@ -1147,8 +1148,7 @@ Soda, Ice, Malibu"
KanitMediumTTF
0x322B26
showengText
- "Strawberry syrup, Limeade,
-Soda, Malibu"
+ "Sea Level RISE"
16
@@ -1304,9 +1304,9 @@ Soda, Malibu"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Lychee, Limeade, Soda, Mount Gay Rum"
+ Var NameDrink = "Methane Bubbles"
Var NameDrinkTH = "Methane Bubbles"
- Var DrinkDescriptionTH = "Methane Bubbles"
+ Var DrinkDescriptionTH = "Lychee, Limeade, Soda, Mount Gay Rum"
Var DrinkDescription = "Lychee, Limeade, Soda, Mount Gay Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Pinky_Promise.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -1386,7 +1386,8 @@ Soda, Malibu"
KanitMediumTTF
0x6F5F51
showthaiText
- "Methane Bubbles"
+ "Lychee, Limeade, Soda,
+Mount Gay Rum"
16
@@ -1397,8 +1398,7 @@ Soda, Malibu"
KanitMediumTTF
0x322B26
showengText
- "Lychee, Limeade, Soda,
-Mount Gay Rum"
+ "Methane Bubbles"
16
@@ -1554,9 +1554,9 @@ Mount Gay Rum"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Pineapple juice, Limeade, Soda, Ice, Mount Gay Rum"
- Var NameDrinkTH = "Carbon Bonds"
- Var DrinkDescriptionTH = "My Carbon Footprint"
+ Var NameDrink = "My Carbon Footprint"
+ Var NameDrinkTH = "My Carbon Footprint"
+ Var DrinkDescriptionTH = "Pineapple juice, Limeade, Soda, Ice, Mount Gay Rum"
Var DrinkDescription = "Pineapple juice, Limeade, Soda, Ice, Mount Gay Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Love_Potion.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -1626,7 +1626,8 @@ Mount Gay Rum"
KanitMediumTTF
0x322B26
showthaiText
- "Carbon Bonds"
+ "My Carbon
+Footprint"
16
@@ -1636,7 +1637,8 @@ Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "My Carbon Footprint"
+ "Pineapple juice, Limeade,
+Soda, Ice, Mount Gay Rum"
16
@@ -1647,8 +1649,8 @@ Mount Gay Rum"
KanitMediumTTF
0x322B26
showengText
- "Pineapple juice, Limeade,
-Soda, Ice, Mount Gay Rum"
+ "My Carbon
+Footprint"
16
@@ -1804,9 +1806,9 @@ Soda, Ice, Mount Gay Rum"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Coffee, Milk Ice, Rum"
+ Var NameDrink = "Fossil Fuel"
Var NameDrinkTH = "Fossil Fuel"
- Var DrinkDescriptionTH = "Fossil Fuel"
+ Var DrinkDescriptionTH = "Coffee, Milk Ice, Rum"
Var DrinkDescription = "Coffee, Milk Ice, Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Bedroom_Story.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -1886,7 +1888,7 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Fossil Fuel"
+ "Coffee, Milk Ice, Rum"
16
@@ -1897,7 +1899,7 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showengText
- "Coffee, Milk Ice, Rum"
+ "Fossil Fuel"
16
@@ -2052,9 +2054,9 @@ Soda, Ice, Mount Gay Rum"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Melon, Rum"
+ Var NameDrink = "Stinky Sulphur"
Var NameDrinkTH = "Stinky Sulphur"
- Var DrinkDescriptionTH = "Stinky Sulphur"
+ Var DrinkDescriptionTH = "Melon, Rum"
Var DrinkDescription = "Melon, Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Oriental_Kink.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -2134,7 +2136,7 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Stinky Sulphur"
+ "Melon, Rum"
16
@@ -2145,7 +2147,7 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showengText
- "Melon, Rum"
+ "Stinky Sulphur"
16
@@ -2300,9 +2302,9 @@ Soda, Ice, Mount Gay Rum"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Strawberry syrup, Pineaple juice Ice, Malibu"
- Var NameDrinkTH = "Net Zero"
- Var DrinkDescriptionTH = "Biofuel"
+ Var NameDrink = "Biofuel"
+ Var NameDrinkTH = "Biofuel"
+ Var DrinkDescriptionTH = "Strawberry syrup, Pineaple juice Ice, Malibu"
Var DrinkDescription = "Strawberry syrup, Pineaple juice Ice, Malibu"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Long_Night.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -2372,7 +2374,7 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showthaiText
- "Net Zero"
+ "Biofuel"
16
@@ -2382,7 +2384,8 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Biofuel"
+ "Strawberry syrup, Pineaple
+juice Ice, Malibu"
16
@@ -2393,8 +2396,7 @@ Soda, Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showengText
- "Strawberry syrup, Pineaple
-juice Ice, Malibu"
+ "Biofuel"
16
@@ -2550,9 +2552,9 @@ juice Ice, Malibu"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Black sugar syrup, Milk, Ice, Mount Gay Rum"
+ Var NameDrink = "Coal Story Bro"
Var NameDrinkTH = "Coal Story Bro"
- Var DrinkDescriptionTH = "Coal Story Bro"
+ Var DrinkDescriptionTH = "Black sugar syrup, Milk, Ice, Mount Gay Rum"
Var DrinkDescription = "Black sugar syrup, Milk, Ice, Mount Gay Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Good_Night_Kiss.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -2632,7 +2634,8 @@ juice Ice, Malibu"
KanitMediumTTF
0x6F5F51
showthaiText
- "Coal Story Bro"
+ "Black sugar syrup, Milk, Ice,
+Mount Gay Rum"
16
@@ -2643,8 +2646,7 @@ juice Ice, Malibu"
KanitMediumTTF
0x322B26
showengText
- "Black sugar syrup, Milk, Ice,
-Mount Gay Rum"
+ "Coal Story Bro"
16
@@ -2800,9 +2802,9 @@ Mount Gay Rum"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Lychee juice, Pineaple juice, Ice, Mount Gay Rum"
- Var NameDrinkTH = "Big Kid"
- Var DrinkDescriptionTH = "Bangkok Underwater"
+ Var NameDrink = "Bangkok Underwater"
+ Var NameDrinkTH = "Bangkok Underwater"
+ Var DrinkDescriptionTH = "Lychee juice, Pineaple juice, Ice, Mount Gay Rum"
Var DrinkDescription = "Lychee juice, Pineaple juice, Ice, Mount Gay Rum"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Forever_Love.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -2872,7 +2874,8 @@ Mount Gay Rum"
KanitMediumTTF
0x322B26
showthaiText
- "Big Kid"
+ "Bangkok
+Underwater"
16
@@ -2882,7 +2885,8 @@ Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Bangkok Underwater"
+ "Lychee juice, Pineaple juice,
+Ice, Mount Gay Rum"
16
@@ -2893,8 +2897,8 @@ Mount Gay Rum"
KanitMediumTTF
0x322B26
showengText
- "Lychee juice, Pineaple juice,
-Ice, Mount Gay Rum"
+ "Bangkok
+Underwater"
16
@@ -3050,9 +3054,9 @@ Ice, Mount Gay Rum"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Blue lable, soda"
- Var NameDrinkTH = "Blue lable, soda"
- Var DrinkDescriptionTH = "Druzhba Pipe"
+ Var NameDrink = "Druzhba Pipe"
+ Var NameDrinkTH = "Druzhba Pipe"
+ Var DrinkDescriptionTH = "Blue lable, soda"
Var DrinkDescription = "Blue lable, soda"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_soda_blue.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -3122,7 +3126,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showthaiText
- "Blue lable, soda"
+ "Druzhba Pipe"
16
@@ -3132,7 +3136,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Druzhba Pipe"
+ "Blue lable, soda"
16
@@ -3143,7 +3147,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showengText
- "Blue lable, soda"
+ "Druzhba Pipe"
16
@@ -3298,9 +3302,9 @@ Ice, Mount Gay Rum"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Blue lable, water"
- Var NameDrinkTH = "Blue lable, water"
- Var DrinkDescriptionTH = "2050"
+ Var NameDrink = "2050"
+ Var NameDrinkTH = "2050"
+ Var DrinkDescriptionTH = "Blue lable, water"
Var DrinkDescription = "Blue lable, water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_blue.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -3370,7 +3374,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showthaiText
- "Blue lable, water"
+ "2050"
16
@@ -3380,7 +3384,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "2050"
+ "Blue lable, water"
16
@@ -3391,7 +3395,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showengText
- "Blue lable, water"
+ "2050"
16
@@ -3546,9 +3550,9 @@ Ice, Mount Gay Rum"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Gold lable, soda"
- Var NameDrinkTH = "Gold lable, soda"
- Var DrinkDescriptionTH = "Petrol Fumes"
+ Var NameDrink = "Petrol Fumes"
+ Var NameDrinkTH = "Petrol Fumes"
+ Var DrinkDescriptionTH = "Gold lable, soda"
Var DrinkDescription = "Gold lable, soda"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_soda_gold.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -3618,7 +3622,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showthaiText
- "Gold lable, soda"
+ "Petrol Fumes"
16
@@ -3628,7 +3632,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Petrol Fumes"
+ "Gold lable, soda"
16
@@ -3639,7 +3643,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showengText
- "Gold lable, soda"
+ "Petrol Fumes"
16
@@ -3794,9 +3798,9 @@ Ice, Mount Gay Rum"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = "Gold lable, water"
- Var NameDrinkTH = "Gold lable, water"
- Var DrinkDescriptionTH = "Big Kid"
+ Var NameDrink = "Big Kid"
+ Var NameDrinkTH = "Big Kid"
+ Var DrinkDescriptionTH = "Gold lable, water"
Var DrinkDescription = "Gold lable, water"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_gold.png"
Var OpenFromXML = CurrentXMLFileName2
@@ -3866,7 +3870,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showthaiText
- "Gold lable, water"
+ "Big Kid"
16
@@ -3876,7 +3880,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x6F5F51
showthaiText
- "Big Kid"
+ "Gold lable, water"
16
@@ -3887,7 +3891,7 @@ Ice, Mount Gay Rum"
KanitMediumTTF
0x322B26
showengText
- "Gold lable, water"
+ "Big Kid"
16
@@ -4027,35 +4031,35 @@ Ice, Mount Gay Rum"
; - - -
; ==================> Len = 16
- ; - 11-99-05-0016 -
+ ; - 11-99-05-0015 -
33
22
225
296
- Flag( 11-99-05-0016.Button,$Sum1199050016)
+ Flag( 11-99-05-0015.Button,$Sum1199050015)
- ; - - -
- ; ==================> Len = 16
- ; - 11-99-05-0015 -
-
- 33
- 22
- 225
- 296
- Flag( 11-99-05-0015.Button,$Sum1199050015)
-
-
- 16
- 164
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- "Pinky Promise"
-
-
- 16
- 220
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- "Methane Bubbles"
-
-
- 16
- 164
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- "Pinky Promise"
-
-
- 16
- 220
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- "Lychee, Limeade, Soda,
-Mount Gay Rum"
-
-
- 16
- 264
- Var( DirImage2 + "option_deactive.png" )
-
-
- 16
- 264
- "Invisible"
- Var( DirImage2 + "hot.png" )
- Var( DirImage2 + "hot_db.png" )
-
-
- 50
- TextPriceMenuY
- TextPriceMenuSize
- 220
- KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
- "Invisible"
- StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
-
-
- 81
- 264
- Var( DirImage2 + "cold.png" )
- Var( DirImage2 + "cold_db.png" )
- $11-99-05-0015.Button
-
-
- 115
- TextPriceMenuY
- TextPriceMenuSize
- 220
- KanitMediumTTF
- 0x6F5F51
- 0xEAE6E1
- $11-99-05-0015.Button
- StringFmt( $11-99-05-0015.Price , DisplayFormat, PreScaleConvertShow) ; test
-
-
- 146
- 264
- Var( DirImage2 + "blend.png" )
- Var( DirImage2 + "blend_db.png" )
- "Invisible"
-
-
- 180
- TextPriceMenuY
- TextPriceMenuSize
- 220
- KanitRegularTTF
- 0x6F5F51
- 0xEAE6E1
- "Invisible"
- StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
-
-
- 81
- 264
-
- eval(
- If ICE_PROCESS_STATUS = 2 Then
-
- Var ice_tab_process_show = "Invisible"
-
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
- Var return = ice_tab_process_show
- )
-
- "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png"
- "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png"
-
-
- 49
- 117
-
- eval(
- If $Sum1199050015 = "Disable" Then
- STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
- STRCONTAIN "ERR" $11-99-05-0015.TAG tag2_is_disable
- STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
- Var return = "Invisible"
- If tag1_is_disable = "true" Then
- Var return = "Enable"
- EndIf
- If tag2_is_disable = "true" Then
- Var return = "Enable"
- EndIf
- If tag3_is_disable = "true" Then
- Var return = "Enable"
- EndIf
- Else
- Var return = "Invisible"
- EndIf
- )
-
- "ROOT/taobin_project/image//img_menu_err2.png"
-
-
- 84
- 266
- 10
- OpunMediumTTF
- 0xDE794E
- ice_tab_process_show
- ice_show_open
-
-
- 48
- 116
- 32
- 128
- 64
- MITRegularTTF
- 0x5A5A5A
- "disable-show"
- $Sum1199050015
- text_unavailable
- center-vertical-horizontal
-
; - - -
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 716c3b63..a3cacad0 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
- Var XMLPageVersion = "7.66"
- Var XMLPageVersionInt = 766
+ Var XMLPageVersion = "7.67"
+ Var XMLPageVersionInt = 767
;Oreo
Var OreoGuarantee = 0