DO

xml/event/tricker.ev

@@ -114,6 +114,18 @@ If BoxID = 176757 Then
 	Var MayDayRunEnable = 1
 EndIf
 
+If BoxID = 176277 Then
+	Var TamatianEnable = 1
+	Var GameEnableFromTrickerEv = 1
+	Var MayDayRunEnable = 1
+EndIf
+
+If BoxID = 174565 Then
+	Var TamatianEnable = 1
+	Var GameEnableFromTrickerEv = 1
+	Var MayDayRunEnable = 1
+EndIf
+
 
 
 If BoxID = 200863 Then

xml/page_topping_select5.xml

@@ -48,11 +48,11 @@
 	Var CHECK_EventOpen_Double = 0
 
 	If RecipeTag3 = "CoffeePlay" Then
-		;Open "ROOT/taobin_project/xml/page_topping_select8.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select8.xml"
 	EndIf
 
 	If BoxID = 200001 Then
-		Open "ROOT/taobin_project/xml/page_topping_select8.xml"
+		;Open "ROOT/taobin_project/xml/page_topping_select8.xml"
 	EndIf
 	If BoxID = 172644 Then
 		Open "ROOT/taobin_project/xml/page_topping_select8.xml"

xml/page_topping_select7.xml

@@ -382,15 +382,9 @@
 				EndIf
 			EndIf
 
-			If CupRemain > 0 Then
+			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+			Open "ROOT/taobin_project/xml/page_payment.xml" 
-				Open "ROOT/taobin_project/xml/page_payment.xml" 
+			
-			EndIf
-
-			If CupRemain = "" Then
-				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-				Open "ROOT/taobin_project/xml/page_payment.xml" 
-			EndIf
 
 
 		EndIf

xml/page_topping_select8.xml

@@ -457,6 +457,12 @@
 				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
 				Open "ROOT/taobin_project/xml/page_payment.xml" 
 			EndIf
+
+			If CupRemain = "" Then
+				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+				Open "ROOT/taobin_project/xml/page_payment.xml" 
+			EndIf
+
 		EndIf
 	EndIf
 	
@@ -5643,225 +5649,6 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	;Var Seeker = "curr"
-
-	
-	DEBUGVAR PriceDrinkTmp
-	
-	;Var Seeker.PriceDrink = PriceDrinkTmp
-	
-	Var PriceDrink = PriceDrinkTmp
-	
-	SAVELOG "USER press next ( topping ) - new"
-
-	If SugarState1 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index1
-		EndIf
-	EndIf
-
-	If SugarState2 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index2
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index1
-		EndIf
-
-	EndIf
-
-	If SugarState3 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index3
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index2
-		EndIf
-		If ShiftSugarStep = 3 Then
-			Var topping1 = toppingID1index1
-		EndIf
-
-	EndIf
-
-	If SugarState3 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index3
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index2
-		EndIf
-		If ShiftSugarStep = 3 Then
-			Var topping1 = toppingID1index1
-		EndIf
-
-	EndIf
-
-	If SugarState4 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index4
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index3
-		EndIf
-		If ShiftSugarStep = 3 Then
-			Var topping1 = toppingID1index2
-		EndIf
-
-	EndIf
-
-	If SugarState5 = "PressForever" Then
-		If ShiftSugarStep = 1 Then
-			Var topping1 = toppingID1index5
-		EndIf
-		If ShiftSugarStep = 2 Then
-			Var topping1 = toppingID1index4
-		EndIf
-		If ShiftSugarStep = 3 Then
-			Var topping1 = toppingID1index3
-		EndIf
-
-	EndIf
-
-
-	Var Seeker.topping1 = topping1
-	Var Seeker.topping2 = topping2
-	Var Seeker.topping3 = topping3
-	Var Seeker.topping6 = topping6
-
-	Var Seeker.get_a_straw = StrawState
-	Var Seeker.get_a_lid = LidState
-
-
-	DEBUGVAR Seeker.topping1
-	DEBUGVAR Seeker.topping2
-	DEBUGVAR Seeker.topping3
-	DEBUGVAR Seeker.topping6
-	DEBUGVAR Seeker.get_a_straw
-	DEBUGVAR Seeker.get_a_lid
-
-	DEBUGVAR LidState
-	DEBUGVAR StrawState
-	DEBUGVAR UserSelectProductCode
-
-
-	If StrawState = "Press" Then
-		Machine StrawOrder	
-		Var LedLidBlink = "true"
-	EndIf
-
-	If LidState = "Press" Then
-		Machine LidOrder	
-		Var LedLidBlink = "true"
-		Var bg_lidProblem_ST = "Enable" 
-	Else
-		If LidState = "Disable" Then
-			Var bg_lidProblem_ST = "Disable"
-		Else
-			Var bg_lidProblem_ST = "Invisible"
-		EndIf
-	EndIf
-	
-	If SelectDrinkType = 0 Then
-		
-	Else
-		Var StrawState = "Enable"
-		Var LidState = "Enable"
-	EndIf
-	; 
-	
-	Var PromotionIDCurrentOrder = 0
-
-
-	Var SelectDrink = UserSelectProductCode
-	
-	Var Seeker.selected_a_drink = UserSelectProductCode
-	DEBUGVAR Seeker.selected_a_drink
-
-	; Set drink 
-
-	If Seeker = "curr" Then
-		Topping "Select" UserSelectProductCode
-
-		; Set option toppinng and pack 
-		Topping "Select1-ID" topping1
-		Topping "Select2-ID" topping2
-		Topping "Select3-ID" topping3
-		Topping "Select6-ID" topping6
-
-		; Pack
-		Topping "Pack" ExtendDataCurr
-
-	Else
-		Topping "SetNextOrder" UserSelectProductCode
-
-
-		Topping "__select" UserSelectProductCode
-		; Set option toppinng and pack 
-		Topping "__select1-id" topping1
-		Topping "__select2-id" topping2
-		Topping "__select3-id" topping3
-		Topping "__select6-id" topping6
-		; Pack
-		Topping "__pack" ExtendDataNext
-
-		Var NextUserSelectDrinkFromPaid = UserSelectProductCode
-		Var NextUserSelecttopping1Paid = topping1
-		Var NextUserSelecttopping2Paid = topping2
-		Var NextUserSelecttopping3Paid = topping3
-		Var NextUserSelecttopping6Paid = topping6
-
-
-
-	EndIf
-	DEBUGVAR Seeker
-	DEBUGVAR Seeker.ExtendData 
-
-	Var Seeker.PictureDrink = PictureDrink
-	Var Seeker.showname = showname
-
-	DEBUGVAR MenuCautionImageStage0
-	DEBUGVAR CustomerFilterEnable
-	DEBUGVAR CustomerFilterType
-
-	
-	GetLongTimeInMinute LastTimeClickOrder
-
-	If CART_COUNT  = 0 Then
-		If UserSelectProductCode = "-" Then
-
-		Else
-			
-			If SelectDrinkType = 1 Then
-				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-				;Open "ROOT/taobin_project/xml/page_identity_verification.xml"
-				Open "ROOT/taobin_project/xml/page_payment.xml"
-			EndIf
-		EndIf
-
-		If SelectDrinkType = 0 Then
-			Var high_light_drink_type = "Enable"
-		EndIf
-	Else
-		
-		If CART1_STATUS = "EMPTY" Then
-			Cart "AddMenuID" 1
-		Else
-			If CART2_STATUS = "EMPTY" Then
-				Cart "AddMenuID" 2
-			Else
-				If CART3_STATUS = "EMPTY" Then
-					Cart "AddMenuID" 3
-				EndIf
-			EndIf
-		EndIf
-
-		Var CartUpdate = "true"
-		Var ButtonNext = "true"
-
-	EndIf
-
-	Var LastTimeClickOrder = 0
-	
 	
 </EventClick>
 </Button>