Pro nam hom change

xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml

@@ -97,6 +97,8 @@
             Var CleansingGelOutOfStock = Ext1f
             Var TumbleBottleOutOfStock = Ext1g
             Var ClearGelOutOfStock = Ext1h
+            Var E_GiftCard100BathOutOfStock = Ext1i
+            Var ClearGel4mlOutOfStock = Ext1j
 
             ;DEBUG
             ;Var SuperSetOutOfStock = 1
@@ -148,20 +150,24 @@
                     If CleansingGalOutOfStock = 1 Then
                         If TumbleBottleOutOfStock = 1 Then
                             If ClearGalOutOfStock = 1 Then
-                                SAVELOG "All reward out of stock skip to normal collect point."
+                                If E_GiftCard100BathOutOfStock = 1 Then
+                                    If ClearGel4mlOutOfStock = 1 Then
+                                        SAVELOG "All reward out of stock skip to normal collect point."
 
-                                WRITE_FILE "/mnt/sdcard/nam_hom_coconut_reward_out_of_stock" "1"
+                                        WRITE_FILE "/mnt/sdcard/nam_hom_coconut_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"
+                                        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
-                                Else
-                                    GETACCEXT Param1 23
-                                    Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
                                 EndIf
                             EndIf
                         EndIf

xml/event/nam_hom_coconut/page_nam_hom_coconut_random.xml

@@ -10,53 +10,7 @@
 
         Var DirImage = "ROOT/taobin_project/image/event/nam_hom_coconut/random"
 
-        Var RandomStyle = 0
-        Random2 0 2 RandomStyle
-
-        If RandomStyle = 0 Then
-            Var Text_X = 241
-            Var Text_Y = 1113
-
-            Var BagImg = DirImage + "/cura-md-bag_md.png"
-            
-            Var Bag1_X = 75
-            Var Bag1_Y = 715
-
-            Var Bag2_X = 424
-            Var Bag2_Y = 715
-
-            Var Bag3_X = 774
-            Var Bag3_Y = 715
-
-            Var Bag4_X = 249
-            Var Bag4_Y = 1338
-
-            Var Bag5_X = 599
-            Var Bag5_Y = 1338
-
-        Else
-
-            Var Text_X = 256
-            Var Text_Y = 628
-
-            Var BagImg = DirImage + "/cura-md-bag_lg.png"
-            
-            Var Bag1_X = 75
-            Var Bag1_Y = 806
-
-            Var Bag2_X = 713
-            Var Bag2_Y = 806
-
-            Var Bag3_X = 394
-            Var Bag3_Y = 1129
-
-            Var Bag4_X = 75
-            Var Bag4_Y = 1471
-
-            Var Bag5_X = 713
-            Var Bag5_Y = 1471
-
-        EndIf
+        Var BagImg = DirImage + "/cura-md-bag.png"
 
         Var MaxRandomIndex = 0
 
@@ -79,6 +33,68 @@
             Var MaxRandomIndex = MaxRandomIndex + 1
             Var rewardList[MaxRandomIndex] = "clear_gel"
             Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
         EndIf
 
         If TumbleBottleOutOfStock = 0 Then
@@ -92,6 +108,26 @@
             Var MaxRandomIndex = MaxRandomIndex + 1
             Var rewardList[MaxRandomIndex] = "tumble_bottle"
             Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "tumble_bottle"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "tumble_bottle"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "tumble_bottle"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "tumble_bottle"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "tumble_bottle"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "tumble_bottle"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "tumble_bottle"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "tumble_bottle"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "tumble_bottle"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "tumble_bottle"
+            Var MaxRandomIndex = MaxRandomIndex + 1
         EndIf
 
         If CleansingGelOutOfStock = 0 Then
@@ -101,6 +137,16 @@
             Var MaxRandomIndex = MaxRandomIndex + 1
             Var rewardList[MaxRandomIndex] = "cleansing_gel"
             Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "cleansing_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "cleansing_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "cleansing_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "cleansing_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "cleansing_gel"
+            Var MaxRandomIndex = MaxRandomIndex + 1
         EndIf
 
         If BalanceEssenceTonerOutOfStock = 0 Then
@@ -108,11 +154,85 @@
             Var MaxRandomIndex = MaxRandomIndex + 1
             Var rewardList[MaxRandomIndex] = "balance_essence_toner"
             Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "balance_essence_toner"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "balance_essence_toner"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "balance_essence_toner"
+            Var MaxRandomIndex = MaxRandomIndex + 1
         EndIf
 
         If SuperSetOutOfStock = 0 Then
             Var rewardList[MaxRandomIndex] = "super_set"
             Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "super_set"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+        EndIf
+
+        If E_GiftCard100BathOutOfStock = 0 Then
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+        EndIf
+
+        If ClearGel4mlOutOfStock = 0 Then
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
+            Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
+            Var MaxRandomIndex = MaxRandomIndex + 1
         EndIf
 
         
@@ -151,14 +271,14 @@
     </Image>
 
     <Image>
-        <X> Text_X </X>
-        <Y> Text_Y </Y>
+        <X> 220 </X>
+        <Y> 627 </Y>
         <Filename> Var( DirImage + "/random_text.png") </Filename>
     </Image>
 
     <Button>
-        <X> Bag1_X </X>
-        <Y> Bag1_Y </Y>
+        <X> 410 </X>
+        <Y> 800 </Y>
         <Filename> BagImg </Filename>
         <FilenamePress> BagImg </FilenamePress>
         <EventClick>
@@ -167,8 +287,8 @@
     </Button>
 
     <Button>
-        <X> Bag2_X </X>
-        <Y> Bag2_Y </Y>
+        <X> 739 </X>
+        <Y> 933 </Y>
         <Filename> BagImg </Filename>
         <FilenamePress> BagImg </FilenamePress>
         <EventClick>
@@ -177,8 +297,8 @@
     </Button>
 
     <Button>
-        <X> Bag3_X </X>
-        <Y> Bag3_Y </Y>
+        <X> 739 </X>
+        <Y> 1364 </Y>
         <Filename> BagImg </Filename>
         <FilenamePress> BagImg </FilenamePress>
         <EventClick>
@@ -187,8 +307,8 @@
     </Button>
 
     <Button>
-        <X> Bag4_X </X>
-        <Y> Bag4_Y </Y>
+        <X> 410 </X>
+        <Y> 1532 </Y>
         <Filename> BagImg </Filename>
         <FilenamePress> BagImg </FilenamePress>
         <EventClick>
@@ -197,8 +317,28 @@
     </Button>
 
     <Button>
-        <X> Bag5_X </X>
-        <Y> Bag5_Y </Y>
+        <X> 68 </X>
+        <Y> 1364 </Y>
+        <Filename> BagImg </Filename>
+        <FilenamePress> BagImg </FilenamePress>
+        <EventClick>
+            Function 2
+        </EventClick>
+    </Button>
+
+    <Button>
+        <X> 68 </X>
+        <Y> 933 </Y>
+        <Filename> BagImg </Filename>
+        <FilenamePress> BagImg </FilenamePress>
+        <EventClick>
+            Function 2
+        </EventClick>
+    </Button>
+
+    <Button>
+        <X> 410 </X>
+        <Y> 1167 </Y>
         <Filename> BagImg </Filename>
         <FilenamePress> BagImg </FilenamePress>
         <EventClick>
@@ -236,6 +376,14 @@
             Var CodeType = "134"
         EndIf
 
+        If randResultStr = "e_gift_card_100bath" Then
+            Var CodeType = "135"
+        EndIf
+
+        If randResultStr = "clear_gel_4ml" Then
+            Var CodeType = "136"
+        EndIf
+
 
         DEBUGVAR randResultInt
         DEBUGVAR randResultStr

xml/event/nam_hom_coconut/page_nam_hom_coconut_random_result.xml

@@ -45,6 +45,20 @@
             Var RewardImage_Y = 864
         EndIf
 
+        If CodeType = "135" Then
+            Var RewardText = DirImage + "/e_gift_card_100_bath_reward_text.png"
+            Var RewardImage = DirImage + "/e_gift_card_100_bath_reward.png"
+            Var RewardImage_X = 254
+            Var RewardImage_Y = 805
+        EndIf
+
+        If CodeType = "136" Then
+            Var RewardText = DirImage + "/clear_gel_4_ml_reward_text.png"
+            Var RewardImage = DirImage + "/clear_gel_4_ml_reward.png"
+            Var RewardImage_X = 267
+            Var RewardImage_Y = 808
+        EndIf
+
         Var AddData = 0
 
         Var CodeReward = CodeType
@@ -71,19 +85,25 @@
                 Var BalanceEssenceTonerRemain = RemainRewardSpl[1]
                 Var CleansingGalRemain = RemainRewardSpl[2]
                 Var TumbleBottleRemain = RemainRewardSpl[3]
-                Var ClearGalRemain = RemainRewardSpl[4]
+                Var ClearGelRemain = RemainRewardSpl[4]
+                Var E_GiftCard100BathRemain = RemainRewardSpl[5]
+                Var ClearGel4mlRemain = RemainRewardSpl[6]
 
                 INT SuperSetRemain
                 INT BalanceEssenceTonerRemain
                 INT CleansingGalRemain
                 INT TumbleBottleRemain
-                INT ClearGalRemain
+                INT ClearGelRemain
+                INT E_GiftCard100BathRemain
+                INT ClearGel4mlRemain
                 
                 Var SumNamHomCoconutRemainReward = SuperSetRemain
                 Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + BalanceEssenceTonerRemain
                 Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + CleansingGalRemain
                 Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + TumbleBottleRemain
-                Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGalRemain
+                Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGelRemain
+                Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + E_GiftCard100BathRemain
+                Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGel4mlRemain
 
                 If SumNamHomCoconutRemainReward = 0 Then
                     SAVELOG "NamHomCoconutPro: All reward out of stock"

xml/event/tricker.ev

@@ -109,6 +109,7 @@ Var FromNamHomCoconutPro = 0
 Var NamHomCoconutRewardOutOfStock = 0
 
 Var NewCollectPoint = 1
+Var ShouldCollectPromotionPoint = 0
 
 Var NewFlowPaymentCode = 0
 
@@ -439,3 +440,10 @@ EndIf
 
 DEBUGVAR FreePowerup
 
+
+
+; Control collect promotion point behavior 
+
+If NamHomCoconutPro = 1 Then
+	Var ShouldCollectPromotionPoint = 1
+EndIf

xml/page_board.xml

@@ -1099,19 +1099,25 @@
 			Var BalanceEssenceTonerRemain = RemainRewardSpl[1]
 			Var CleansingGalRemain = RemainRewardSpl[2]
 			Var TumbleBottleRemain = RemainRewardSpl[3]
-			Var ClearGalRemain = RemainRewardSpl[4]
+			Var ClearGelRemain = RemainRewardSpl[4]
+			Var E_GiftCard100BathRemain = RemainRewardSpl[5]
+			Var ClearGel4mlRemain = RemainRewardSpl[6]
 
 			INT SuperSetRemain
 			INT BalanceEssenceTonerRemain
 			INT CleansingGalRemain
 			INT TumbleBottleRemain
-			INT ClearGalRemain
+			INT ClearGelRemain
+			INT E_GiftCard100BathRemain
+			INT ClearGel4mlRemain
 			
 			Var SumNamHomCoconutRemainReward = SuperSetRemain
 			Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + BalanceEssenceTonerRemain
 			Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + CleansingGalRemain
 			Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + TumbleBottleRemain
-			Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGalRemain
+			Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGelRemain
+			Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + E_GiftCard100BathRemain
+			Var SumNamHomCoconutRemainReward = SumNamHomCoconutRemainReward + ClearGel4mlRemain
 
 			If ShouldShowNamHomCoconutRemainReward = 1 Then
 				Var ShowNamHomCoconutRemainReward = "Enable"

xml/page_check_member.xml

@@ -130,6 +130,11 @@
 			INT CoffeePointRank
 			Var CoffeePointRankTmp = CoffeePointRank
 
+			If CheckMemberPageCampaign = 1 Then
+				Var luckeyDrawTicket = Ext1h
+				INT luckeyDrawTicket
+			EndIf
+
 
 			GETACCEXT TelephoneNumber 15
 

xml/page_check_member1.xml

@@ -84,13 +84,18 @@
 
 			Var TNumberTaobinMemberXXX = TelephoneNumber
 
-			
-
 
 			Var CoffeePointRank = Ext1b
 			INT CoffeePointRank
 			Var CoffeePointRankTmp = CoffeePointRank
 
+
+			If CheckMemberPageCampaign = 1 Then
+				Var luckeyDrawTicket = Ext1h
+				INT luckeyDrawTicket
+			EndIf
+
+
 			Var Ext1a =  ""
             Var Ext1b =  ""
             Var Ext1c =  ""

xml/page_check_member2.xml

@@ -498,6 +498,10 @@
                 Var CouponNameA = "/imgCoupon121.png"
             EndIf
 
+            If CouponTypeA = "135" Then
+                Var CouponNameA = "/imgCouponMKP1.png"
+            EndIf
+
             INT CouponExireA_D
             INT CouponExireA_Y
             Var CouponExireA_Y = CouponExireA_Y + 0
@@ -616,6 +620,10 @@
                 Var CouponNameB = "/imgCoupon121.png"
             EndIf
 
+            If CouponTypeB = "135" Then
+                Var CouponNameB = "/imgCouponMKP1.png"
+            EndIf
+
             INT CouponExireB_D
             INT CouponExireB_Y
             Var CouponExireB_Y = CouponExireB_Y + 0
@@ -740,6 +748,10 @@
                 Var CouponNameA = "/imgCoupon121.png"
             EndIf
 
+            If CouponTypeA = "135" Then
+                Var CouponNameA = "/imgCouponMKP1.png"
+            EndIf
+
             INT CouponExireA_D
             INT CouponExireA_Y
             Var CouponExireA_Y = CouponExireA_Y + 543
@@ -857,6 +869,10 @@
                 Var CouponNameB = "/imgCoupon121.png"
             EndIf
 
+            If CouponTypeB = "135" Then
+                Var CouponNameB = "/imgCouponMKP1.png"
+            EndIf
+
             INT CouponExireB_D
             INT CouponExireB_Y
             Var CouponExireB_Y = CouponExireB_Y + 543

xml/page_check_member2_campaign.xml

@@ -2,7 +2,7 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
+<Background> "0xDFD9D6" </Background>
 <Volume> SoundVolume </Volume>
 
 <EventOpen>
@@ -485,6 +485,10 @@
             Var CouponNameA = "/imgCoupon121.png"
         EndIf
 
+        If CouponTypeA = "135" Then
+            Var CouponNameA = "/imgCouponMKP1.png"
+        EndIf
+
         INT CouponExireA_D
         INT CouponExireA_Y
         Var CouponExireA_Y = CouponExireA_Y + 0
@@ -552,6 +556,10 @@
             Var CouponNameB = "/imgCoupon121.png"
         EndIf
 
+        If CouponTypeB = "135" Then
+            Var CouponNameB = "/imgCouponMKP1.png"
+        EndIf
+
         INT CouponExireB_D
         INT CouponExireB_Y
         Var CouponExireB_Y = CouponExireB_Y + 0
@@ -689,8 +697,7 @@
     INT TaobinCredit
 	Var TaobinCreditStr !assigned StringFmt( TaobinCredit, DisplayFormat, PreScaleConvertShow )
 
-    Var LuckeyDrawTicketFormat = "%03.0f"
-    Var luckyDrawTicket = 16
+    Var LuckyDrawTicketFormat = "%03.0f"
 
     If SystemDateMonthInt = 6 Then
         If SystemDateDayInt >= 17 Then
@@ -1052,7 +1059,7 @@
     <Size> 64 </Size>
     <Color> 0x3F2C20 </Color>
     <Align> center-vertical-horizontal </Align>
-    <Value> StringFmt( luckyDrawTicket , LuckeyDrawTicketFormat, PreScaleConvertShow) </Value>
+    <Value> StringFmt( luckyDrawTicket , LuckyDrawTicketFormat, PreScaleConvertShow) </Value>
 </Text>
 
 

xml/page_collect_point_2.xml

@@ -192,10 +192,14 @@
 
 					;inter-xml-open
 					If CountryName = "Australia" Then
-						;Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
-						;Open pageCollectPoint
+
+						If NewCollectPointFlag = 1 Then
+							Var pageCollectPoint = CountryRootPath + "/xml/page_collect_point_3.lxml"
+							Open pageCollectPoint
+						Else
+							Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+						EndIf
 						
-						Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
 					EndIf
 
 					;inter-xml-open

xml/page_payment.xml

@@ -88,7 +88,7 @@
 	EndIf
 
 	If FromWednesdayMelonPro = 1 Then
-		Var PriceDrink = OriginalPrice
+		Var PriceDrink = OriginalPrice + TOPPING_PRICE
 	EndIf
 
 	If FromPowerUpPro = 1 Then

xml/page_payment_code.xml

@@ -231,8 +231,13 @@
 
 					If ShouldCollectPoint = 1 Then
 						Var Seeker.CollectPointMain = 1
+					
+						If ShouldCollectPromotionPoint = 1 Then
+							Var Seeker.CollectPointPromotion = 1
+						EndIf
 					EndIf
 
+
 					;Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
 					Var Seeker.VendingCampaign = PayAmount
 					Var Seeker.FreeVendingCampaign = 1
@@ -267,6 +272,10 @@
 					If ShouldCollectPoint = 1 Then
 						Var Seeker.CollectPointMain = 1
 					EndIf
+
+					If ShouldCollectPromotionPoint = 1 Then
+						Var Seeker.CollectPointPromotion = 1
+					EndIf
 				EndIf
 
 

xml/page_thankyou.xml

@@ -270,7 +270,9 @@
 	If CountDownThankyou = 0 Then 
 		
 		If IgnoreNetCore = "true" Then 
-			Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
+			;Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
+			Var testPageCollectPointAUS = CountryRootPath + "/xml/page_collect_point_3.lxml"
+			Open testPageCollectPointAUS
 		EndIf
 
 		If TestLoopMakeDrink = 1 Then