Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
wanlop run 2024-03-12 12:29:56 +07:00
commit 5b734a03f6
9 changed files with 31 additions and 12 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

View file

@ -89,6 +89,7 @@
Var TaobinName = Ext1b Var TaobinName = Ext1b
Var TelephoneNumber = TelephoneNumberX Var TelephoneNumber = TelephoneNumberX
Var TNumberTaobinMemberXXX = TelephoneNumber Var TNumberTaobinMemberXXX = TelephoneNumber
Var Seeker.IsAlreadyGetReward = Ext1c
If TaobinName = "" Then If TaobinName = "" Then
Var Seeker.IsLineMember = 0 Var Seeker.IsLineMember = 0
Else Else
@ -115,6 +116,21 @@
EndIf EndIf
EndIf EndIf
If Seeker.IsAlreadyGetReward = 1 Then
SAVELOG "Already get reward skip to normal collect point."
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.PointTaobinStr = ParamCP
Var Seeker.TNumberTaobinMember = TelephoneNumberX Var Seeker.TNumberTaobinMember = TelephoneNumberX

View file

@ -209,7 +209,7 @@ If SystemDateMonthInt = 4 Then
Var MondayBananaPro = 1 Var MondayBananaPro = 1
EndIf EndIf
If SystemDateDayInt <= 12 Then If SystemDateDayInt <= 5 Then
Var LipitPro = 1 Var LipitPro = 1
EndIf EndIf
@ -243,15 +243,15 @@ If BoxID = 201316 Then
Var NewFlowPaymentCode = 1 Var NewFlowPaymentCode = 1
EndIf EndIf
If BoxID = 105005 Then ; If BoxID = 105005 Then
Var PepsiSecondCup30Enable = 1 ; Var PepsiSecondCup30Enable = 1
Var PepsiSecondCup30DiscountEnable = 1 ; Var PepsiSecondCup30DiscountEnable = 1
Var NewFlowPaymentCode = 1 ; Var NewFlowPaymentCode = 1
;
Var LipitPro = 0 ; Var LipitPro = 0
Var MondayBananaPro = 1 ; Var MondayBananaPro = 1
Var FreeEnergyDrink = 0 ; Var FreeEnergyDrink = 0
EndIf ; EndIf
If BoxID = 172644 Then If BoxID = 172644 Then
Var ProPeachEnable = 1 Var ProPeachEnable = 1

View file

@ -241,8 +241,8 @@
Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml" Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
EndIf EndIf
Else Else
GETACCEXT Param1 23 GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/page_collect_point_2.xml" Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
EndIf EndIf
EndIf EndIf
EndIf EndIf
@ -744,6 +744,9 @@
GETACCEXT TelephoneNumber 32 GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml" Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
EndIf EndIf
Else
GETACCEXT TelephoneNumber 32
Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
EndIf EndIf
EndIf EndIf
EndIf EndIf