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

inter/aus/animation01/play_list.tsv

@@ -892,9 +892,9 @@ Caramel Cheesecake Splendor	51-03-03-0054	1	63	53	22	17	23	41			24	120	17:00	23
 Mint Cheesecake Symphony	51-03-03-0055	1	63	53	59	17	23	41			24	120	17:00	23
 Melon Cheesecake Sonata	51-03-03-0056	1	63	53	52	17	23	41			24	120	17:00	23
 Banana Cheesecake Royale	51-03-03-0057	1	63	53	56	17	23	41			24	120	17:00	23
-CARAMEL MILK \nBISCOFF VOLCANO	51-03-03-0045	1	22	17	23	40	41				24	120	17:00	23
-STRAWBERRY MILK \nBISCOFF VOLCANO	51-03-03-0046	1	19	17	23	40	41				24	120	17:00	23
-Mint MILK \nBISCOFF VOLCANO	51-03-03-0047	1	59	17	23	40	41				24	120	17:00	23
+CARAMEL MILK \nBISCOFF VOLCANO	51-03-03-0045	1	22	17	23	41					24	120	17:00	23
+STRAWBERRY MILK \nBISCOFF VOLCANO	51-03-03-0046	1	19	17	23	41					24	120	17:00	23
+Mint MILK \nBISCOFF VOLCANO	51-03-03-0047	1	59	17	23	41					24	120	17:00	23
 
 STX On The Beach	51-99-05-0001	1	27	28							24	120	17:00	23
 Noxious Nitrous	51-99-05-0002	1	27	28							24	120	17:00	23

inter/aus/image/event/image_template2

@@ -1,6 +1,3 @@
-normal_eng=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
-normal_thai=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
-press_eng=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
-press_thai=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
-disable_eng=ROOT/taobin_project/image/event/bd_MerdekaPromotionPepsi1.png
-disable_thai=ROOT/taobin_project/image/event/bd_MerdekaPromotionPepsi1.png
+normal_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st.png
+press_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st.png
+disable_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st.png

inter/aus/menu/lang.tsv

@@ -327,6 +327,10 @@ TextID	Note	English	Thai
 
 800072		Water Tank restart.
 800073		Restart Shot coffee count
+800074		Disc module not close completely	แขนปิดไม่สนิท
+800075		Adjust ice weight	Adjust ice weight
+
+
 
 	Soda System
 800100		stop	หยุด

inter/aus/xml/event/out_put_file2.txt

@@ -1 +1 @@
-/event/promotion_2.xml
+/event/promotion_anniversary_1st.lxml

inter/aus/xml/event/promotion_onclick2.inc

@@ -1 +1 @@
-Open "ROOT/taobin_project/xml/page_catalog_momday.xml"
+; Do nothing

inter/aus/xml/event/promotion_template2.inc

@@ -3,33 +3,9 @@
     <X> 42 </X>
     <Y> 520 </Y>
     <State> BigButtonEnable </State>
-    <Filename> 
-     eval( 
-        If show_eng = "true" Then 
-            Var return = ###normal_eng
-        Else
-            Var return = ###normal_thai
-        EndIf
-        )
-     </Filename>
-    <FilenamePress> 
-     eval( 
-        If show_eng = "true" Then 
-            Var return = ###press_eng    
-        Else
-            Var return = ###press_thai
-        EndIf
-        )
-     </FilenamePress>
-    <FilenameDisable> 
-     eval( 
-        If show_eng = "true" Then 
-            Var return = ###disable_eng
-        Else
-            Var return = ###disable_thai
-        EndIf
-        )
-     </FilenameDisable>
+    <Filename> ###normal_eng </Filename>
+    <FilenamePress> ###press_eng </FilenamePress>
+    <FilenameDisable> ###disable_eng </FilenameDisable>
 <EventOnClick> 
 
         ###EventOnClick

inter/aus/xml/event/script_common_for_open_promotion_xml.ev

@@ -14,6 +14,10 @@ If WestfieldCatalogFlag = 1 Then
 	Var RecommendPage = "ROOT/taobin_project/inter/aus/xml/event/promotion_westfield.lxml" 
 EndIf  
 
+If AnniverseryPro = 1 Then
+	Var RecommendPage = "ROOT/taobin_project/inter/aus/xml/event/promotion_anniversary_1st.lxml"
+EndIf
+
 If OpenFromPageBoard = 1 Then
 	OpenInst 2 RecommendPage
 Else

inter/aus/xml/event/tricker.ev

@@ -15,12 +15,23 @@ Var WinterWarmersCatalogFlag = 0
 
 Var WestfieldCatalogFlag = 0
 
-Var XMLLiveInfoEnable = 1
+; 2 - 29 Sep
+Var AnniverseryPro = 0
 
-If BoxID = 200004 Then
-    Var NewCollectPointFlag = 1
+If SystemDateMonthInt = 9 Then
+    If SystemDateDayInt >= 2 Then
+        If SystemDateDayInt <= 29 then
+            Var AnniverseryPro = 1
+        EndIf
+    EndIf
 EndIf
 
+Var XMLLiveInfoEnable = 1
+
+
+If BoxID = 200027 Then
+    Var AnniverseryPro = 1
+EndIf
 
 If BoxID = 210308 Then
     Var WestfieldCatalogFlag = 1

inter/aus/xml/page_catalog_group_recommend.lxml

@@ -12092,8 +12092,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen

xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml

@@ -92,25 +92,24 @@
             Var TelephoneNumber = TelephoneNumberX
             Var TNumberTaobinMemberXXX = TelephoneNumber
             Var Seeker.IsAlreadyGetReward = Ext1c
-            Var SetAPlusOutOfStock = Ext1d
-            Var SetAOutOfStock = Ext1e
-            Var CleansingGelOutOfStock = Ext1f
-            Var TumbleBottleOutOfStock = Ext1g
-            Var ClearGelOutOfStock = Ext1h
-            Var E_GiftCard100BathOutOfStock = Ext1i
-            Var ClearGel4mlOutOfStock = Ext1j
-
-            
-
-            Var E_GiftCard100BathOutOfStock = 1
-            Var TumbleBottleOutOfStock = 1
+            Var LustrousOutOfStock = Ext1x4
+            Var LipTintOilOutOfStock = Ext1x5
+            Var BlushAndLipOutOfStock = Ext1x6
+            Var RandomOutOfStock = Ext1x7
+            Var CalvinKleinOutOfStock = Ext1x8
+            Var DoubleSerumOutOfStock = Ext1x9
+            Var SetAOutOfStock = Ext1x10
+            Var SetAPlusOutOfStock = Ext1x11
 
 
-            DEBUGVAR SuperSetOutOfStock
-            DEBUGVAR BalanceEssenceTonerOutOfStock
-            DEBUGVAR CleansingGelOutOfStock
-            DEBUGVAR TumbleBottleOutOfStock
-            DEBUGVAR ClearGelOutOfStock
+            DEBUGVAR LustrousOutOfStock
+            DEBUGVAR LipTintOilOutOfStock
+            DEBUGVAR BlushAndLipOutOfStock
+            DEBUGVAR RandomOutOfStock
+            DEBUGVAR CalvinKleinOutOfStock
+            DEBUGVAR DoubleSerumOutOfStock
+            DEBUGVAR SetAOutOfStock
+            DEBUGVAR SetAPlusOutOfStock
 
             If TaobinName = "" Then
                 Var Seeker.IsLineMember = 0 
@@ -143,38 +142,6 @@
                 EndIf
             EndIf
 
-            If SuperSetOutOfStock = 1 Then
-                If BalanceEssenceTonerOutOfStock = 1 Then
-                    If CleansingGalOutOfStock = 1 Then
-                        If TumbleBottleOutOfStock = 1 Then
-                            If ClearGalOutOfStock = 1 Then
-                                If E_GiftCard100BathOutOfStock = 1 Then
-                                    If ClearGel4mlOutOfStock = 1 Then
-                                        SAVELOG "All reward out of stock skip to normal collect point."
-
-                                        WRITE_FILE "/mnt/sdcard/robinson_beauty_reward_out_of_stock" "1"
-
-                                        If Seeker.CodeChannel = 1 Then
-                                            If Seeker.CollectPointMain = 1 Then
-                                                GETACCEXT Param1 23
-                                                Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
-                                            Else
-                                                Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-                                            EndIf
-                                        Else
-                                            GETACCEXT Param1 23
-                                            Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
-                                        EndIf
-                                    EndIf
-                                EndIf
-                            EndIf
-                        EndIf
-                    EndIf
-                EndIf
-            EndIf
-
-
-
             Var Seeker.PointTaobinStr = ParamCP
             Var Seeker.TNumberTaobinMember = TelephoneNumberX
 

xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml

@@ -70,73 +70,73 @@
 	If PointState[0] = 1 Then
 		Var PointCount = PointCount + 1
         If show_eng = "true" Then
-		    Var taobinImgPoint[0] = "/point1.png"
+            Var taobinImgPoint[0] = "/point_1_en.png"
         Else
-            Var taobinImgPoint[0] = "/point1_en.png"
+		    Var taobinImgPoint[0] = "/point_1.png"
         EndIf
 	EndIf
 	If PointState[1] = 1 Then
 		Var PointCount = PointCount + 1
         If show_eng = "true" Then
-		    Var taobinImgPoint[1] = "/point2.png"
+            Var taobinImgPoint[1] = "/point_2_en.png"
         Else
-            Var taobinImgPoint[1] = "/point2_en.png"
+		    Var taobinImgPoint[1] = "/point_2.png"
         EndIf
 	EndIf
 	If PointState[2] = 1 Then
 		Var PointCount = PointCount + 1
         If show_eng = "true" Then
-		    Var taobinImgPoint[2] = "/point3.png"
+            Var taobinImgPoint[2] = "/point_3_en.png"
         Else
-            Var taobinImgPoint[2] = "/point3_en.png"
+		    Var taobinImgPoint[2] = "/point_3.png"
         EndIf
 	EndIf
 	If PointState[3] = 1 Then
 		Var PointCount = PointCount + 1
         If show_eng = "true" Then
-		    Var taobinImgPoint[3] = "/point4.png"
+            Var taobinImgPoint[3] = "/point_4_en.png"
         Else
-            Var taobinImgPoint[3] = "/point4_en.png"
+		    Var taobinImgPoint[3] = "/point_4.png"
         EndIf
 	EndIf
 	If PointState[4] = 1 Then
 		Var PointCount = PointCount + 1
         If show_eng = "true" Then
-		    Var taobinImgPoint[4] = "/point5.png"
+            Var taobinImgPoint[4] = "/point_5_en.png"
         Else
-            Var taobinImgPoint[4] = "/point5_en.png"
+		    Var taobinImgPoint[4] = "/point_5.png"
         EndIf
 	EndIf
 	If PointState[5] = 1 Then
 		Var PointCount = PointCount + 1
         If show_eng = "true" Then
-		    Var taobinImgPoint[5] = "/point6.png"
+            Var taobinImgPoint[5] = "/point_6_en.png"
         Else
-            Var taobinImgPoint[5] = "/point6_en.png"
+		    Var taobinImgPoint[5] = "/point_6.png"
         EndIf
 	EndIf
 	If PointState[6] = 1 Then
 		Var PointCount = PointCount + 1
         If show_eng = "true" Then
-		    Var taobinImgPoint[6] = "/point7.png"
+            Var taobinImgPoint[6] = "/point_7_en.png"
         Else
-            Var taobinImgPoint[6] = "/point7_en.png"
+		    Var taobinImgPoint[6] = "/point_7.png"
         EndIf
 	EndIf
 	If PointState[7] = 1 Then
 		Var PointCount = PointCount + 1
         If show_eng = "true" Then
-		    Var taobinImgPoint[7] = "/point8.png"
+            Var taobinImgPoint[7] = "/point_8_en.png"
         Else
-            Var taobinImgPoint[7] = "/point8_en.png"
+		    Var taobinImgPoint[7] = "/point_8.png"
         EndIf
 	EndIf
 	If PointState[8] = 1 Then
 		Var PointCount = PointCount + 1
         If show_eng = "true" Then
-		    Var taobinImgPoint[8] = "/point9.png"
+            Var taobinImgPoint[8] = "/point_9_en.png"
         Else
-            Var taobinImgPoint[8] = "/point9_en.png"
+		    Var taobinImgPoint[8] = "/point_9.png"
         EndIf
 	EndIf
 
@@ -146,7 +146,8 @@
 		Var MemberText = "YOUR GORGEOUS STATUS"
         Var MissionText = "SIP, SAVOR, GLOW!"
 
-		Var TaobinLevelDesc1 = PointDiff + " menus to win! Beauty gift from Robinson Beauty."
+		Var TaobinLevelDesc1 = "" + PointDiff
+		Var TaobinLevelDesc1 = TaobinLevelDesc1 + " menus to win! Beauty gift from Robinson Beauty."
 		Var TaobinLevelDesc2 = "Gather all 9 Tao Bin x Robinson Beauty menus to win!"
 
 		Var subTitle_Y = 839
@@ -185,7 +186,7 @@
 
 	
 
-	;Var Timeout = Timeout + 1
+	Var Timeout = Timeout + 1
 	If Timeout > 10 Then
 		Var CurrentPointCheck = "check"
 		Var val3 = "X"
@@ -351,68 +352,68 @@
 
 <Image>
 <X> 237 </X>
-<Y> 1058 </Y>
+<Y> 1089 </Y>
 <Filename> Var( PointRootDir +  taobinImgPoint[0]) </Filename>
 </Image>
 
 <Image>
 <X> 440 </X>
-<Y> 1058 </Y>
+<Y> 1089 </Y>
 <Filename> Var( PointRootDir +  taobinImgPoint[1]) </Filename>
 </Image>
 
 
 <Image>
 <X> 642 </X>
-<Y> 1058 </Y>
+<Y> 1089 </Y>
 <Filename> Var( PointRootDir +  taobinImgPoint[2]) </Filename>
 </Image>
 
 
 <Image>
 <X> 237 </X>
-<Y> 1267 </Y>
+<Y> 1271 </Y>
 <Filename> Var( PointRootDir +  taobinImgPoint[3]) </Filename>
 </Image>
 
 
 <Image>
 <X> 440 </X>
-<Y> 1267 </Y>
+<Y> 1271 </Y>
 <Filename> Var( PointRootDir +  taobinImgPoint[4]) </Filename>
 </Image>
 
 
 <Image>
 <X> 642 </X>
-<Y> 1267 </Y>
+<Y> 1271 </Y>
 <Filename> Var( PointRootDir +  taobinImgPoint[5]) </Filename>
 </Image>
 
 
 <Image>
 <X> 237 </X>
-<Y> 1449 </Y>
+<Y> 1453 </Y>
 <Filename> Var( PointRootDir +  taobinImgPoint[6]) </Filename>
 </Image>
 
 
 <Image>
 <X> 440 </X>
-<Y> 1449 </Y>
+<Y> 1453 </Y>
 <Filename> Var( PointRootDir +  taobinImgPoint[7]) </Filename>
 </Image>
 
 
 <Image>
 <X> 642 </X>
-<Y> 1449 </Y>
+<Y> 1453 </Y>
 <Filename> Var( PointRootDir +  taobinImgPoint[8]) </Filename>
 </Image>
 
 
 <Button>
-<X> 352 </X>
+<X> 403 </X>
 <Y> 1660 </Y>
 <Filename> CloseBtnImg </Filename>
 <FilenamePress> CloseBtnImg </FilenamePress>
@@ -429,7 +430,7 @@
         Var val3 = "X"
         AddData 37 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
 
-        Open "ROOT/taobin_project/xml/event/nam_hom_coconut/page_nam_hom_coconut_random.xml"
+        Open "ROOT/taobin_project/xml/event/robinson_beauty/page_robinson_beauty_random.xml"
     Else
         Var CurrentPointCheck = "check"
         Var val3 = "X"

xml/event/robinson_beauty/page_collect_point_robinson_beauty_error.xml

@@ -103,7 +103,7 @@
 
 	Var ShowCountDownBrewing = CountDownBrewing
 
-	;Var Timeout = Timeout + 1
+	Var Timeout = Timeout + 1
 	If Timeout > 5 Then
 		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 	EndIf

xml/event/robinson_beauty/page_robinson_beauty_random.xml

@@ -144,7 +144,7 @@
             Var MaxRandomIndex = MaxRandomIndex + 1
         EndIf
 
-        If randomOutOfStock = 0 Then
+        If RandomOutOfStock = 0 Then
             Var rewardList[MaxRandomIndex] = "random"
             Var MaxRandomIndex = MaxRandomIndex + 1
             Var rewardList[MaxRandomIndex] = "random"
@@ -267,7 +267,7 @@
        EndIf    
        
 
-       ;Var Timeout = Timeout + 1
+       Var Timeout = Timeout + 1
 
         TimerReset
 	    Refresh
@@ -290,15 +290,15 @@
         <X> 412 </X>
         <Y> 798 </Y>
         <State> SelectingState </State>
-        <Filename> Var( DirImage + "/random_fotune_cookie.png") </Filename>
+        <Filename> Var( DirImage + "/random_fortune_cookie.png") </Filename>
         <EventClick>
-            If ShakeCount <= 5 Then
-                Var ShakeCount = ShakeCount + 1
-            Else
+
+            Var ShakeCount = ShakeCount + 1
+
+            If ShakeCount >= 3 Then
                 Random2 1 9 SelectNumber
                 Function 2
             EndIf
-            Refresh
         </EventClick>
         <Animation>
             <Style> "shake-image" </Style>
@@ -319,105 +319,6 @@
         <Filename> Var( DirImage + "/random_text.png") </Filename>
     </Image>
 
-;   <Image>
-;       <X> 573 </X>
-;       <Y> 932 </Y>
-;       <Width> 40 </Width>
-;       <Height> 72 </Height>
-;       <EventClick> 
-;           Var SelectNumber = 1
-;           Function 2
-;       </EventClick>
-;   </Image>
-;
-;   <Image>
-;       <X> 460 </X>
-;       <Y> 944 </Y>
-;       <Width> 37 </Width>
-;       <Height> 41 </Height>
-;       <EventClick> 
-;           Var SelectNumber = 2
-;           Function 2
-;       </EventClick>
-;   </Image>
-;
-;   <Image>
-;       <X> 593 </X>
-;       <Y> 1056 </Y>
-;       <Width> 37 </Width>
-;       <Height> 68 </Height>
-;       <EventClick> 
-;           Var SelectNumber = 3
-;           Function 2
-;       </EventClick>
-;   </Image>
-;
-;   <Image>
-;       <X> 525 </X>
-;       <Y> 979 </Y>
-;       <Width> 39 </Width>
-;       <Height> 68 </Height>
-;       <EventClick> 
-;           Var SelectNumber = 4
-;           Function 2
-;       </EventClick>
-;   </Image>
-;
-;   <Image>
-;       <X> 445 </X>
-;       <Y> 1101 </Y>
-;       <Width> 40 </Width>
-;       <Height> 68 </Height>
-;       <EventClick> 
-;           Var SelectNumber = 5
-;           Function 2
-;       </EventClick>
-;   </Image>
-;
-;   <Image>
-;       <X> 634 </X>
-;       <Y> 989 </Y>
-;       <Width> 38 </Width>
-;       <Height> 72 </Height>
-;       <EventClick> 
-;           Var SelectNumber = 6
-;           Function 2
-;       </EventClick>
-;   </Image>
-;
-;   <Image>
-;       <X> 495 </X>
-;       <Y> 1051 </Y>
-;       <Width> 40 </Width>
-;       <Height> 67 </Height>
-;       <EventClick> 
-;           Var SelectNumber = 7
-;           Function 2
-;       </EventClick>
-;   </Image>
-;
-;   <Image>
-;       <X> 506 </X>
-;       <Y> 907 </Y>
-;       <Width> 38 </Width>
-;       <Height> 65 </Height>
-;       <EventClick> 
-;           Var SelectNumber = 8
-;           Function 2
-;       </EventClick>
-;   </Image>
-;
-;   <Image>
-;       <X> 412 </X>
-;       <Y> 993 </Y>
-;       <Width> 41 </Width>
-;       <Height> 70 </Height>
-;       <EventClick> 
-;           Var SelectNumber = 9
-;           Function 2
-;       </EventClick>
-;   </Image>
-
     <Function2>
         ; Random coupon
         Var randResultInt = 0
@@ -426,6 +327,7 @@
         DEBUGVAR MaxRandomIndex
         If MaxRandomIndex > 0 Then
             Random2 0 MaxRandomIndex randResultInt
+            DEBUGVAR randResultInt
             Var randResultStr = rewardList[randResultInt] 
         Else
             Var randResultStr = "discount_50"
@@ -473,7 +375,7 @@
             Random2 1 9 SelectNumber
         EndIf
 
-        Var SelectedNumberImage = DirImage + "random_"
+        Var SelectedNumberImage = DirImage + "/random_"
         Var SelectedNumberImage = SelectedNumberImage + SelectNumber
         Var SelectedNumberImage = SelectedNumberImage + ".png"
 
@@ -521,4 +423,8 @@
         Open "ROOT/taobin_project/xml/event/robinson_beauty/page_robinson_beauty_random.xml"
     </EventUnitTest3>
 
+    <EventUnitTest4>
+        Function 2
+    </EventUnitTest4>
+
 </Popup>

xml/event/robinson_beauty/page_robinson_beauty_random_result.xml

@@ -10,7 +10,7 @@
 
         Var DirImage = "ROOT/taobin_project/image/event/robinson_beauty"
 
-        Var RewardBg = DirImage + "/bg_reward.png"
+        Var RewardBg = DirImage + "/reward_bg.png"
 
         If CodeType = "137" Then
             Var RewardText = DirImage + "/reward_lustrous_lipstick_name.png"
@@ -91,7 +91,7 @@
             Var RewardText_Y = 725
             Var RewardImage_X = 137
             Var RewardImage_Y = 748
-            Var RewardBg = DirImage + "/bg_reward_no_line.png"
+            Var RewardBg = DirImage + "/reward_bg_no_line.png"
         EndIf
 
         Var CodeReward = CodeType

xml/page_collect_point_1.xml

@@ -395,14 +395,24 @@
 			EndIf
 		EndIf
 
-		If PepweenCollectPoint = 0 Then
-			GETACCEXT TelephoneNumber 31
-			Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml"  
-		Else
-			GETACCEXT Param1 23
-			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
+		If RobinsonBeautyPro = 1 Then
+			If FromRobinsonBeautyPro = 1 Then
+				If Seeker.CodeChannel = 1 Then
+					If Seeker.CollectPointPromotion = 1 Then
+						GETACCEXT TelephoneNumber 32
+						Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
+					EndIf
+				Else
+					GETACCEXT TelephoneNumber 32
+					Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
+				EndIf
+			EndIf
 		EndIf
 
+
+		GETACCEXT Param1 23
+		Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
+
 	EndIf
 
 	Var Tel_Confirm_Flag = 1
@@ -941,15 +951,24 @@
 				EndIf
 			EndIf
 
-			If PepweenCollectPoint = 0 Then
-				GETACCEXT TelephoneNumber 31
-				Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml"  
-			Else
-				GETACCEXT Param1 23
-				;Open "ROOT/taobin_project/xml/page_catalog.xml"  
-				Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
+			If RobinsonBeautyPro = 1 Then
+				If FromRobinsonBeautyPro = 1 Then
+					If Seeker.CodeChannel = 1 Then
+						If Seeker.CollectPointPromotion = 1 Then
+							GETACCEXT TelephoneNumber 32
+							Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
+						EndIf
+					Else
+						GETACCEXT TelephoneNumber 32
+						Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
+					EndIf
+				EndIf
 			EndIf
 
+			GETACCEXT Param1 23
+			;Open "ROOT/taobin_project/xml/page_catalog.xml"  
+			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
+
 		Else 
 
 			If show_eng = "true" Then 

xml/page_payment_cashOther.xml

@@ -231,78 +231,10 @@
 </EventClick>
 </Button>
 
-
-<Button>
-<X> 440 </X>
-<Y> 965 </Y>
-<State> WalletEnable </State>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_shoppy.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_shoppy.png" </FilenamePress>
-<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_shoppy.png" </FilenameDisable>
-<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-
-	                Var QR_POPUP = "/img_popup2.png"
-					Var LOADING_STATE = "Enable"
-					
-					Var QRCODE99 = ""
-
-					Var FlagQROpened = 1
-					Var alphaState = "Enable"
-					;CoinVending OFF
-					VendingQR ON
-					
-					
-					Var SessionID2 = SelectSlot + ":"
-					Var SessionID2 = SessionID2 + Seeker.ExtendData
-
-					Var CreditAmount1 = ""
-					Var ServiceAmountFlow = ""
-					Var TelephoneNumberQR = "0899999999"
-					Var ServiceType = "coffee"
-					Var ECommerceQR = ""
-					Var ECommerceQR = ECommerceQR + PriceDrink
-					Var ECommerceQR =	ECommerceQR + "/"
-					Var ECommerceQR =	ECommerceQR + DiscountDrink 
-					Var ECommerceQR =	ECommerceQR + "/"
-					Var ECommerceQR =	ECommerceQR + SessionID2 
-					Var ECommerceQR =	ECommerceQR + "/"
-					Var ECommerceQR =	ECommerceQR + SelectDrink 
-					Var ECommerceQR =	ECommerceQR + "/"
-					Var ECommerceQR =	ECommerceQR + "AIR:2/"
-
-					;If  IntVendingCampaign > 0 Then
-					;	Var ECommerceQR =	ECommerceQR + Seeker.VendingCode
-					;	Var ECommerceQR =	ECommerceQR + ":"
-					;	Var ECommerceQR =	ECommerceQR + Seeker.CodeNumber
-					;	Var ECommerceQR =	ECommerceQR + ":"
-					;	Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
-					;EndIf
-					
-					Var ServiceParameter = "max"
-					Var ServiceCharge = 0
-					Var AccountType = "new"
-					Var testservice = "kbank"
-					Var tc = ""
-					Var GetScore = ""
-					Var OperatorName = ""
-					Var SessionID = ""
-
-					GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
-					Var ReqPayInfoFlag = 2
-                    Var ReqPayInfoFromCashOther = 1
-					Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
-
-</EventClick>
-</Button>
-
-
 <Button>
 <X> 441 </X>
 <Y> 741 </Y>
 
-
 <State> WalletEnable </State>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_paotang.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_paotang.png" </FilenamePress>
@@ -366,8 +298,8 @@
 </Button>
 
 <Button>
-<X> 209 </X>
-<Y> 965 </Y>
+<X> 675 </X>
+<Y> 741 </Y>
 <State> WalletEnable </State>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_linepay.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_linepay.png" </FilenamePress>
@@ -430,52 +362,21 @@
 </EventClick>
 </Button>
 
+
+
+
 <Button>
 <X> 209 </X>
-<Y> 1112 </Y>
-<State> "Invisible" </State>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenamePress>
-<FilenameDisable> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenameDisable>
-<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-
-	
-
-</EventClick>
-</Button>
-
-<Button>
-<X> 441 </X>
-<Y> 1112 </Y>
-<State>  "Invisible" </State>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenamePress>
-<FilenameDisable> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenameDisable>
-<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-
-					
-
-</EventClick>
-</Button>
-
-<Button>
-<X> 675 </X>
-<Y> 741 </Y>
-
-
+<Y> 965 </Y>
 <State> WalletEnable </State>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_lazpay.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_lazpay.png" </FilenamePress>
-<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_lazpay.png" </FilenameDisable>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_shoppy.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_shoppy.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_shoppy.png" </FilenameDisable>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-					Var QR_POPUP = "/img_popup10.png"
+	                Var QR_POPUP = "/img_popup2.png"
 					Var LOADING_STATE = "Enable"
 					
 					Var QRCODE99 = ""
@@ -502,7 +403,7 @@
 					Var ECommerceQR =	ECommerceQR + "/"
 					Var ECommerceQR =	ECommerceQR + SelectDrink 
 					Var ECommerceQR =	ECommerceQR + "/"
-					Var ECommerceQR =	ECommerceQR + "LZP:2/"
+					Var ECommerceQR =	ECommerceQR + "AIR:2/"
 
 					;If  IntVendingCampaign > 0 Then
 					;	Var ECommerceQR =	ECommerceQR + Seeker.VendingCode
@@ -522,7 +423,7 @@
 					Var SessionID = ""
 
 					GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
-					Var ReqPayInfoFlag = 6
+					Var ReqPayInfoFlag = 2
                     Var ReqPayInfoFromCashOther = 1
 					Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
 
@@ -530,7 +431,7 @@
 </Button>
 
 <Button>
-<X> 675 </X>
+<X> 440 </X>
 <Y> 965 </Y>
 <State> WalletEnable </State>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_maxme.png" </Filename>
@@ -595,10 +496,8 @@
 </Button>
 
 <Button>
-<X> 208 </X>
-<Y> 1189 </Y>
-
-
+<X> 675 </X>
+<Y> 965 </Y>
 <State> WalletEnable </State>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_wechat.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_wechat.png" </FilenamePress>
@@ -661,8 +560,9 @@
 </EventClick>
 </Button>
 
+
 <Button>
-<X> 440 </X>
+<X> 208 </X>
 <Y> 1189 </Y>
 <State> WalletEnable </State>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_make.png" </Filename>
@@ -729,7 +629,7 @@
 </Button>
 
 <Button>
-<X> 675 </X>
+<X> 440 </X>
 <Y> 1189 </Y>
 <State>  "Enable" </State>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_cashAli.png" </Filename>
@@ -793,31 +693,9 @@
 </EventClick>
 </Button>
 
-
-
 <Button>
-<X> 673 </X>
-<Y> 1112 </Y>
-<State> "Invisible" </State>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_ccard1.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_ccard1.png" </FilenamePress>
-<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_ccard1.png" </FilenameDisable>
-<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-
-					Var QR_POPUP = "/img_popup8.png"
-					Var alphaState = "Enable"
-					Coin CARD
-                    Var ReqPayInfoFromCashOther = 2
-					Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
-
-</EventClick>
-</Button>
-
-<Button>
-<X> 208 </X>
-<Y> 1413 </Y>
+<X> 675 </X>
+<Y> 1189 </Y>
 <State>  WalletEnable </State>
 <Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_cashUnion.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_cashUnion.png" </FilenamePress>
@@ -878,6 +756,23 @@
                     Var ReqPayInfoFromCashOther = 1
 					Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
 
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 208 </X>
+<Y> 1413 </Y>
+<State>  "Enable" </State>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png" </FilenameDisable>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+					
+
 </EventClick>
 </Button>
 
@@ -913,6 +808,28 @@
 </EventClick>
 </Button>
 
+<Button>
+<X> 673 </X>
+<Y> 1112 </Y>
+<State> "Invisible" </State>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_pay_with_ccard1.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_pay_with_ccard1.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_pay_with_ccard1.png" </FilenameDisable>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+					Var QR_POPUP = "/img_popup8.png"
+					Var alphaState = "Enable"
+					Coin CARD
+                    Var ReqPayInfoFromCashOther = 2
+					Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+
+</EventClick>
+</Button>
+
+
+
 
 
 <Button>