Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

xml/event/powerup_free_1/page_powerup_identity.xml

@@ -257,8 +257,14 @@
                     ; TODO: check quota --- AddData; Wait for new add num
                     Var LegitAge = "true"
                     DEBUGVAR IDNum
-                    GETACCEXT IDNum 33 
+
-                    Var StepGetServer = 1
+                    If IDNum = "" Then
+
+                    Else
+                        GETACCEXT IDNum 33 
+                        Var StepGetServer = 1
+                    EndIf
+
                 EndIf
 
 

xml/page_brewing3.xml

@@ -243,6 +243,7 @@
 		EndIf
 	EndIf
 
+	DEBUGVAR FromPowerUpPro
 	If FreeEnergyDrink = 1 Then
 		If FromPowerUpPro = 1 Then
 				; AddData
@@ -252,12 +253,19 @@
 			Var Param2 = ""
 			Var Param3 = ""
 
-			AddData 44 TelephoneNumber IDNum Param1 Param2
+			If IDNum = "" Then
+
+			Else
+				AddData 44 TelephoneNumber IDNum Param1 Param2
+			EndIf
+
 			; clear id
 			Var IDNum = ""
 			Var FromPowerUpPro = 0
 			Var AddData = 0
 			Var DisableFromPowerup = "true"
+		Else
+			Var DisableFromPowerup = ""
 		EndIf
 	EndIf
 
@@ -841,6 +849,10 @@
 					Var PlaySoundLag = RootPathSoundBackToSchool + "next_drink.wav"
 				EndIf
 
+				If LipitPro = 1 Then
+					Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/lipit/next_drink.wav"
+				EndIf
+
 				PlayLong PlaySoundLag
 			EndIf
 		EndIf

xml/page_catalog2.xml

@@ -87,6 +87,10 @@
 			Var PlaySoundLag = RootPathSoundBackToSchool + "taobin_sawade.wav"
 		EndIf
 
+		If LipitPro = 1 Then
+			Var PlaySoundLag = "/mnt/sdcard/coffeevending/sound_thai/lipit/taobin_sawade.wav"
+		EndIf
+
 		Play PlaySoundLag
 
 		Var DirImageCart = "ROOT/taobin_project/image/cart_th"

xml/page_drink_stuck.xml

@@ -299,6 +299,10 @@
 				Var PlaySoundLag = RootPathSoundBackToSchool + "drinkfinish.wav"
 			EndIf
 
+			If LipitPro = 1 Then
+				Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/lipit/drinkfinish.wav"
+			EndIf
+
 			Play PlaySoundLag
 		EndIf
 	EndIf

xml/page_drinkok.xml

@@ -510,6 +510,10 @@
 				Var PlaySoundLag = RootPathSoundBackToSchool + "drinkfinish.wav"
 			EndIf
 
+			If LipitPro = 1 Then
+				Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/lipit/drinkfinish.wav"
+			EndIf
+
 			Play PlaySoundLag
 		EndIf
 	EndIf

xml/page_payment.xml

@@ -187,6 +187,10 @@
 			EndIf
 			Var PlaySoundLag = RootPathSoundBackToSchool + "payment.wav"
 		EndIf
+
+		If LipitPro = 1 Then
+			Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/lipit/payment.wav"
+		EndIf
 		
 		
 		Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a"

xml/page_topping_select7.xml

@@ -849,6 +849,10 @@
 					Var PlaySoundLag = RootPathSoundBackToSchool + "select_level.wav"
 				EndIf
 
+				Var LipitPro = 1 Then
+					Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/lipit/select_level.wav"
+				EndIf
+
 				Play PlaySoundLag
 			EndIf
 		EndIf
@@ -1951,6 +1955,10 @@
 							EndIf
 							Var PlaySoundLag = RootPathSoundBackToSchool + "select_level.wav"
 						EndIf
+
+						Var LipitPro = 1 Then
+							Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/lipit/select_level.wav"
+						EndIf
 						
 						Play PlaySoundLag
 					EndIf
@@ -6497,6 +6505,13 @@
 <Button>
 <X> 673 </X>
 <Y> 1785 </Y>
+<State> eval(
+	If FromPowerUpPro = 1 Then
+		Var return = "Invisible"
+	Else
+		Var return = "Enable"
+	EndIf
+) </State>
 <Filename> Var( DirImage + "/bn_next.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_next.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>