diff --git a/image/event/7.7_up_to_35/bn_confirm.png b/image/event/7.7_up_to_35/bn_confirm.png new file mode 100644 index 00000000..59bd5b4d Binary files /dev/null and b/image/event/7.7_up_to_35/bn_confirm.png differ diff --git a/image/event/7.7_up_to_35/bn_confirm_en.png b/image/event/7.7_up_to_35/bn_confirm_en.png new file mode 100644 index 00000000..6d4340d0 Binary files /dev/null and b/image/event/7.7_up_to_35/bn_confirm_en.png differ diff --git a/image/event/7.7_up_to_35/bp_confirm.png b/image/event/7.7_up_to_35/bp_confirm.png new file mode 100644 index 00000000..a3a9065d Binary files /dev/null and b/image/event/7.7_up_to_35/bp_confirm.png differ diff --git a/image/event/7.7_up_to_35/bp_confirm_en.png b/image/event/7.7_up_to_35/bp_confirm_en.png new file mode 100644 index 00000000..baf294a8 Binary files /dev/null and b/image/event/7.7_up_to_35/bp_confirm_en.png differ diff --git a/image/event/7.7_up_to_35/display_point/bn_close.png b/image/event/7.7_up_to_35/display_point/bn_close.png new file mode 100644 index 00000000..6452124b Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/bn_close.png differ diff --git a/image/event/7.7_up_to_35/display_point/bottom_bg.png b/image/event/7.7_up_to_35/display_point/bottom_bg.png new file mode 100644 index 00000000..24fc3242 Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/bottom_bg.png differ diff --git a/image/event/7.7_up_to_35/display_point/bp_close.png b/image/event/7.7_up_to_35/display_point/bp_close.png new file mode 100644 index 00000000..479716cd Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/bp_close.png differ diff --git a/image/event/7.7_up_to_35/display_point/point_1.png b/image/event/7.7_up_to_35/display_point/point_1.png new file mode 100644 index 00000000..4b96fda6 Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/point_1.png differ diff --git a/image/event/7.7_up_to_35/display_point/point_1_placeholder.png b/image/event/7.7_up_to_35/display_point/point_1_placeholder.png new file mode 100644 index 00000000..aed81eae Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/point_1_placeholder.png differ diff --git a/image/event/7.7_up_to_35/display_point/point_2.png b/image/event/7.7_up_to_35/display_point/point_2.png new file mode 100644 index 00000000..76af1924 Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/point_2.png differ diff --git a/image/event/7.7_up_to_35/display_point/point_2_placeholder.png b/image/event/7.7_up_to_35/display_point/point_2_placeholder.png new file mode 100644 index 00000000..6777bca6 Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/point_2_placeholder.png differ diff --git a/image/event/7.7_up_to_35/display_point/point_3.png b/image/event/7.7_up_to_35/display_point/point_3.png new file mode 100644 index 00000000..0fffd7c2 Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/point_3.png differ diff --git a/image/event/7.7_up_to_35/display_point/point_3_placeholder.png b/image/event/7.7_up_to_35/display_point/point_3_placeholder.png new file mode 100644 index 00000000..83381235 Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/point_3_placeholder.png differ diff --git a/image/event/7.7_up_to_35/display_point/point_4.png b/image/event/7.7_up_to_35/display_point/point_4.png new file mode 100644 index 00000000..ded849b3 Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/point_4.png differ diff --git a/image/event/7.7_up_to_35/display_point/point_4_placeholder.png b/image/event/7.7_up_to_35/display_point/point_4_placeholder.png new file mode 100644 index 00000000..9d8b8361 Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/point_4_placeholder.png differ diff --git a/image/event/7.7_up_to_35/display_point/point_5.png b/image/event/7.7_up_to_35/display_point/point_5.png new file mode 100644 index 00000000..5c970df6 Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/point_5.png differ diff --git a/image/event/7.7_up_to_35/display_point/point_5_placeholder.png b/image/event/7.7_up_to_35/display_point/point_5_placeholder.png new file mode 100644 index 00000000..da027764 Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/point_5_placeholder.png differ diff --git a/image/event/7.7_up_to_35/display_point/point_6.png b/image/event/7.7_up_to_35/display_point/point_6.png new file mode 100644 index 00000000..b438cbd3 Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/point_6.png differ diff --git a/image/event/7.7_up_to_35/display_point/point_6_placeholder.png b/image/event/7.7_up_to_35/display_point/point_6_placeholder.png new file mode 100644 index 00000000..dff81fbb Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/point_6_placeholder.png differ diff --git a/image/event/7.7_up_to_35/display_point/top_bg.png b/image/event/7.7_up_to_35/display_point/top_bg.png new file mode 100644 index 00000000..48404575 Binary files /dev/null and b/image/event/7.7_up_to_35/display_point/top_bg.png differ diff --git a/image/event/7.7_up_to_35/error_bg.png b/image/event/7.7_up_to_35/error_bg.png new file mode 100644 index 00000000..bafd380d Binary files /dev/null and b/image/event/7.7_up_to_35/error_bg.png differ diff --git a/image/event/7.7_up_to_35/send_code/detail_message.png b/image/event/7.7_up_to_35/send_code/detail_message.png new file mode 100644 index 00000000..03b13d5b Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/detail_message.png differ diff --git a/image/event/7.7_up_to_35/send_code/detail_message_en.png b/image/event/7.7_up_to_35/send_code/detail_message_en.png new file mode 100644 index 00000000..2973a2ec Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/detail_message_en.png differ diff --git a/image/event/7.7_up_to_35/send_code/lid.png b/image/event/7.7_up_to_35/send_code/lid.png new file mode 100644 index 00000000..0c320d71 Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/lid.png differ diff --git a/image/event/7.7_up_to_35/send_code/reward_1.png b/image/event/7.7_up_to_35/send_code/reward_1.png new file mode 100644 index 00000000..52b1e52f Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/reward_1.png differ diff --git a/image/event/7.7_up_to_35/send_code/reward_1_en.png b/image/event/7.7_up_to_35/send_code/reward_1_en.png new file mode 100644 index 00000000..a61d0664 Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/reward_1_en.png differ diff --git a/image/event/7.7_up_to_35/send_code/reward_2.png b/image/event/7.7_up_to_35/send_code/reward_2.png new file mode 100644 index 00000000..9e1cb880 Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/reward_2.png differ diff --git a/image/event/7.7_up_to_35/send_code/reward_2_en.png b/image/event/7.7_up_to_35/send_code/reward_2_en.png new file mode 100644 index 00000000..dd736580 Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/reward_2_en.png differ diff --git a/image/event/7.7_up_to_35/send_code/reward_3.png b/image/event/7.7_up_to_35/send_code/reward_3.png new file mode 100644 index 00000000..5261d7e6 Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/reward_3.png differ diff --git a/image/event/7.7_up_to_35/send_code/reward_3_en.png b/image/event/7.7_up_to_35/send_code/reward_3_en.png new file mode 100644 index 00000000..459cd95b Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/reward_3_en.png differ diff --git a/image/event/7.7_up_to_35/send_code/reward_4.png b/image/event/7.7_up_to_35/send_code/reward_4.png new file mode 100644 index 00000000..51eea634 Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/reward_4.png differ diff --git a/image/event/7.7_up_to_35/send_code/reward_4_en.png b/image/event/7.7_up_to_35/send_code/reward_4_en.png new file mode 100644 index 00000000..92cfadc0 Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/reward_4_en.png differ diff --git a/image/event/7.7_up_to_35/send_code/reward_5.png b/image/event/7.7_up_to_35/send_code/reward_5.png new file mode 100644 index 00000000..3015438a Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/reward_5.png differ diff --git a/image/event/7.7_up_to_35/send_code/reward_5_en.png b/image/event/7.7_up_to_35/send_code/reward_5_en.png new file mode 100644 index 00000000..4181cc33 Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/reward_5_en.png differ diff --git a/image/event/7.7_up_to_35/send_code/reward_6.png b/image/event/7.7_up_to_35/send_code/reward_6.png new file mode 100644 index 00000000..6f4bf088 Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/reward_6.png differ diff --git a/image/event/7.7_up_to_35/send_code/reward_6_en.png b/image/event/7.7_up_to_35/send_code/reward_6_en.png new file mode 100644 index 00000000..92c9af51 Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/reward_6_en.png differ diff --git a/image/event/7.7_up_to_35/send_code/send_code_bg.png b/image/event/7.7_up_to_35/send_code/send_code_bg.png new file mode 100644 index 00000000..147dab21 Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/send_code_bg.png differ diff --git a/image/event/7.7_up_to_35/send_code/send_code_decoration.png b/image/event/7.7_up_to_35/send_code/send_code_decoration.png new file mode 100644 index 00000000..5e379f59 Binary files /dev/null and b/image/event/7.7_up_to_35/send_code/send_code_decoration.png differ diff --git a/inc/button_topping_select_confirm_order.inc b/inc/button_topping_select_confirm_order.inc index 67fe4923..88c51c9d 100644 --- a/inc/button_topping_select_confirm_order.inc +++ b/inc/button_topping_select_confirm_order.inc @@ -192,10 +192,10 @@ EndIf Var topping2 = toppingID2index1 EndIf If CustomCoffeeQuantityState[1] = "PressForever" Then - Var topping2 = toppingID2index2 + Var topping2 = toppingID2index3 EndIf If CustomCoffeeQuantityState[2] = "PressForever" Then - Var topping2 = toppingID2index3 + Var topping2 = toppingID2index4 EndIf Else If toppingID2index3 = "" Then diff --git a/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml b/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml new file mode 100644 index 00000000..1672da6c --- /dev/null +++ b/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml @@ -0,0 +1,182 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + ; On open + + Var Timeout = 0 + SAVELOG UnitTestType + + Var TaobinLevel = 0 + + Var Seeker.TaobinErrorNetwork = 0 + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/collectiing_en" + + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" + Else + Var DirImage = "ROOT/taobin_project/image/collectiing" + + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + Var CollectPointError = "" + + If PayOfflineMode = 1 Then + Var Seeker.TaobinErrorNetwork = 1 + Var Seeker.PointTaobinStr = ParamCP + Var TelephoneNumber = TelephoneNumberX + Var Seeker.TNumberTaobinMember= TelephoneNumber + Var CollectPointError = "collect" + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml" + EndIf + + + + 1000 + + Var CountDownBrewing = BREW_CNT + + Var ShowCountDownBrewing = CountDownBrewing + + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + + Var TaobinLevel = 0 + Var CoffeePoint = 1 + + Var Seeker.TaobinErrorNetwork = 1 + Var Seeker.PointTaobinStr = ParamCP + + Var TelephoneNumber = TelephoneNumberX + + Var Seeker.TNumberTaobinMember= TelephoneNumber + Var CollectPointError = "collect" + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml" + + EndIf + + TimerReset + Refresh + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + If Ext1a = "" Then + + Var Seeker.TaobinErrorNetwork = 1 + Var Seeker.PointTaobinStr = ParamCP + Var TelephoneNumber = TelephoneNumberX + Var Seeker.TNumberTaobinMember = TelephoneNumber + Var CollectPointError = "collect" + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml" + + Else + Var TaobinName = Ext1c + Var TelephoneNumber = TelephoneNumberX + Var TNumberTaobinMemberXXX = TelephoneNumber + + If TaobinName = "" Then + Var Seeker.IsLineMember = 0 + Else + If TaobinName = "-" Then + Var Seeker.IsLineMember = 0 + Else + Var Seeker.IsLineMember = 1 + EndIf + EndIf + + Var Seeker.PointTaobinStr = ParamCP + Var Seeker.TNumberTaobinMember = TelephoneNumberX + + DEBUGVAR Ext1b + Var PointCount = Ext1b + INT PointCount + + If PointCount < 6 Then + Var PointCount = PointCount + 1 + EndIf + + DEBUGVAR PointCount + + DEBUGVAR Seeker.PointTaobinStr + DEBUGVAR Seeker.TNumberTaobinMember + + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_3.xml" + EndIf + + + + + Var Seeker.TaobinErrorNetwork = 1 + Var Seeker.PointTaobinStr = ParamCP + Var TelephoneNumber = TelephoneNumberX + Var Seeker.TNumberTaobinMember= TelephoneNumber + Var CollectPointError = "collect" + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml" + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + + + + 178 + 680 + Var( DirImage + "/text20.png" ) + + + + ;include="ROOT/taobin_project/inc/video.inc" + + + + 0 + 873 + 1080 + Center + 62 + RobotoBlack + 0x513C2F + TelephoneNumber + Telnum-mask-1 + + + + 751 + 413 + IMG_CNT + + + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + diff --git a/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_3.xml b/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_3.xml new file mode 100644 index 00000000..04d69432 --- /dev/null +++ b/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_3.xml @@ -0,0 +1,311 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + ; On open + + Var Timeout = 0 + Var BmiYear = "0/0/0/0/0/0/0/0/0/1" + Var PointCrm = "pdpa1" + Var GetScore = "" + Var TelephoneNumber = TelephoneNumberX + Var Seeker.TNumberTaobinMember = TelephoneNumber + + Var CoffeePointStr = CoffeePoint + + DEBUGVAR TelephoneNumber + DEBUGVAR TelephoneNumberX + + Var PointRootDir = "ROOT/taobin_project/image/event/7.7_up_to_35/display_point/" + + If show_eng = "true" Then + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" + Else + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + Var CheckCoupons = 0 + Var MakeDrinkState = 0 + + Var taobinImgPoint[0] = "/point_1_placeholder.png" + Var taobinImgPoint[1]= "/point_2_placeholder.png" + Var taobinImgPoint[2]= "/point_3_placeholder.png" + Var taobinImgPoint[3]= "/point_4_placeholder.png" + Var taobinImgPoint[4]= "/point_5_placeholder.png" + Var taobinImgPoint[5]= "/point_6_placeholder.png" + + DEBUGVAR PointCount + + If PointCount >= 1 Then + Var taobinImgPoint[0] = "/point_1.png" + EndIf + + If PointCount >= 2 Then + Var taobinImgPoint[1] = "/point_2.png" + EndIf + + If PointCount >= 3 Then + Var taobinImgPoint[2] = "/point_3.png" + EndIf + + If PointCount >= 4 Then + Var taobinImgPoint[3] = "/point_4.png" + EndIf + + If PointCount >= 5 Then + Var taobinImgPoint[4] = "/point_5.png" + EndIf + + If PointCount >= 6 Then + Var taobinImgPoint[5] = "/point_6.png" + EndIf + + If show_eng = "true" Then + Var memberText = "MEMBERSHIP STATUS" + Var missionText = "7.7 Get up to 35%\ndiscount" + Var message1 = "Collect cups daily to get a discount" + Var message2 = "Miss a day? Progress resets automatically" + Else + Var memberText = "สถานะสมาชิก" + Var missionText = "7.7 รับส่วนลดสูงสุด 35%" + Var message1 = "สะสมแก้วต่อเนื่องทุกวันเพื่อรับส่วนลด" + Var message2 = "*หากไม่มีการสะสมต่อเนื่องระบบจะทำการ reset อัตโนมัติ*" + EndIf + + Var CurrentPointSlot = PointCount + + + + 1000 + + Var CountDownBrewing = BREW_CNT + Var ShowCountDownBrewing = CountDownBrewing + + Var Timeout = Timeout + 1 + If Timeout > 8 Then + Var val1 = "X" + Var val2 = "X" + Var val3 = "X" + AddData 58 TelephoneNumber val1 val2 val3 + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_send_code.xml" + EndIf + + TimerReset + Refresh + + + + Open "/media/bt/xml/security_alarm.xml" + + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + ;include="ROOT/taobin_project/inc/video.inc" + + + 0 + 380 + "ROOT/taobin_project/image/display_point/alpha.png" + + + + 158 + 665 + Var( PointRootDir + "/top_bg.png" ) + + + + 158 + 1085 + Var( PointRootDir + "/bottom_bg.png" ) + + + + 243 + 722 + 235 + 36 + KanitMediaTTF + 24 + 0x746253 + memberText + + + + 243 + 758 + 480 + 42 + RobotoBold + 36 + 0x513C2F + TaobinName + + + + 243 + 799 + 100 + 16 + RobotoRegular + 0x746253 + TNumberTaobinMemberXXX + Telnum-mask-1 + + + + 243 + 820 + 328 + 90 + KanitMediaTTF + 32 + 0x746253 + missionText + + + + 243 + 907 + 57 + 120 + RobotoBold + 0xDE794E + PointCount + + + + 243 + 981 + 400 + KanitMediaTTF + 25 + 0xDE794E + message1 + + + + 243 + 1017 + 500 + KanitMediaTTF + 20 + 0x837365 + message2 + + + + + + 269 + 1147 + Var( PointRootDir + taobinImgPoint[0]) + + + + 478 + 1147 + Var( PointRootDir + taobinImgPoint[1]) + + + + 687 + 1147 + Var( PointRootDir + taobinImgPoint[2]) + + + + 269 + 1404 + Var( PointRootDir + taobinImgPoint[3]) + + + + 478 + 1404 + Var( PointRootDir + taobinImgPoint[4]) + + + + + 687 + 1404 + Var( PointRootDir + taobinImgPoint[5]) + + + + + + + + + 751 + 413 + IMG_CNT + + + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold 0x513C2F + ShowCountDownBrewing + + + + Var val2 = "X" + Var val3 = "X" + AddData 58 TelephoneNumber CurrentPointSlot val2 val3 + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_send_code.xml" + + + + Var PointState[0] = 1 + Var PointState[1] = 1 + Var PointState[2] = 1 + Var PointState[3] = 1 + Var PointState[4] = 1 + Var PointState[5] = 1 + + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_3.xml" + + + + If show_eng = "true" Then + Var show_eng = "false" + Else + Var show_eng = "true" + EndIf + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_3.xml" + + diff --git a/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml b/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml new file mode 100644 index 00000000..f2e5375b --- /dev/null +++ b/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml @@ -0,0 +1,170 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + ; On open + + + Var Timeout = 0 + + DEBUGVAR show_eng + DEBUGVAR CollectPointError + + Var DirImage = "ROOT/taobin_project/image/event/7.7_up_to_35/" + + If show_eng = "true" Then + Var confirmButtonIdleImage = "bn_confirm_en.png" + Var confirmButtonPressImage = "bp_confirm_en.png" + Else + Var confirmButtonIdleImage = "bn_confirm.png" + Var confirmButtonPressImage = "bp_confirm.png" + EndIf + + If CollectPointError = "collect" Then + If show_eng = "true" Then + Var errorMessage = "Network Disruption!\nRest assured, we'll promptly credit your FABULOUS points.\nWe apologize for any inconvenience." + Else + Var errorMessage = "สัญญาณขัดข้อง เราจะทำการบันทึกแต้มให้คุณภายหลัง\nขออภัยในความไม่สะดวก" + EndIf + EndIf + + If CollectPointError = "send_code" Then + If show_eng = "true" Then + Var errorMessage = "Network Disruption!\nRest assured, we'll promptly credit your FABULOUS points.\nWe apologize for any inconvenience." + Else + Var errorMessage = "สัญญาณขัดข้อง เราจะจัดส่งลิ้งค์ลงทะเบียนให้คุณภายหลัง\nขออภัยในความไม่สะดวก" + EndIf + EndIf + + Var val1 = "X" + Var val2 = "X" + Var val3 = "X" + AddData 58 TelephoneNumber val1 val2 val3 + + + + 1000 + + + Var CountDownBrewing = BREW_CNT + + Var ShowCountDownBrewing = CountDownBrewing + + Var Timeout = Timeout + 1 + If Timeout > 5 Then + 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 + + TimerReset + Refresh + + + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + + + + + 0 + 380 + Var( DirImage + "error_bg.png" ) + + + + + 0 + 1500 + 1080 + 200 + KanitRegularTTF + 40 + 0x513C2F + errorMessage + center-vertical-horizontal + + + + + + + + ;include="ROOT/taobin_project/inc/video.inc" + + + + + 751 + 413 + IMG_CNT + + + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + + + Open "/media/bt/xml/security_alarm.xml" + + + + If show_eng = "true" Then + Var show_eng = "false" + Else + Var show_eng = "true" + EndIf + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml" + + + + If CollectPointError = "collect" then + Var CollectPointError = "send_code" + Else + Var CollectPointError = "collect" + EndIf + + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml" + + + diff --git a/xml/event/7.7_up_to_35/page_send_code.xml b/xml/event/7.7_up_to_35/page_send_code.xml new file mode 100644 index 00000000..a43c5d78 --- /dev/null +++ b/xml/event/7.7_up_to_35/page_send_code.xml @@ -0,0 +1,96 @@ + + "Enable" + 1080 + 1920 + + + Var Timeout = 0 + + Var DirImage = "ROOT/taobin_project/image/event/7.7_up_to_35/send_code/" + + Var rewardNumber = PointCount + + DEBUGVAR rewardNumber + + Var rewardImage = DirImage + "/reward_" + Var rewardImage = rewardImage + rewardNumber + + If show_eng = "true" Then + Var detailMessageImage = DirImage + "/detail_message_en.png" + Var rewardImage = rewardImage + "_en.png" + Else + Var detailMessageImage = DirImage + "/detail_message.png" + Var rewardImage = rewardImage + ".png" + EndIf + + DEBUGVAR rewardImage + + + + + + + + + + Var Seeker.TaobinErrorNetwork = 1 + Var Seeker.PointTaobinStr = ParamCP + Var TelephoneNumber = TelephoneNumberX + Var Seeker.TNumberTaobinMember= TelephoneNumber + Var CollectPointError = "send_code" + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_error.xml" + + + 1000 + + Var Timeout = Timeout + 1 + + If Timeout >= 5 Then + 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 + + TimerReset + + + ;include="ROOT/taobin_project/inc/video.inc" + + + 0 + 380 + Var( DirImage + "/send_code_bg.png") + + + + 6 + 377 + Var( DirImage + "/lid.png") + + + + 619 + 635 + detailMessageImage + + + + 238 + 672 + rewardImage + + + + 255 + 851 + Var( DirImage + "/send_code_decoration.png") + + \ No newline at end of file diff --git a/xml/event/script_common_for_open_promotion_xml.ev b/xml/event/script_common_for_open_promotion_xml.ev index 0f6de79b..53969d08 100644 --- a/xml/event/script_common_for_open_promotion_xml.ev +++ b/xml/event/script_common_for_open_promotion_xml.ev @@ -9,6 +9,7 @@ DEBUGVAR AppleFarmFestivalPro DEBUGVAR HappyTriosPro DEBUGVAR TaiwaneseTeaPro DEBUGVAR AmericanoPro +DEBUGVAR Discount7_7Pro Var PromotionState1 = "Invisible" Var PromotionState2 = "Invisible" diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index db62bcd4..a4149494 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -98,6 +98,9 @@ Var TaiwaneseTeaPro = 0 ; Americano, 1 - 31 July Var AmericanoPro = 0 +;7.7 discount code, 7 - 13 July +Var Discount7_7Pro = 0 + Var NewCollectPoint = 1 Var PaymentCodeShouldCollectPromotionPoint = 0 @@ -181,6 +184,12 @@ If SystemDateMonthInt = 7 Then Var AmericanoPro = 1 Var TaiwaneseTeaPro = 1 + If SystemDateDayInt >= 7 Then + If SystemDateDayInt <= 13 Then + Var Discount7_7Pro = 1 + EndIf + EndIf + EndIf diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 67fab720..87c36d38 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -190,6 +190,14 @@ Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP + If Seeker.CodeChannel = 0 Then + If Discount7_7Pro = 1 Then + SAVELOG "7.7 Discount level collect point" + GETACCEXT TelephoneNumber 44 + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml" + EndIf + EndIf + GETACCEXT Param1 23 Open "ROOT/taobin_project/xml/page_collect_point_2.xml" @@ -217,6 +225,13 @@ Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP + If Seeker.CodeChannel = 0 Then + If Discount7_7Pro = 1 Then + SAVELOG "7.7 Discount level collect point" + GETACCEXT TelephoneNumber 44 + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml" + EndIf + EndIf GETACCEXT Param1 23 Open "ROOT/taobin_project/xml/page_collect_point_2.xml" @@ -677,6 +692,14 @@ Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP + If Seeker.CodeChannel = 0 Then + If Discount7_7Pro = 1 Then + SAVELOG "7.7 Discount level collect point" + GETACCEXT TelephoneNumber 44 + Open "ROOT/taobin_project/xml/event/7.7_up_to_35/page_collect_point_pro_7_7_2.xml" + EndIf + EndIf + GETACCEXT Param1 23 Open "ROOT/taobin_project/xml/page_collect_point_2.xml"