fix page_topping_select7.xml

xml/event/tricker.ev

@@ -109,65 +109,37 @@ EndIf
 
 
 If BoxID = 200001 Then
-	Var TamatianEnable = 1
-	Var GameEnableFromTrickerEv = 1
-	Var MayDayRunEnable = 1
 EndIf
 
 
 If BoxID = 173149 Then
-	Var TamatianEnable = 0
+	Var PepweenEnable = 1
 	Var GameEnableFromTrickerEv = 1
-	Var MayDayRunEnable = 1
 EndIf
 
 If BoxID = 172053 Then
-	Var TamatianEnable = 1
 	Var GameEnableFromTrickerEv = 1
-	Var MayDayRunEnable = 1
 EndIf
 
 If BoxID = 172644 Then
-	Var TamatianEnable = 1
 	Var GameEnableFromTrickerEv = 1
-	Var MayDayRunEnable = 1
 EndIf
 
 
 If BoxID = 176757 Then
-	Var TamatianEnable = 1
+	Var PepweenEnable = 1
 	Var GameEnableFromTrickerEv = 1
-	Var MayDayRunEnable = 1
 EndIf
 
 If BoxID = 176277 Then
 	Var GameEnableFromTrickerEv = 1
-	Var MayDayRunEnable = 1
 EndIf
 
 If BoxID = 174565 Then
 	Var GameEnableFromTrickerEv = 1
-	Var MayDayRunEnable = 1
 EndIf
 
 
-
-If BoxID = 200863 Then
-	Var TamatianEnable = 1
-	Var GameEnableFromTrickerEv = 1
-	Var MayDayRunEnable = 1
-EndIf
-
-If BoxID = 200580 Then
-	Var TamatianEnable = 1
-	Var GameEnableFromTrickerEv = 1
-	Var MayDayRunEnable = 1
-EndIf
-
-If BoxID = 105005 Then
-	Var PepweenEnable = 1
-EndIf
-
 Var MayDayRunEnable = 0
 
 If BoxID = 33170 Then

xml/page_board.xml

@@ -994,11 +994,15 @@
 
 
 		If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then
+			If NETCORE_EVENT_CNT_X = "" Then
+				Var NETCORE_EVENT_CNT_X = 0
+			EndIf
+
 			Var NETCORE_EVENT_CNT_X = NETCORE_EVENT_CNT_X + 1
 			
 			DEBUGVAR NETCORE_EVENT_CNT_X
 
-			If NETCORE_EVENT_CNT_X > 600 Then
+			If NETCORE_EVENT_CNT_X > 300 Then
 				Var stop_now = "true"
 				Var stop_now_from_netcore_event = 1
 				Var MachineErrorDetailAll = "Netcore Lost"

xml/page_show_error.lxml

@@ -86,9 +86,8 @@
 				Var NETCORE_LOST_COUNT_UP = NETCORE_LOST_COUNT_UP + 1
 				DEBUGVAR NETCORE_LOST_COUNT_UP
 
-				If NETCORE_LOST_COUNT_UP > 900 Then
+				If NETCORE_LOST_COUNT_UP > 300 Then
 					If textStep > 3 Then
-						Var textStep = 0
 						Var MachineErrorDetailAll = MachineErrorDetailAll +  "  !"
 					EndIf
 					If textStep = 3 Then

xml/page_show_error.xml

@@ -201,18 +201,19 @@
 					Reboot
 				EndIf
 
-				If textStep > 3 Then
+				Var NETCORE_LOST_COUNT_UP_STR = " Net " + NETCORE_LOST_COUNT_UP
-					Var textStep = 0
+				
-					Var MachineErrorDetailAll = MachineErrorDetailAll +  "  !"
+				If textStep = 4 Then
+					Var MachineErrorDetailAll = NETCORE_LOST_COUNT_UP_STR + " ###"
 				EndIf
 				If textStep = 3 Then
-					Var MachineErrorDetailAll = MachineErrorDetailAll +  "  !!"
+					Var MachineErrorDetailAll = NETCORE_LOST_COUNT_UP_STR + " ###"
 				EndIf
 				If textStep = 2 Then
-					Var MachineErrorDetailAll = MachineErrorDetailAll +  "  !!!"
+					Var MachineErrorDetailAll = NETCORE_LOST_COUNT_UP_STR + " ##"
 				EndIf
 				If textStep = 1 Then
-					Var MachineErrorDetailAll = MachineErrorDetailAll +  "  !!!!"
+					Var MachineErrorDetailAll = NETCORE_LOST_COUNT_UP_STR + " #"
 				EndIf
 			Else
 

xml/page_topping_select6.lxml

@@ -640,6 +640,17 @@
 			EndIf
 		EndIf
 
+		
+		; i f cold menu disable away
+		If cold_button_state = "PressForever" Then
+			If showOreoAddEnable = "Enable" Then
+				Var showOreoAddEnable = "Disable"
+			EndIf
+			If showOreoAddEnable = "Press" Then
+				Var showOreoAddEnable = "Disable"
+			EndIf
+		EndIf
+
 		; first time.
 		If blend_button_state = "PressForever" Then
 

xml/page_topping_select7.xml

@@ -300,12 +300,12 @@
 	Var img_smth_dis2 = "/bt_smoothie_disable2_no.png"
 
 	If MilkChoiceVeganEnable = 1 Then
-		Var CerealMilkToppingBg = DirImage + "/bg_milk_choice_j.png"
+		Var OatMilkToppingBg = DirImage + "/bg_milk_choice_j.png"
 	Else
-		Var CerealMilkToppingBg = DirImage + "/bg_milk_choice.png"
+		Var OatMilkToppingBg = DirImage + "/bg_milk_choice.png"
 	EndIf
-	Var CerealMilkToppingEnable = "Invisible"
+	Var OatMilkToppingEnable = "Invisible"
-	Var CerealMilkEnable = "Invisible"
+	Var OatMilkEnable = "Invisible"
 
 
 	Var topping_price_refresh = 1
@@ -354,9 +354,9 @@
 	EndIf
 
 	If show_eng = "true" Then
-		Var CerealMilkX = 400
+		Var OatMilkX = 400
 	Else
-		Var CerealMilkX = 270
+		Var OatMilkX = 270
 	EndIf
 
 	TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev"
@@ -601,12 +601,18 @@
 		EndIf
 	EndIf
 
+	If MilkChoiceVeganEnable = 1 Then
+		Var OatMilkToppingBg = DirImage + "/bg_milk_choice_j.png"
+	Else
+		Var OatMilkToppingBg = DirImage + "/bg_milk_choice.png"
+	EndIf
+
 	TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev"
 
 	If show_eng = "true" Then
-		Var CerealMilkX = 400
+		Var OatMilkX = 400
 	Else
-		Var CerealMilkX = 270
+		Var OatMilkX = 270
 	EndIf
 
 	Function 2
@@ -696,14 +702,6 @@
 	DEBUGVAR toppingID2index4
 	DEBUGVAR toppingID2index5
 	
-	If toppingID1index5 > 0 Then
-		SAVELOG "toppingID1index5 not set"
-	EndIf
-
-	
-	
-	
-
 	DEBUGVAR toppingID1Default
 	DEBUGVAR toppingID2Default
 	DEBUGVAR toppingID3Default
@@ -793,6 +791,17 @@
 			EndIf
 		EndIf
 
+		; i f cold menu disable away
+		
+		If cold_button_state = "PressForever" Then
+			If showOreoAddEnable = "Enable" Then
+				Var showOreoAddEnable = "Disable"
+			EndIf
+			If showOreoAddEnable = "Press" Then
+				Var showOreoAddEnable = "Disable"
+			EndIf
+		EndIf
+
 		; first time.
 		If blend_button_state = "PressForever" Then
 
@@ -1489,9 +1498,14 @@
 		;topping_price_refresh = 0
 		
 		If MenuCodeName1 = "OatMilk" Then
-			Var CerealMilkToppingEnable = "Enable"
+			Var OatMilkToppingEnable = "Enable"
-			Var CerealMilkPrice = SubMenuPrice1
+			
-			Var CerealMilkEnable = "Enable"
+			;SubMenuPrice1 ignore. Fix by xml
+			Var OatMilkPrice = "(+5)" 
+
+			If MenuCodeName1_State = "Enable" Then
+				Var OatMilkEnable = "Enable"
+			EndIf
 		EndIf
 
 		
@@ -2804,32 +2818,32 @@
 ;
 ;-BEGIN milk choice
 <Block>
-<State> CerealMilkToppingEnable </State>
+<State> OatMilkToppingEnable </State>
 <Width> 986 </Width>
 <Height> 157 </Height>
 <MarginTop> 20 </MarginTop>
 <Image>
-<State> CerealMilkToppingEnable </State>
+<State> OatMilkToppingEnable </State>
-<Filename> CerealMilkToppingBg </Filename>
+<Filename> OatMilkToppingBg </Filename>
 </Image>
 
 <Button>
 <X> 40 </X>
 <Y> 72 </Y>
-<State> CerealMilkEnable </State>
+<State> OatMilkEnable </State>
 <Mode> "No" </Mode>
 <Filename> "ROOT/taobin_project/image/topping2/bn_cereal.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping2/bp_cereal.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	SAVELOG " CerealMilkEnable "
+	SAVELOG " OatMilkEnable "
 	
 
-	If CerealMilkEnable = "Press" Then
+	If OatMilkEnable = "Press" Then
-		Var CerealMilkEnable = "Enable"
+		Var OatMilkEnable = "Enable"
 	Else
-		Var CerealMilkEnable = "Press"
+		Var OatMilkEnable = "Press"
 	EndIf
 
 	Function 2
@@ -2842,20 +2856,20 @@
 <Button>
 <X> 896 </X>
 <Y> 78 </Y>
-<State> CerealMilkEnable </State>
+<State> OatMilkEnable </State>
 <Mode> "No" </Mode>
 <Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	SAVELOG " CerealMilkEnable "
+	SAVELOG " OatMilkEnable "
 	
 
-	If CerealMilkEnable = "Press" Then
+	If OatMilkEnable = "Press" Then
-		Var CerealMilkEnable = "Enable"
+		Var OatMilkEnable = "Enable"
 	Else
-		Var CerealMilkEnable = "Press"
+		Var OatMilkEnable = "Press"
 	EndIf
 
 	Function 2
@@ -2873,7 +2887,7 @@
 <State> "Enable" </State>
 <Size> 36 </Size>
 <Color> 0x84776F </Color>
-<Value> CerealMilkPrice </Value>
+<Value> OatMilkPrice </Value>
 </Text>
 
 </Block>
@@ -4178,17 +4192,11 @@
 		Machine PreparCup
 	EndIf
 	
-	Var CerealMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop
+	Var OatMilkAddAmount = 5
-	
 	Var CerealMilkPrice = "(+฿5)"
 
-	DEBUGVAR SubMenuPrice1
-	DEBUGVAR CerealMilkAddAmount
-
-
 	
 	DEBUGVAR PriceDrinkNoTop
-	DEBUGVAR PriceDiff
 	DEBUGVAR showShotEnable
 	Var TOPPING_PRICE = 0
 
@@ -4266,14 +4274,17 @@
 		
 	EndIf
 
-	If CerealMilkEnable = "Press" Then
+	DEBUGVAR OatMilkEnable
-		If MenuCodeName1 = "Cereal-Milk" Then
+	DEBUGVAR MenuCodeName1
-			;Var TOPPING_PRICE = TOPPING_PRICE + CerealMilkAddAmount
+	DEBUGVAR MenuCodeName1_State
-			Var TOPPING_PRICE = TOPPING_PRICE + 5
+
+	If OatMilkEnable = "Press" Then
+		If MenuCodeName1 = "OatMilk" Then
+			If MenuCodeName1_State = "Enable" Then
+				Var TOPPING_PRICE = TOPPING_PRICE + OatMilkAddAmount
+				Var UserSelectProductCode = SubMenuProductCode1
+			EndIf
 		EndIf
-
-	Else
-		
 	EndIf
 	
 

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "7.72"
+	Var XMLPageVersion = "7.73"
-	Var XMLPageVersionInt = 772
+	Var XMLPageVersionInt = 773
 ;Oreo
 Var OreoGuarantee = 0
 </EventOpen>