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

xml/event/tricker.ev

@@ -374,6 +374,11 @@ If BoxID = 173149 Then
 	Var New_Payment = 1
 	Var NewFlowPaymentCode = 1
 EndIf
+If BoxID = 172053 Then
+	Var New_Payment = 1
+	Var NewFlowPaymentCode = 1
+EndIf
+
 If BoxID = 200001 Then
 	Var New_Payment = 1
 	Var NewFlowPaymentCode = 1
@@ -394,7 +399,7 @@ EndIf
 
 ;
 If BoxID > 200000 Then
-	If BoxID < 200015 Then
+	If BoxID < 200120 Then
 		Var New_Payment = 1
 		Var NewFlowPaymentCode = 1
 	EndIf

xml/page_NewBrewing3.xml

@@ -15,9 +15,11 @@
 	Var CountUpWhenBREW_CNT = 0
 	DEBUGVAR TxRef1
 
-	SAVELOG "page_brewing3.xml"
+	SAVELOG "page_Newbrewing3.xml"
 	DEBUGVAR MachineStage
 
+	Machine NewPaymentOpenBrewingXML
+
 	Var PictureFileTextDesctionState = "Enable"
 
 

xml/page_board.xml

@@ -1264,7 +1264,7 @@
 	DEBUGVAR CountDownPauseVideo2
 	Var TimeProfilePrice = 0
 	
-
+	;Machine NewPaymentOpenBrewingXMLEnable
 </EventOpen>
 
 <EventActionOk>

xml/page_get_yourchange.xml

@@ -78,6 +78,11 @@
 		Var imgGetChange = "/imgGetChange-HKG.png"
 	EndIf
 
+	;inter-image
+	If CountryName = "UnitedArabEmirates Dubai" Then
+		Var imgGetChange = "/imgGetChange-UAE_DUBAI.png"
+	EndIf
+
 	;INT StoreCreditAmount
 	Var StoreCreditAmountStr !assigned StringFmt( StoreCreditAmount, DisplayFormat, PreScaleConvertShow )