pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

AUS: Update collect point

Browse source
This commit is contained in:
Kenta420 2024-08-07 18:27:09 +07:00
parent e71de8548c
commit ad93f5a88f
7 changed files with 95 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

12
inter/aus/xml/page_brewing3.lxml
View file

@ -1110,13 +1110,15 @@
Var Cid = 26
If NewCollectPointFlag = 1 Then
If Seeker.redeem2Dollar = 1 Then
If Seeker.redeemDiscount = "2_dollar" Then
Var Cid = 49
EndIf
If Seeker.redeem1Dollar = 1 Then
If Seeker.redeemDiscount = "1_dollar" Then
Var Cid = 48
EndIf
Var Seeker.redeemDiscount = ""
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
@ -1224,13 +1226,15 @@
If AddData = 1 Then
Var Cid = 26
If NewCollectPointFlag = 1 Then
If Seeker.redeem2Dollar = 1 Then
If Seeker.redeemDiscount = "2_dollar" Then
Var Cid = 49
EndIf
If Seeker.redeem1Dollar = 1 Then
If Seeker.redeemDiscount = "1_dollar" Then
Var Cid = 48
EndIf
Var Seeker.redeemDiscount = ""
EndIf
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf

44
inter/aus/xml/page_brewing3Conti.xml
View file

@ -614,16 +614,22 @@
If AddData = 1 Then
Var Cid = 26
DEBUGVAR "Brewing3Conti"
If NewCollectPointFlag = 1 Then
If Seeker.redeemDiscount = "2_dollar" Then
Var Cid = 49
EndIf
If Seeker.redeemDiscount = "1_dollar" Then
Var Cid = 48
EndIf
DEBUGVAR Seeker.redeemDiscount
Var Seeker.redeemDiscount = ""
EndIf
DEBUGVAR Cid
DEBUGVAR Seeker
DEBUGVAR Seeker.UseGet15Discount
If NewCollectPoint = 1 Then
If Seeker.UseGet15Discount = 1 Then
Var Cid = 39
Else
Var Cid = 40
Var PreviousSeeker.UseGetDrink5Bath = 0
EndIf
EndIf
DEBUGVAR Seeker.TNumberTaobinMember
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf
@ -736,15 +742,23 @@
If AddData = 1 Then
Var Cid = 26
If NewCollectPoint = 1 Then
If Seeker.UseGet15Discount = 1 Then
Var Cid = 39
Else
Var Cid = 40
Var PreviousSeeker.UseGetDrink5Bath = 0
If NewCollectPointFlag = 1 Then
If Seeker.redeemDiscount = "2_dollar" Then
Var Cid = 49
EndIf
If Seeker.redeemDiscount = "1_dollar" Then
Var Cid = 48
EndIf
Var Seeker.redeemDiscount = ""
EndIf
DEBUGVAR Cid
DEBUGVAR Seeker
DEBUGVAR Seeker.TNumberTaobinMember
DEBUGVAR Seeker.redeemDiscount
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
EndIf

18
inter/aus/xml/page_collect_point_2.lxml
View file

@ -153,24 +153,6 @@
Var CoffeePoint = PointTaobin + CoffeePoint1
Var CoffeePointOld = CoffeePoint1
If Seeker = "next" Then
Var CurrSeeker = "curr"
If CurrSeeker.TNumberTaobinMember = Seeker.TNumberTaobinMember Then
Var CoffeePoint = Seeker.CurrentCoffeePoint + PointTaobin
If CurrSeeker.redeem1Dollar = 1 Then
Var CoffeePoint = CoffeePoint - 10
Var CoffeePointOld = Seeker.CurrentCoffeePoint - 10
EndIf
If CurrSeeker.redeem2Dollar = 1 Then
Var CoffeePoint = CoffeePoint - 20
Var CoffeePointOld = Seeker.CurrentCoffeePoint - 20
EndIf
EndIf
EndIf
Seeker.CurrentCoffeePoint = CoffeePoint
If TaobinLevel = 1 Then
Var CoffeePointRank = CoffeePointRank + 0
Else

48
inter/aus/xml/page_collect_point_3.lxml
View file

@ -9,6 +9,7 @@
; On open
Var Timeout = 0
Var TargetTimeout = 5
;CoffeePoint
;Var CoffeePoint = 30
Var BmiYear = "0/0/0/0/0/0/0/0/0/1"
@ -35,6 +36,7 @@
Var PointDiff = 0
Var redeemButtonState = "Disable"
Var closeButtonState = "Enable"
Var RedeemType = ""
Var TaobinExpireDay = ""
@ -456,22 +458,44 @@
If CoffeePoint >= 30 Then
Var taobinP30 = "Enable"
Var taobinImgP30 = "/shell_get_free_active.png"
Var TargetTimeout = 2
Var redeemButtonState = "Invisible"
Var closeButtonState = "Invisible"
EndIf
;inter-from-consent
Var Seeker.FromConsent = 0
Var AlradyRedeem = 0
DEBUGVAR Seeker
DEBUGVAR Seeker.redeemDiscount
If Seeker = "next" Then
Var Seeker.redeemDiscount = ""
Var CurrSeeker = "curr"
If CurrSeeker.TNumberTaobinMember = Seeker.TNumberTaobinMember Then
DEBUGVAR CurrSeeker.redeemDiscount
If CurrSeeker.redeemDiscount = "" Then
Var redeemSeeker = "curr-redeem"
If redeemSeeker.phoneNumber = Seeker.TNumberTaobinMember Then
If redeemSeeker.redeem1Dollar = 1 Then
Var redeemButtonState = "Disable"
Else
If redeemSeeker.redeem2Dollar = 1 Then
If CurrSeeker.redeemDiscount = "get_free" Then
Var redeemButtonState = "Invisible"
Var closeButtonState = "Invisible"
Else
Var redeemButtonState = "Disable"
EndIf
Var AlradyRedeem = 1
EndIf
EndIf
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -482,13 +506,22 @@
;Var Timeout = Timeout + 1
If Timeout > 5 Then
Var Timeout = Timeout + 1
If Timeout > TargetTimeout Then
; goto lid straw
If CoffeePoint >= 30 Then
If Seeker = "next" Then
If AlradyRedeem = 1 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else
Var RedeemType = "get_free"
Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
EndIf
Else
Var RedeemType = "get_free"
Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -929,6 +962,7 @@
<Button>
<X> 212 </X>
<Y> 1752 </Y>
<State> closeButtonState </State>
<Filename> Var( DirImage + "/close_btn.png" )</Filename>
<FilenamePress> Var( DirImage + "/close_btn_pressed.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

17
inter/aus/xml/page_collect_point_redeem.lxml
View file

@ -45,6 +45,8 @@
Var TargetTimeout = 5
EndIf
Var Seeker.redeemDiscount = RedeemType
</EventOpen>
@ -79,14 +81,14 @@
If SELLONLINE = 1 Then
Var headerBackground = "/success_header_bg.png"
Var headerImage = "/redeem_success_header.png"
Var contentImage = "/redeem_success_content.png"
Var headerImage = DirImage + "/redeem_success_header.png"
Var contentImage = DirImage + "/redeem_success_content.png"
Var content_X = 308
Var content_Y = 1065
Else
Var headerBackground = "/fail_header_bg.png"
Var headerImage = "/redeem_fail_header.png"
Var contentImage = "/redeem_fail_content.png"
Var headerImage = DirImage + "/redeem_fail_header.png"
Var contentImage = DirImage + "/redeem_fail_content.png"
Var content_X = 243
Var content_Y = 1118
EndIf
@ -203,13 +205,8 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If RedeemType = "1_dollar" Then
Var Seeker.redeem1Dollar = 1
EndIf
If RedeemType = "2_dollar" Then
Var Seeker.redeem2Dollar = 1
EndIf
Var Seeker.redeemDiscount = RedeemType
Var congratsState = "Invisible"
Var sendCodeState = "Enable"

4
xml/open_page_collect_point.ev
View file

@ -2,8 +2,8 @@
; default
Var PageCollectPoint1 = "ROOT/taobin_project/xml/page_collect_point_1.xml"
If Country = "Australia" Then
Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.xml"
If CountryName = "Australia" Then
Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.lxml"
EndIf
If CountryName = "Singapore" Then

2
xml/page_check_member2_campaign.xml
View file

@ -772,7 +772,7 @@
;Var Timeout = Timeout + 1
Var Timeout = Timeout + 1
If Timeout > 30 Then
If MakeDrinkState = 1 Then