Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

xml/menu_catalog_default_init.xml

@@ -12,6 +12,8 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
+        Var text_unavailable = "UNAVAILABLE###size=16"
+
 
     Else
         Var showengText = "Invisible"
@@ -22,6 +24,7 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var text_unavailable = "หมด###size=32"
     EndIf
 
     If ICE_PROCESS_STATUS = 2 Then

xml/page_brewing3.xml

@@ -49,11 +49,22 @@
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
 
 		Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
+
+		Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw_en.png"
+		Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw_en.png"
+
+		Var XStraw = 336
 	Else
 		;Var DirImage = "ROOT/taobin_project/image/collect_point1"
 		Play "ROOT/taobin_project/sound_thai/thankyou.mp3"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+	
+
+		Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png"
+		Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw.png"
+
+		Var XStraw = 382
 	EndIf
 
 	Var waitAckPay = 0
@@ -232,9 +243,12 @@
 	EndIf
 
 	If EnableSelectMenuBetweenBrew = "Enable" Then 
+		Var EnableGetMoreStrawFileName = "Enable"
 		Var EnableSelectMenuBetweenBrewBlink = "Enable"
 	Else
 		Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+
+		Var EnableGetMoreStrawFileName = "Invisible"
 	EndIf
 
 	; Hide
@@ -248,6 +262,7 @@
 	EndIf
 			
 	
+
 </EventOpen>
 
 
@@ -1074,6 +1089,19 @@
 	EndIf
 
 
+	DEBUGVAR EnableGetMoreStrawFileName
+
+	If EnableGetMoreStrawFileName = "PressForever" Then
+		If EnableGetMoreStrawFileNameCountDown > 0 Then
+			Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1
+
+			If EnableGetMoreStrawFileNameCountDown = 0 Then
+				Var EnableGetMoreStrawFileName = "Enable"
+			EndIf
+		EndIf
+	EndIf
+		
+
 	Refresh
 	TimerReset
 
@@ -1281,6 +1309,23 @@
 </EventClick> 
 </Button>
 
+
+<Button>
+<X> XStraw </X>
+<Y> 1787 </Y>
+<State> EnableGetMoreStrawFileName </State>
+<Filename> bnGetMoreStrawFileName </Filename>
+<FilenamePress> bpGetMoreStrawFileName </FilenamePress>
+<Mode> "No" </Mode>
+<EventClick> 
+	Var EnableGetMoreStrawFileNameCountDown = 5
+	Var EnableGetMoreStrawFileName = "PressForever"
+	Machine Straw
+</EventClick> 
+</Button>
+
+
+
 <Button>
 <X> 10 </X>
 <Y> 500 </Y>

xml/page_catalog_group_appfast.xml

@@ -22,6 +22,8 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
+        Var text_unavailable = "UNAVAILABLE###size=16"
+
 
     Else
         Var showengText = "Invisible"
@@ -32,6 +34,7 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var text_unavailable = "หมด###size=32"
     EndIf
 
     If ICE_PROCESS_STATUS = 2 Then

xml/page_catalog_group_cocktail.xml

@@ -22,6 +22,8 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
+        Var text_unavailable = "UNAVAILABLE###size=16"
+
 
     Else
         Var showengText = "Invisible"
@@ -32,6 +34,7 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var text_unavailable = "หมด###size=32"
     EndIf
 
     If ICE_PROCESS_STATUS = 2 Then

xml/page_catalog_group_coffee.xml

@@ -22,6 +22,8 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
+        Var text_unavailable = "UNAVAILABLE###size=16"
+
 
     Else
         Var showengText = "Invisible"
@@ -32,6 +34,7 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var text_unavailable = "หมด###size=32"
     EndIf
 
     If ICE_PROCESS_STATUS = 2 Then

xml/page_catalog_group_forkid.xml

@@ -22,6 +22,8 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
+        Var text_unavailable = "UNAVAILABLE###size=16"
+
 
     Else
         Var showengText = "Invisible"
@@ -32,6 +34,7 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var text_unavailable = "หมด###size=32"
     EndIf
 
     If ICE_PROCESS_STATUS = 2 Then

xml/page_catalog_group_health.xml

@@ -22,6 +22,8 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
+        Var text_unavailable = "UNAVAILABLE###size=16"
+
 
     Else
         Var showengText = "Invisible"
@@ -32,6 +34,7 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var text_unavailable = "หมด###size=32"
     EndIf
 
     If ICE_PROCESS_STATUS = 2 Then

xml/page_catalog_group_milk.xml

@@ -22,6 +22,8 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
+        Var text_unavailable = "UNAVAILABLE###size=16"
+
 
     Else
         Var showengText = "Invisible"
@@ -32,6 +34,7 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var text_unavailable = "หมด###size=32"
     EndIf
 
     If ICE_PROCESS_STATUS = 2 Then

xml/page_catalog_group_other.xml

@@ -22,6 +22,8 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
+        Var text_unavailable = "UNAVAILABLE###size=16"
+
 
     Else
         Var showengText = "Invisible"
@@ -32,6 +34,7 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var text_unavailable = "หมด###size=32"
     EndIf
 
     If ICE_PROCESS_STATUS = 2 Then

xml/page_catalog_group_recommend.xml

@@ -22,6 +22,8 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
+        Var text_unavailable = "UNAVAILABLE###size=16"
+
 
     Else
         Var showengText = "Invisible"
@@ -32,6 +34,7 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var text_unavailable = "หมด###size=32"
     EndIf
 
     If ICE_PROCESS_STATUS = 2 Then

xml/page_catalog_group_tea.xml

@@ -22,6 +22,8 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
+        Var text_unavailable = "UNAVAILABLE###size=16"
+
 
     Else
         Var showengText = "Invisible"
@@ -32,6 +34,7 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var text_unavailable = "หมด###size=32"
     EndIf
 
     If ICE_PROCESS_STATUS = 2 Then

xml/page_catalog_group_whey.xml

@@ -22,6 +22,8 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
 
         Var ice_tab_text =  "Ice will be ready at "
+        Var text_unavailable = "UNAVAILABLE###size=16"
+
 
     Else
         Var showengText = "Invisible"
@@ -32,6 +34,7 @@
         Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
 
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
+        Var text_unavailable = "หมด###size=32"
     EndIf
 
     If ICE_PROCESS_STATUS = 2 Then

xml_main/startup.xml

@@ -106,8 +106,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "6.65"
+	Var XMLPageVersion = "6.66"
-	Var XMLPageVersionInt = 665
+	Var XMLPageVersionInt = 666
 </EventOpen>
 
 <Text>