diff --git a/image/event/robinson_beauty/random_10.png b/image/event/robinson_beauty/random_10.png new file mode 100644 index 00000000..70167ca4 Binary files /dev/null and b/image/event/robinson_beauty/random_10.png differ diff --git a/image/event/robinson_beauty/random_fortune_cookie.png b/image/event/robinson_beauty/random_fortune_cookie.png index 5ac7db97..05b8ca38 100644 Binary files a/image/event/robinson_beauty/random_fortune_cookie.png and b/image/event/robinson_beauty/random_fortune_cookie.png differ diff --git a/image/event/robinson_beauty/reward_popmart_labubu_v2.png b/image/event/robinson_beauty/reward_popmart_labubu_v2.png new file mode 100644 index 00000000..9002dc29 Binary files /dev/null and b/image/event/robinson_beauty/reward_popmart_labubu_v2.png differ diff --git a/image/event/robinson_beauty/reward_popmart_labubu_v2_name.png b/image/event/robinson_beauty/reward_popmart_labubu_v2_name.png new file mode 100644 index 00000000..a8116c3c Binary files /dev/null and b/image/event/robinson_beauty/reward_popmart_labubu_v2_name.png differ diff --git a/image/event/robinson_beauty/robinson_beauty_en.png b/image/event/robinson_beauty/robinson_beauty_en.png index e1549ae5..66264801 100644 Binary files a/image/event/robinson_beauty/robinson_beauty_en.png and b/image/event/robinson_beauty/robinson_beauty_en.png differ diff --git a/image/event/robinson_beauty/robinson_beauty_th.png b/image/event/robinson_beauty/robinson_beauty_th.png index 748ae053..34991db7 100644 Binary files a/image/event/robinson_beauty/robinson_beauty_th.png and b/image/event/robinson_beauty/robinson_beauty_th.png differ diff --git a/inter/aus/xml/page_check_member.lxml b/inter/aus/xml/page_check_member.lxml index 588ba958..938999aa 100644 --- a/inter/aus/xml/page_check_member.lxml +++ b/inter/aus/xml/page_check_member.lxml @@ -536,12 +536,8 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - EndIf + Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev" + TRY verifyNumberEV If Tel2DFlag = 1 Then diff --git a/inter/aus/xml/page_collect_point_1.lxml b/inter/aus/xml/page_collect_point_1.lxml index 548759b4..4ef0f18f 100644 --- a/inter/aus/xml/page_collect_point_1.lxml +++ b/inter/aus/xml/page_collect_point_1.lxml @@ -553,12 +553,8 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - EndIf + Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev" + TRY verifyNumberEV If Tel2DFlag = 1 Then diff --git a/inter/aus/xml/verify_number.ev b/inter/aus/xml/verify_number.ev new file mode 100644 index 00000000..a13c31aa --- /dev/null +++ b/inter/aus/xml/verify_number.ev @@ -0,0 +1,8 @@ + + +Var Tel2D = TelephoneNumber +Trim Tel2D 1 + +If Tel2D = "0" Then + Var Tel2DFlag = 1 +EndIf \ No newline at end of file diff --git a/inter/hkg/xml/page_check_member.lxml b/inter/hkg/xml/page_check_member.lxml index 8f320cdd..8d92a79f 100644 --- a/inter/hkg/xml/page_check_member.lxml +++ b/inter/hkg/xml/page_check_member.lxml @@ -536,17 +536,8 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - Else - ; inter-accept-no-zero - If CountryName = "HongKong" Then - Var Tel2DFlag = 1 - EndIf - EndIf + Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev" + TRY verifyNumberEV If Tel2DFlag = 1 Then diff --git a/inter/hkg/xml/page_collect_point_1.lxml b/inter/hkg/xml/page_collect_point_1.lxml index d6638ca1..af396cdf 100644 --- a/inter/hkg/xml/page_collect_point_1.lxml +++ b/inter/hkg/xml/page_collect_point_1.lxml @@ -852,17 +852,8 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - Else - ; inter-accept-no-zero - If CountryName = "HongKong" Then - Var Tel2DFlag = 1 - EndIf - EndIf + Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev" + TRY verifyNumberEV If Tel2DFlag = 1 Then diff --git a/inter/hkg/xml/verify_number.ev b/inter/hkg/xml/verify_number.ev new file mode 100644 index 00000000..e06312c3 --- /dev/null +++ b/inter/hkg/xml/verify_number.ev @@ -0,0 +1,3 @@ + +; inter-accept-no-zero +Var Tel2DFlag = 1 \ No newline at end of file diff --git a/inter/mys/xml/page_check_member.lxml b/inter/mys/xml/page_check_member.lxml index 4bc11fab..82be188a 100644 --- a/inter/mys/xml/page_check_member.lxml +++ b/inter/mys/xml/page_check_member.lxml @@ -536,12 +536,8 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - EndIf + Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev" + TRY verifyNumberEV If Tel2DFlag = 1 Then diff --git a/inter/mys/xml/verify_number.ev b/inter/mys/xml/verify_number.ev new file mode 100644 index 00000000..006e1d2e --- /dev/null +++ b/inter/mys/xml/verify_number.ev @@ -0,0 +1,7 @@ + +Var Tel2D = TelephoneNumber +Trim Tel2D 1 + +If Tel2D = "0" Then + Var Tel2DFlag = 1 +EndIf \ No newline at end of file diff --git a/inter/sgp/xml/page_check_member.lxml b/inter/sgp/xml/page_check_member.lxml index 34980565..3e2db61b 100644 --- a/inter/sgp/xml/page_check_member.lxml +++ b/inter/sgp/xml/page_check_member.lxml @@ -536,17 +536,8 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - Else - ; inter-accept-no-zero - If CountryName = "Singapore" Then - Var Tel2DFlag = 1 - EndIf - EndIf + Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev" + TRY verifyNumberEV If Tel2DFlag = 1 Then diff --git a/inter/sgp/xml/page_collect_point_1.lxml b/inter/sgp/xml/page_collect_point_1.lxml index 6247594d..6d9383dd 100644 --- a/inter/sgp/xml/page_collect_point_1.lxml +++ b/inter/sgp/xml/page_collect_point_1.lxml @@ -911,17 +911,8 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - Else - ; inter-accept-no-zero - If CountryName = "Singapore" Then - Var Tel2DFlag = 1 - EndIf - EndIf + Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev" + TRY verifyNumberEV If Tel2DFlag = 1 Then diff --git a/inter/sgp/xml/verify_number.ev b/inter/sgp/xml/verify_number.ev new file mode 100644 index 00000000..e06312c3 --- /dev/null +++ b/inter/sgp/xml/verify_number.ev @@ -0,0 +1,3 @@ + +; inter-accept-no-zero +Var Tel2DFlag = 1 \ No newline at end of file diff --git a/inter/uae_dubai/xml/page_check_member.lxml b/inter/uae_dubai/xml/page_check_member.lxml index b2b3da62..6b4a9ca5 100644 --- a/inter/uae_dubai/xml/page_check_member.lxml +++ b/inter/uae_dubai/xml/page_check_member.lxml @@ -536,12 +536,8 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - EndIf + Var verifyNumberEV = CountryRootPath + "/xml/verify_number.ev" + TRY verifyNumberEV If Tel2DFlag = 1 Then diff --git a/inter/uae_dubai/xml/verify_number.ev b/inter/uae_dubai/xml/verify_number.ev new file mode 100644 index 00000000..006e1d2e --- /dev/null +++ b/inter/uae_dubai/xml/verify_number.ev @@ -0,0 +1,7 @@ + +Var Tel2D = TelephoneNumber +Trim Tel2D 1 + +If Tel2D = "0" Then + Var Tel2DFlag = 1 +EndIf \ No newline at end of file diff --git a/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml b/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml index 874fc138..8e7640da 100644 --- a/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml +++ b/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml @@ -452,12 +452,7 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - EndIf + TRY "ROOT/taobin_project/xml/verify_number.ev" If Tel2DFlag = 1 Then diff --git a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml index 41188fdb..45160c82 100644 --- a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml +++ b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml @@ -100,6 +100,7 @@ Var DoubleSerumOutOfStock = Ext1x9 Var SetAOutOfStock = Ext1x10 Var SetAPlusOutOfStock = Ext1x11 + Var PopmartLabubuV2OutOfStock = Ext1x12 DEBUGVAR LustrousOutOfStock @@ -110,6 +111,7 @@ DEBUGVAR DoubleSerumOutOfStock DEBUGVAR SetAOutOfStock DEBUGVAR SetAPlusOutOfStock + DEBUGVAR PopmartLabubuV2OutOfStock If TaobinName = "" Then Var Seeker.IsLineMember = 0 diff --git a/xml/event/robinson_beauty/page_robinson_beauty_random.xml b/xml/event/robinson_beauty/page_robinson_beauty_random.xml index 36518cc1..3801f2f7 100644 --- a/xml/event/robinson_beauty/page_robinson_beauty_random.xml +++ b/xml/event/robinson_beauty/page_robinson_beauty_random.xml @@ -26,10 +26,6 @@ Var MaxRandomIndex = MaxRandomIndex + 1 Var rewardList[MaxRandomIndex] = "set_a_plus" Var MaxRandomIndex = MaxRandomIndex + 1 - Var rewardList[MaxRandomIndex] = "set_a_plus" - Var MaxRandomIndex = MaxRandomIndex + 1 - Var rewardList[MaxRandomIndex] = "set_a_plus" - Var MaxRandomIndex = MaxRandomIndex + 1 EndIf If SetAOutOfStock = 0 Then @@ -243,6 +239,13 @@ Var MaxRandomIndex = MaxRandomIndex + 1 EndIf + If PopmartLabubuV2OutOfStock = 0 Then + Var rewardList[MaxRandomIndex] = "labubu" + Var MaxRandomIndex = MaxRandomIndex + 1 + Var rewardList[MaxRandomIndex] = "labubu" + Var MaxRandomIndex = MaxRandomIndex + 1 + EndIf + @@ -287,8 +290,8 @@ ; Fotune cookie - 412 - 798 + 404 + 845 SelectingState Var( DirImage + "/random_fortune_cookie.png") @@ -370,9 +373,13 @@ Var CodeType = "145" EndIf + If randResultStr = "labubu" Then + Var CodeType = "146" + EndIf + If SelectNumber = 0 Then - Random2 1 9 SelectNumber + Random2 1 10 SelectNumber EndIf Var SelectedNumberImage = DirImage + "/random_" diff --git a/xml/event/robinson_beauty/page_robinson_beauty_random_result.xml b/xml/event/robinson_beauty/page_robinson_beauty_random_result.xml index 3ccd93ea..4cb51b39 100644 --- a/xml/event/robinson_beauty/page_robinson_beauty_random_result.xml +++ b/xml/event/robinson_beauty/page_robinson_beauty_random_result.xml @@ -94,6 +94,15 @@ Var RewardBg = DirImage + "/reward_bg_no_line.png" EndIf + If CodeType = "146" Then + Var RewardText = DirImage + "/reward_popmart_labubu_v2_name.png" + Var RewardImage = DirImage + "/reward_popmart_labubu_v2.png" + Var RewardText_X = 173 + Var RewardText_Y = 533 + Var RewardImage_X = 277 + Var RewardImage_Y = 901 + EndIf + Var CodeReward = CodeType Var var2 = "X" Var var3 = "X" diff --git a/xml/page_check_member.xml b/xml/page_check_member.xml index 4c89e929..265b9e70 100644 --- a/xml/page_check_member.xml +++ b/xml/page_check_member.xml @@ -576,12 +576,7 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - EndIf + TRY "ROOT/taobin_project/xml/verify_number.ev" If Tel2DFlag = 1 Then diff --git a/xml/page_collect_point_1-3.xml b/xml/page_collect_point_1-3.xml index d83589a3..8e2e7585 100644 --- a/xml/page_collect_point_1-3.xml +++ b/xml/page_collect_point_1-3.xml @@ -555,12 +555,7 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - EndIf + TRY "ROOT/taobin_project/xml/verify_number.ev" diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 08c7b287..a6f016fe 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -827,12 +827,7 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - EndIf + TRY "ROOT/taobin_project/xml/verify_number.ev" If Tel2DFlag = 1 Then diff --git a/xml/page_identityMember_number.xml b/xml/page_identityMember_number.xml index 912f459a..230b637b 100644 --- a/xml/page_identityMember_number.xml +++ b/xml/page_identityMember_number.xml @@ -495,12 +495,7 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - EndIf + TRY "ROOT/taobin_project/xml/verify_number.ev" If Tel2DFlag = 1 Then diff --git a/xml/page_identityMember_otp.xml b/xml/page_identityMember_otp.xml index 591a8639..63067f55 100644 --- a/xml/page_identityMember_otp.xml +++ b/xml/page_identityMember_otp.xml @@ -411,16 +411,6 @@ If Tel_Confirm_Flag = 1 Then - Var Tel2DFlag = 0 - - Var Tel2D = PinNumber - Trim Tel2D 1 - - - Var Tel2DFlag = 1 - - - If PinNumber = OtpCode Then Open "ROOT/taobin_project/xml/page_identityMember_consent.xml" Else diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml index 8ae7cf58..062ebb9e 100644 --- a/xml/page_payment_credit.xml +++ b/xml/page_payment_credit.xml @@ -633,12 +633,7 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - EndIf + TRY "ROOT/taobin_project/xml/verify_number.ev" If Tel2DFlag = 1 Then diff --git a/xml/page_payment_storeCredit.xml b/xml/page_payment_storeCredit.xml index 40f072e5..2c2e41fc 100644 --- a/xml/page_payment_storeCredit.xml +++ b/xml/page_payment_storeCredit.xml @@ -511,12 +511,7 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - EndIf + TRY "ROOT/taobin_project/xml/verify_number.ev" If Tel2DFlag = 1 Then diff --git a/xml/page_topup_credit-ChooseNumber.xml b/xml/page_topup_credit-ChooseNumber.xml index 353846af..e3a3df8f 100644 --- a/xml/page_topup_credit-ChooseNumber.xml +++ b/xml/page_topup_credit-ChooseNumber.xml @@ -226,12 +226,7 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - EndIf + TRY "ROOT/taobin_project/xml/verify_number.ev" If Tel2DFlag = 1 Then diff --git a/xml/page_topup_credit.xml b/xml/page_topup_credit.xml index 6d331be8..1adde8fe 100644 --- a/xml/page_topup_credit.xml +++ b/xml/page_topup_credit.xml @@ -593,12 +593,7 @@ Var Tel2DFlag = 0 - Var Tel2D = TelephoneNumber - Trim Tel2D 1 - - If Tel2D = "0" Then - Var Tel2DFlag = 1 - EndIf + TRY "ROOT/taobin_project/xml/verify_number.ev" If Tel2DFlag = 1 Then diff --git a/xml/verify_number.ev b/xml/verify_number.ev new file mode 100644 index 00000000..297048ec --- /dev/null +++ b/xml/verify_number.ev @@ -0,0 +1,20 @@ + + +Var Tel2D = TelephoneNumber +Trim Tel2D 2 + +If Tel2D = "06" Then + Var Tel2DFlag = 1 +EndIf + +If Tel2D = "07" Then + Var Tel2DFlag = 1 +EndIf + +If Tel2D = "08" Then + Var Tel2DFlag = 1 +EndIf + +If Tel2D = "09" Then + Var Tel2DFlag = 1 +EndIf \ No newline at end of file