diff --git a/image/event/robinson_beauty/bg_bottom.png b/image/event/robinson_beauty/bg_bottom.png new file mode 100644 index 00000000..b949b9dc Binary files /dev/null and b/image/event/robinson_beauty/bg_bottom.png differ diff --git a/image/event/robinson_beauty/bg_top.png b/image/event/robinson_beauty/bg_top.png new file mode 100644 index 00000000..0f18d54a Binary files /dev/null and b/image/event/robinson_beauty/bg_top.png differ diff --git a/image/event/robinson_beauty/point_1-1.png b/image/event/robinson_beauty/point_1-1.png new file mode 100644 index 00000000..df186831 Binary files /dev/null and b/image/event/robinson_beauty/point_1-1.png differ diff --git a/image/event/robinson_beauty/point_1.png b/image/event/robinson_beauty/point_1.png new file mode 100644 index 00000000..df186831 Binary files /dev/null and b/image/event/robinson_beauty/point_1.png differ diff --git a/image/event/robinson_beauty/point_1_en.png b/image/event/robinson_beauty/point_1_en.png new file mode 100644 index 00000000..95464bd7 Binary files /dev/null and b/image/event/robinson_beauty/point_1_en.png differ diff --git a/image/event/robinson_beauty/point_2-1.png b/image/event/robinson_beauty/point_2-1.png new file mode 100644 index 00000000..df186831 Binary files /dev/null and b/image/event/robinson_beauty/point_2-1.png differ diff --git a/image/event/robinson_beauty/point_2.png b/image/event/robinson_beauty/point_2.png new file mode 100644 index 00000000..df186831 Binary files /dev/null and b/image/event/robinson_beauty/point_2.png differ diff --git a/image/event/robinson_beauty/point_2_en.png b/image/event/robinson_beauty/point_2_en.png new file mode 100644 index 00000000..bc35bfa7 Binary files /dev/null and b/image/event/robinson_beauty/point_2_en.png differ diff --git a/image/event/robinson_beauty/point_3-1.png b/image/event/robinson_beauty/point_3-1.png new file mode 100644 index 00000000..7a86355f Binary files /dev/null and b/image/event/robinson_beauty/point_3-1.png differ diff --git a/image/event/robinson_beauty/point_3.png b/image/event/robinson_beauty/point_3.png new file mode 100644 index 00000000..7a86355f Binary files /dev/null and b/image/event/robinson_beauty/point_3.png differ diff --git a/image/event/robinson_beauty/point_3_en.png b/image/event/robinson_beauty/point_3_en.png new file mode 100644 index 00000000..7a9be74f Binary files /dev/null and b/image/event/robinson_beauty/point_3_en.png differ diff --git a/image/event/robinson_beauty/point_4.png b/image/event/robinson_beauty/point_4.png new file mode 100644 index 00000000..a613a982 Binary files /dev/null and b/image/event/robinson_beauty/point_4.png differ diff --git a/image/event/robinson_beauty/point_4_en.png b/image/event/robinson_beauty/point_4_en.png new file mode 100644 index 00000000..a96035fb Binary files /dev/null and b/image/event/robinson_beauty/point_4_en.png differ diff --git a/image/event/robinson_beauty/point_5.png b/image/event/robinson_beauty/point_5.png new file mode 100644 index 00000000..f1b76d89 Binary files /dev/null and b/image/event/robinson_beauty/point_5.png differ diff --git a/image/event/robinson_beauty/point_5_en.png b/image/event/robinson_beauty/point_5_en.png new file mode 100644 index 00000000..93dfa14d Binary files /dev/null and b/image/event/robinson_beauty/point_5_en.png differ diff --git a/image/event/robinson_beauty/point_6.png b/image/event/robinson_beauty/point_6.png new file mode 100644 index 00000000..5706d32d Binary files /dev/null and b/image/event/robinson_beauty/point_6.png differ diff --git a/image/event/robinson_beauty/point_6_en.png b/image/event/robinson_beauty/point_6_en.png new file mode 100644 index 00000000..cf4a44ff Binary files /dev/null and b/image/event/robinson_beauty/point_6_en.png differ diff --git a/image/event/robinson_beauty/point_7.png b/image/event/robinson_beauty/point_7.png new file mode 100644 index 00000000..7bf05238 Binary files /dev/null and b/image/event/robinson_beauty/point_7.png differ diff --git a/image/event/robinson_beauty/point_7_en.png b/image/event/robinson_beauty/point_7_en.png new file mode 100644 index 00000000..f0693de9 Binary files /dev/null and b/image/event/robinson_beauty/point_7_en.png differ diff --git a/image/event/robinson_beauty/point_8.png b/image/event/robinson_beauty/point_8.png new file mode 100644 index 00000000..79795eb4 Binary files /dev/null and b/image/event/robinson_beauty/point_8.png differ diff --git a/image/event/robinson_beauty/point_8_en.png b/image/event/robinson_beauty/point_8_en.png new file mode 100644 index 00000000..9ca832a8 Binary files /dev/null and b/image/event/robinson_beauty/point_8_en.png differ diff --git a/image/event/robinson_beauty/reawrd_set_a.png b/image/event/robinson_beauty/reward_set_a.png similarity index 100% rename from image/event/robinson_beauty/reawrd_set_a.png rename to image/event/robinson_beauty/reward_set_a.png diff --git a/image/event/robinson_beauty/reawrd_set_a_name.png b/image/event/robinson_beauty/reward_set_a_name.png similarity index 100% rename from image/event/robinson_beauty/reawrd_set_a_name.png rename to image/event/robinson_beauty/reward_set_a_name.png diff --git a/image/event/robinson_beauty/reawrd_set_a_plus.png b/image/event/robinson_beauty/reward_set_a_plus.png similarity index 100% rename from image/event/robinson_beauty/reawrd_set_a_plus.png rename to image/event/robinson_beauty/reward_set_a_plus.png diff --git a/image/event/robinson_beauty/reawrd_set_a_plus_name.png b/image/event/robinson_beauty/reward_set_a_plus_name.png similarity index 100% rename from image/event/robinson_beauty/reawrd_set_a_plus_name.png rename to image/event/robinson_beauty/reward_set_a_plus_name.png 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 bcd19a57..41188fdb 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 @@ -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 diff --git a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml index 7dfe9d07..5cc395f9 100644 --- a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_3.xml +++ b/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 @@ 237 - 1058 + 1089 Var( PointRootDir + taobinImgPoint[0]) 440 - 1058 + 1089 Var( PointRootDir + taobinImgPoint[1]) 642 - 1058 + 1089 Var( PointRootDir + taobinImgPoint[2]) 237 - 1267 + 1271 Var( PointRootDir + taobinImgPoint[3]) 440 - 1267 + 1271 Var( PointRootDir + taobinImgPoint[4]) 642 - 1267 + 1271 Var( PointRootDir + taobinImgPoint[5]) 237 - 1449 + 1453 Var( PointRootDir + taobinImgPoint[6]) 440 - 1449 + 1453 Var( PointRootDir + taobinImgPoint[7]) 642 - 1449 + 1453 Var( PointRootDir + taobinImgPoint[8])