diff --git a/image/event/lent_day/bn_continue.png b/image/event/lent_day/bn_continue.png new file mode 100644 index 00000000..9f39eb5b Binary files /dev/null and b/image/event/lent_day/bn_continue.png differ diff --git a/image/event/lent_day/bn_redeem.png b/image/event/lent_day/bn_redeem.png new file mode 100644 index 00000000..a20351a0 Binary files /dev/null and b/image/event/lent_day/bn_redeem.png differ diff --git a/image/event/lent_day/collect_fail.png b/image/event/lent_day/collect_fail.png new file mode 100644 index 00000000..888d10e7 Binary files /dev/null and b/image/event/lent_day/collect_fail.png differ diff --git a/image/event/lent_day/collecting_level.png b/image/event/lent_day/collecting_level.png new file mode 100644 index 00000000..7cb3ccc9 Binary files /dev/null and b/image/event/lent_day/collecting_level.png differ diff --git a/image/event/lent_day/layer1.png b/image/event/lent_day/layer1.png new file mode 100644 index 00000000..d79d89a0 Binary files /dev/null and b/image/event/lent_day/layer1.png differ diff --git a/image/event/lent_day/layer2.png b/image/event/lent_day/layer2.png new file mode 100644 index 00000000..4d48b641 Binary files /dev/null and b/image/event/lent_day/layer2.png differ diff --git a/image/event/lent_day/layer3.png b/image/event/lent_day/layer3.png new file mode 100644 index 00000000..ac006812 Binary files /dev/null and b/image/event/lent_day/layer3.png differ diff --git a/image/event/lent_day/layer4.png b/image/event/lent_day/layer4.png new file mode 100644 index 00000000..a63dfa82 Binary files /dev/null and b/image/event/lent_day/layer4.png differ diff --git a/image/event/lent_day/lent.png b/image/event/lent_day/lent.png new file mode 100644 index 00000000..19c89dff Binary files /dev/null and b/image/event/lent_day/lent.png differ diff --git a/image/event/lent_day/redeem_25.png b/image/event/lent_day/redeem_25.png new file mode 100644 index 00000000..4ffb4751 Binary files /dev/null and b/image/event/lent_day/redeem_25.png differ diff --git a/image/event/lent_day/redeem_50.png b/image/event/lent_day/redeem_50.png new file mode 100644 index 00000000..c7605d30 Binary files /dev/null and b/image/event/lent_day/redeem_50.png differ diff --git a/image/event/lent_day/redeem_free.png b/image/event/lent_day/redeem_free.png new file mode 100644 index 00000000..9d620128 Binary files /dev/null and b/image/event/lent_day/redeem_free.png differ diff --git a/image/event/lent_day/redeem_or_continue_bg.png b/image/event/lent_day/redeem_or_continue_bg.png new file mode 100644 index 00000000..6d7bef9d Binary files /dev/null and b/image/event/lent_day/redeem_or_continue_bg.png differ diff --git a/image/event/lent_day/redeem_or_continue_text25.png b/image/event/lent_day/redeem_or_continue_text25.png new file mode 100644 index 00000000..1430b943 Binary files /dev/null and b/image/event/lent_day/redeem_or_continue_text25.png differ diff --git a/image/event/lent_day/redeem_or_continue_text50.png b/image/event/lent_day/redeem_or_continue_text50.png new file mode 100644 index 00000000..b361d5b0 Binary files /dev/null and b/image/event/lent_day/redeem_or_continue_text50.png differ diff --git a/image/event/lent_day/send_code_redeem.png b/image/event/lent_day/send_code_redeem.png new file mode 100644 index 00000000..73e93f5f Binary files /dev/null and b/image/event/lent_day/send_code_redeem.png differ diff --git a/xml/event/lent_day/page_collect_lent_check.xml b/xml/event/lent_day/page_collect_lent_check.xml new file mode 100644 index 00000000..9f29a7d5 --- /dev/null +++ b/xml/event/lent_day/page_collect_lent_check.xml @@ -0,0 +1,158 @@ + + "Enable" + 1080 + 1920 + "0xEAE6E1" + SoundVolume + + Var Timeout = 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 + + If PayOfflineMode = 1 Then + Var Seeker.TaobinErrorNetwork = 1 + Var Seeker.PointTaobinStr = ParamCP + Var TelephoneNumber = TelephoneNumberX + Var Seeker.TNumberTaobinMember = TelephoneNumber + Open "ROOT/taobin_project/xml/event/lent_day/page_lent_day_collect_fail.xml" + EndIf + + + 1000 + + Var CountDownBrewing = BREW_CNT + Var ShowCountDownBrewing = CountDownBrewing + + Var Timeout = Timeout + 1 + If Timeout > 30 Then + Var Seeker.TaobinErrorNetwork = 1 + Var Seeker.PointTaobinStr = ParamCP + + Var TelephoneNumber = TelephoneNumberX + Var Seeker.TNumberTaobinMember = TelephoneNumber + + Open "ROOT/taobin_project/xml/event/lent_day/page_lent_day_collect_fail.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 + Open "ROOT/taobin_project/xml/event/lent_day/page_lent_day_collect_fail.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 + + If Seeker.IsLineMember = 0 Then + SAVELOG "Not Line member skip." + 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 + + Var Seeker.PointTaobinStr = ParamCP + Var Seeker.TNumberTaobinMember = TelephoneNumberX + + DEBUGVAR Ext1b + Var TotalPrice = Ext1b + INT TotalPrice + + DEBUGVAR PayAmount + DEBUGVAR TotalPrice + DEBUGVAR Seeker.PointTaobinStr + DEBUGVAR Seeker.TNumberTaobinMember + + Open "ROOT/taobin_project/xml/event/lent_day/page_collect_lent_collecting.xml" + EndIf + + + + Var Seeker.TaobinErrorNetwork = 1 + Var Seeker.PointTaobinStr = ParamCP + Var TelephoneNumber = TelephoneNumberX + Var Seeker.TNumberTaobinMember= TelephoneNumber + Open "ROOT/taobin_project/xml/event/lent_day/page_lent_day_collect_fail.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" + + + 178 + 680 + Var( DirImage + "/text20.png" ) + + + + 490 + 1390 + 100 + 100 + "Enable" + "ROOT/taobin_project/image/page_payment_en/page_payment/loading.gif" + + + + 751 + 413 + IMG_CNT + + + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + \ No newline at end of file diff --git a/xml/event/lent_day/page_collect_lent_collecting.xml b/xml/event/lent_day/page_collect_lent_collecting.xml new file mode 100644 index 00000000..a34263e2 --- /dev/null +++ b/xml/event/lent_day/page_collect_lent_collecting.xml @@ -0,0 +1,248 @@ + + "Enable" + 1080 + 1920 + "0xEAE6E1" + SoundVolume + + Var Timeout = 0 + Var TelephoneNumber = TelephoneNumberX + Var Seeker.TNumberTaobinMember = TelephoneNumber + + DEBUGVAR TelephoneNumber + DEBUGVAR TelephoneNumberX + + Var DirImage = "ROOT/taobin_project/image/event/lent_day/" + + 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 FullLentState = "Invisible" + Var CurrentPriceTextState = "Invisible" + Var GIFAnimationState = "Invisible" + + DEBUGVAR TotalPrice + DEBUGVAR PayAmount + + Var TotalPriceAfterAdded = TotalPrice + PayAmount + + Var PriceToShow = "฿" + TotalPriceAfterAdded + Var PriceToShow = PriceToShow + "->" + + Var LentMinY = 1740 + Var LentMaxY = 1076 + + Var MaxPrice = 350 + + Var LentSize = LentMinY - LentMaxY + + Var StartPriceDy = TotalPrice * 100 + Var StartPriceDy = StartPriceDy / MaxPrice + Var PositionStart = StartPriceDy * LentSize + Var PositionStart = PositionStart / 100 + Var PositionStart = LentMinY - PositionStart + + If PositionStart < LentMaxY Then + PositionStart = LentMaxY + EndIf + + Var LentPositionY = PositionStart + + Var TargetPriceDy = TotalPriceAfterAdded * 100 + Var TargetPriceDy = TargetPriceDy / MaxPrice + Var PositionTarget = TargetPriceDy * LentSize + Var PositionTarget = PositionTarget / 100 + Var PositionTarget = LentMinY - PositionTarget + + If PositionTarget < LentMaxY Then + PositionTarget = LentMaxY + EndIf + + Var PositionDiff = PositionStart - PositionTarget + + Var TimeScopeSec = 0 + Var AmountIncrease = 0 + Var PourAnimationDelaySec = 0 + If PositionDiff > 0 Then + Var TimeScopeSec = 7 + Var AmountIncrease = 0 - PositionDiff + Var AmountIncrease = AmountIncrease / TimeScopeSec + Var PourAnimationDelaySec = 1 + Var GIFAnimationState = "Enable" + EndIf + + Var MaxTimeout = TimeScopeSec + PourAnimationDelaySec + Var MaxTimeout = MaxTimeout + 5 + + DEBUGVAR LentSize + DEBUGVAR PositionStart + DEBUGVAR PositionTarget + DEBUGVAR AmountIncrease + DEBUGVAR LentPositionY + DEBUGVAR MaxTimeout + + + Var val1 = "+" + Var val2 = PayAmount + Var val3 = "X" + AddData 58 TelephoneNumber val1 val2 val3 + + + + 1000 + + Var CountDownBrewing = BREW_CNT + Var ShowCountDownBrewing = CountDownBrewing + + Var Timeout = Timeout + 1 + If Timeout > MaxTimeout Then + + If TotalPriceAfterAdded >= 350 Then + Open "ROOT/taobin_project/xml/event/lent_day/page_collect_lent_send_code.xml" + EndIf + + If TotalPriceAfterAdded >= 175 Then + Open "ROOT/taobin_project/xml/event/lent_day/page_collect_lent_redeem_or_continue.xml" + EndIf + + 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 + + If PourAnimationDelaySec > 0 Then + Var PourAnimationDelaySec = PourAnimationDelaySec - 1 + Else + If TimeScopeSec > 0 Then + Var LentPositionY = LentPositionY + AmountIncrease + DEBUGVAR LentPositionY + Var TimeScopeSec = TimeScopeSec - 1 + Else + If TotalPriceAfterAdded >= 350 Then + Var FullLentState = "Enable" + Var CurrentPriceTextState = "Invisible" + EndIf + + Var GIFAnimationState = "Invisible" + EndIf + EndIf + + Refresh + TimerReset + + + + 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 + Var( DirImage + "/layer1.png" ) + + + + 90 + 760 + 800 + 333 + GIFAnimationState + ; "OneShot,StopFrame=182" + Var( DirImage + "pour_animation.gif" ) + + + + 361 + LentPositionY + 340 + 714 + Var( DirImage + "/layer2.png" ) + + + + 0 + 1076 + Var( DirImage + "/layer3.png" ) + + + + 363 + 1076 + Var( DirImage + "/layer4.png" ) + + + + 325 + PositionTarget + CurrentPriceTextState + 150 + 32 + KanitTTF + 0x523D30 + PriceToShow + + + + 363 + 821 + FullLentState + Var( DirImage + "/lent.png" ) + + + + 658 + 990 + Var( DirImage + "/collecting_level.png" ) + + + + 751 + 413 + IMG_CNT + + + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + + + "Reload File" + + + + + Var MaxTimeout = 5 + + \ No newline at end of file diff --git a/xml/event/lent_day/page_collect_lent_redeem_or_continue.xml b/xml/event/lent_day/page_collect_lent_redeem_or_continue.xml new file mode 100644 index 00000000..7603ae5a --- /dev/null +++ b/xml/event/lent_day/page_collect_lent_redeem_or_continue.xml @@ -0,0 +1,123 @@ + + "Enable" + 1080 + 1920 + "0xEAE6E1" + SoundVolume + + Var Timeout = 0 + + Var DirImage = "ROOT/taobin_project/image/event/lent_day/" + + 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 + + If TotalPriceAfterAdded >= 280 Then + Var RedeemText = "/redeem_or_continue_text50.png" + Else + Var RedeemText = "/redeem_or_continue_text25.png" + EndIf + + + + 1000 + + Var CountDownBrewing = BREW_CNT + Var ShowCountDownBrewing = CountDownBrewing + + Var Timeout = Timeout + 1 + If Timeout > 10 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 + + Refresh + TimerReset + + + + 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 + Var( DirImage + "/redeem_or_continue_bg.png" ) + + + + 237 + 829 + Var( DirImage + RedeemText ) + + + + + + + + 751 + 413 + IMG_CNT + + + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + "Enable" + ShowCountDownBrewing + + \ No newline at end of file diff --git a/xml/event/lent_day/page_collect_lent_send_code.xml b/xml/event/lent_day/page_collect_lent_send_code.xml new file mode 100644 index 00000000..70376104 --- /dev/null +++ b/xml/event/lent_day/page_collect_lent_send_code.xml @@ -0,0 +1,146 @@ + + "Enable" + 1080 + 1920 + "0xEAE6E1" + SoundVolume + + Var Timeout = 0 + + Var DirImage = "ROOT/taobin_project/image/event/lent_day/" + + 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 RedeemButtonState = "Enable" + + If TotalPriceAfterAdded >= 175 Then + Var RedeemImage = "/redeem_25.png" + Var RedeemType = 1 + EndIf + If TotalPriceAfterAdded >= 280 Then + Var RedeemImage = "/redeem_50.png" + Var RedeemType = 2 + EndIf + If TotalPriceAfterAdded >= 350 Then + Var RedeemImage = "/redeem_free.png" + Var RedeemType = 3 + EndIf + + Var isTimeout = 0 + + + 1000 + + Var CountDownBrewing = BREW_CNT + Var ShowCountDownBrewing = CountDownBrewing + + Var Timeout = Timeout + 1 + If Timeout > 4 Then + Var isTimeout = 1 + If RedeemType = 1 Then + Var val2 = 175 + EndIf + If RedeemType = 2 Then + Var val2 = 280 + EndIf + If RedeemType = 3 Then + Var val2 = 350 + EndIf + + Var val1 = "-" + Var val3 = "X" + AddData 58 TelephoneNumber val1 val2 val3 + + Var RedeemImage = "/send_code_redeem.png" + Var RedeemButtonState = "Invisible" + + 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 + + Refresh + TimerReset + + + + 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 + Var( DirImage + RedeemImage ) + + + + + + 751 + 413 + IMG_CNT + + + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + "Enable" + ShowCountDownBrewing + + \ No newline at end of file diff --git a/xml/event/lent_day/page_lent_day_collect_fail.xml b/xml/event/lent_day/page_lent_day_collect_fail.xml new file mode 100644 index 00000000..b1fa29c7 --- /dev/null +++ b/xml/event/lent_day/page_lent_day_collect_fail.xml @@ -0,0 +1,87 @@ + + "Enable" + 1080 + 1920 + "0xEAE6E1" + SoundVolume + + Var Timeout = 0 + + Var DirImage = "ROOT/taobin_project/image/event/lent_day/" + + 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 val1 = "+" + Var val2 = PayAmount + 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 + + Refresh + TimerReset + + + + 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 + Var( DirImage + "/collect_fail.png" ) + + + + 751 + 413 + IMG_CNT + + + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + "Enable" + ShowCountDownBrewing + + \ No newline at end of file diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 68d8414d..4e4218d4 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -101,6 +101,9 @@ Var Discount7_7Pro = 0 ; Apple Farm Festival, 15 - 31 July Var AppleFarmFestivalPro = 0 +; Lent Day, 1 - 31 Aug +Var LentDayPro = 0 + Var NewCollectPoint = 1 Var PaymentCodeShouldCollectPromotionPoint = 0 @@ -197,7 +200,9 @@ If SystemDateMonthInt = 7 Then EndIf -DEBUGVAR AppleFarmFestivalPro +If SystemDateMonthInt = 8 Then + Var LentDayPro = 1 +EndIf Var JemilaToppingFlag = 1 @@ -222,8 +227,6 @@ If BoxID = 105005 Then Var StrawberrySeriesPro = 1 Var StrawberrySeriesMenu = 1 - Var SwensenPro = 1 - Var JemilaToppingFlag = 1 Var JemilaToppingFreeFlag = 1 Var SugarZeroCalFreeFlag = 1 diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index aca7dec0..daddff62 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -963,7 +963,7 @@ Var PayDetail2 = "" Var VendingOrderID = Seeker.ORDER_ID Var ServiceRefund = 0 - Var ServiceCharge = Seeker.ServiceCharge + Var ServiceCharge = 0 Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate Var waitAckPay = 2 @@ -1002,7 +1002,7 @@ Var PayDetail2 = "" Var VendingOrderID = Seeker.ORDER_ID Var ServiceRefund = 0 - Var ServiceCharge = Seeker.ServiceCharge + Var ServiceCharge = 0 Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate Var waitAckPay = 2 diff --git a/xml/page_NewBrewing3Conti.xml b/xml/page_NewBrewing3Conti.xml index 51c3af99..40a881c7 100644 --- a/xml/page_NewBrewing3Conti.xml +++ b/xml/page_NewBrewing3Conti.xml @@ -413,7 +413,7 @@ Var PayDetail2 = "" Var VendingOrderID = Seeker.ORDER_ID Var ServiceRefund = 0 - Var ServiceCharge = Seeker.ServiceCharge + Var ServiceCharge = 0 Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate Var waitAckPay = 2 @@ -452,7 +452,7 @@ Var PayDetail2 = "" Var VendingOrderID = Seeker.ORDER_ID Var ServiceRefund = 0 - Var ServiceCharge = Seeker.ServiceCharge + Var ServiceCharge = 0 Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate Var waitAckPay = 2 diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index dce3e3f6..3474f9d0 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -190,8 +190,7 @@ Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/7.7_up_to_35/can_get_code.ev" - + ;include="/mnt/sdcard/coffeevending/taobin_project/xml/sometime/before_collect_main_point.xml" GETACCEXT Param1 23 Open "ROOT/taobin_project/xml/page_collect_point_2.xml" @@ -220,7 +219,7 @@ Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/7.7_up_to_35/can_get_code.ev" + ;include="/mnt/sdcard/coffeevending/taobin_project/xml/sometime/before_collect_main_point.xml" GETACCEXT Param1 23 Open "ROOT/taobin_project/xml/page_collect_point_2.xml" @@ -685,7 +684,7 @@ Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/7.7_up_to_35/can_get_code.ev" + ;include="/mnt/sdcard/coffeevending/taobin_project/xml/sometime/before_collect_main_point.xml" GETACCEXT Param1 23 Open "ROOT/taobin_project/xml/page_collect_point_2.xml" diff --git a/xml/sometime/before_collect_main_point.xml b/xml/sometime/before_collect_main_point.xml new file mode 100644 index 00000000..39696573 --- /dev/null +++ b/xml/sometime/before_collect_main_point.xml @@ -0,0 +1,6 @@ +If LentDayPro = 1 Then + GETACCEXT TelephoneNumber 44 + Open "ROOT/taobin_project/xml/event/lent_day/page_collect_lent_check.xml" +EndIf + +TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/7.7_up_to_35/can_get_code.ev"