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

xml/vending_tasks_pre_main.xml

@@ -31,6 +31,9 @@
 
     If Timeout > 60 Then
         StatusLog "exit"
+
+        __CMD "cancel-pw-newui" "-" "-" "-"
+
         Open "ROOT/taobin_project/xml/page_board.xml"
     EndIf
 
@@ -42,6 +45,8 @@
     Var BackToMainTime = 60 - Timeout
 
     DEBUGVAR tmpPassPhrase
+
+    __CMD "still-stay-on-pre-main" "-" "-" "-"
  
 
     Refresh
@@ -70,6 +75,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick>
 
+    __CMD "cancel-pw-newui" "-" "-" "-"
+
 	Open "ROOT/taobin_project/xml/vending_info2.xml"
 
 </EventClick>
@@ -218,6 +225,9 @@
 <Volume> SoundVolume </Volume>
 <EventClick>
     StatusLog "exit"
+
+    __CMD "cancel-pw-newui" "-" "-" "-"
+
 	Open "ROOT/taobin_project/xml/page_board.xml"
 </EventClick>
 </Button>

xml_main/startup.xml

@@ -108,13 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-<<<<<<< HEAD
 	Var XMLPageVersion = "8.92"
 	Var XMLPageVersionInt = 892
-=======
-	Var XMLPageVersion = "8.91"
-	Var XMLPageVersionInt = 891
->>>>>>> 2056d9a5c4d5969c7c875c78137b83fd4d1eb872
 ;Oreo
 Var OreoGuarantee = 0