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

inter/aus/xml/event/tricker.ev

@@ -9,8 +9,8 @@
 ; Enable app game
 Var GameEnableFromTrickerEv = 0
 
-Var New_Payment = 1
+Var New_Payment = 0
-Var CleanFeedbackFlag = 1
+Var CleanFeedbackFlag = 0
 
 Var HappyEasterPro = 0
 Var AutumnBreezePro = 0

inter/hkg/xml/page_topping_select6.lxml

@@ -577,12 +577,12 @@
 
 	DEBUGVAR OpenFromInstMenuTab
 	If OpenFromInstMenuTab > 0 Then
-		DEBUGVAR OpenFromInstMenuTab
 		TabMenuVisibleInst OpenFromInstMenuTab
+		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/page_instance2.xml"
+	Else
+		Open OpenFromXML
 	EndIf
 
-	Open OpenFromXML
-
 </EventClick>
 </Button>
 
@@ -3584,12 +3584,12 @@
 
 	DEBUGVAR OpenFromInstMenuTab
 	If OpenFromInstMenuTab > 0 Then
-		DEBUGVAR OpenFromInstMenuTab
 		TabMenuVisibleInst OpenFromInstMenuTab
+		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+	Else
+		Open OpenFromXML
 	EndIf
 
-	Open OpenFromXML
-
 </EventClick>
 <Language>
 	<X> 53 </X>

xml/page_board.xml

@@ -2081,6 +2081,10 @@ PRICE "Reset" "-"
 
 	If TaobinOnlineX = "true" Then
 
+		If CountDownShowButton = 32 Then
+			TapScreen 860 1004
+		EndIf
+
 		If CountDownShowButton = 31 Then
 			Var ShowButtonClickFull = "Enable"
 			Var ShowButtonClick = "Invisible"
@@ -2141,15 +2145,7 @@ PRICE "Reset" "-"
 			If CountDownPauseVideo  = 1 Then
 
 			    If EnablePepsiFullscreen = 0 Then
-					If CountryName = "HongKong" Then
+					;TapScreen 860 1004
-						If CatalogLayoutV3 = 1 Then
-							;do-not-thing
-						Else
-							TapScreen 860 1004
-						EndIf
-					Else
-						TapScreen 860 1004
-					EndIf
 				EndIf
 
 			EndIf