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

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

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

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

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

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

@ -153,24 +153,6 @@
Var CoffeePoint = PointTaobin + CoffeePoint1 Var CoffeePoint = PointTaobin + CoffeePoint1
Var CoffeePointOld = 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 If TaobinLevel = 1 Then
Var CoffeePointRank = CoffeePointRank + 0 Var CoffeePointRank = CoffeePointRank + 0
Else Else

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

@ -9,6 +9,7 @@
; On open ; On open
Var Timeout = 0 Var Timeout = 0
Var TargetTimeout = 5
;CoffeePoint ;CoffeePoint
;Var CoffeePoint = 30 ;Var CoffeePoint = 30
Var BmiYear = "0/0/0/0/0/0/0/0/0/1" Var BmiYear = "0/0/0/0/0/0/0/0/0/1"
@ -35,6 +36,7 @@
Var PointDiff = 0 Var PointDiff = 0
Var redeemButtonState = "Disable" Var redeemButtonState = "Disable"
Var closeButtonState = "Enable"
Var RedeemType = "" Var RedeemType = ""
Var TaobinExpireDay = "" Var TaobinExpireDay = ""
@ -456,22 +458,44 @@
If CoffeePoint >= 30 Then If CoffeePoint >= 30 Then
Var taobinP30 = "Enable" Var taobinP30 = "Enable"
Var taobinImgP30 = "/shell_get_free_active.png" Var taobinImgP30 = "/shell_get_free_active.png"
Var TargetTimeout = 2
Var redeemButtonState = "Invisible"
Var closeButtonState = "Invisible"
EndIf EndIf
;inter-from-consent ;inter-from-consent
Var Seeker.FromConsent = 0 Var Seeker.FromConsent = 0
Var AlradyRedeem = 0
Var redeemSeeker = "curr-redeem" DEBUGVAR Seeker
If redeemSeeker.phoneNumber = Seeker.TNumberTaobinMember Then DEBUGVAR Seeker.redeemDiscount
If redeemSeeker.redeem1Dollar = 1 Then
Var redeemButtonState = "Disable"
Else If Seeker = "next" Then
If redeemSeeker.redeem2Dollar = 1 Then Var Seeker.redeemDiscount = ""
Var redeemButtonState = "Disable" Var CurrSeeker = "curr"
If CurrSeeker.TNumberTaobinMember = Seeker.TNumberTaobinMember Then
DEBUGVAR CurrSeeker.redeemDiscount
If CurrSeeker.redeemDiscount = "" Then
Else
If CurrSeeker.redeemDiscount = "get_free" Then
Var redeemButtonState = "Invisible"
Var closeButtonState = "Invisible"
Else
Var redeemButtonState = "Disable"
EndIf
Var AlradyRedeem = 1
EndIf EndIf
EndIf EndIf
EndIf EndIf
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
@ -482,13 +506,22 @@
;Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If Timeout > 5 Then If Timeout > TargetTimeout Then
; goto lid straw ; goto lid straw
If CoffeePoint >= 30 Then If CoffeePoint >= 30 Then
Var RedeemType = "get_free" If Seeker = "next" Then
Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml" 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 Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf EndIf
@ -929,6 +962,7 @@
<Button> <Button>
<X> 212 </X> <X> 212 </X>
<Y> 1752 </Y> <Y> 1752 </Y>
<State> closeButtonState </State>
<Filename> Var( DirImage + "/close_btn.png" )</Filename> <Filename> Var( DirImage + "/close_btn.png" )</Filename>
<FilenamePress> Var( DirImage + "/close_btn_pressed.png" )</FilenamePress> <FilenamePress> Var( DirImage + "/close_btn_pressed.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <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 Var TargetTimeout = 5
EndIf EndIf
Var Seeker.redeemDiscount = RedeemType
</EventOpen> </EventOpen>
@ -79,14 +81,14 @@
If SELLONLINE = 1 Then If SELLONLINE = 1 Then
Var headerBackground = "/success_header_bg.png" Var headerBackground = "/success_header_bg.png"
Var headerImage = "/redeem_success_header.png" Var headerImage = DirImage + "/redeem_success_header.png"
Var contentImage = "/redeem_success_content.png" Var contentImage = DirImage + "/redeem_success_content.png"
Var content_X = 308 Var content_X = 308
Var content_Y = 1065 Var content_Y = 1065
Else Else
Var headerBackground = "/fail_header_bg.png" Var headerBackground = "/fail_header_bg.png"
Var headerImage = "/redeem_fail_header.png" Var headerImage = DirImage + "/redeem_fail_header.png"
Var contentImage = "/redeem_fail_content.png" Var contentImage = DirImage + "/redeem_fail_content.png"
Var content_X = 243 Var content_X = 243
Var content_Y = 1118 Var content_Y = 1118
EndIf EndIf
@ -203,13 +205,8 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
If RedeemType = "1_dollar" Then
Var Seeker.redeem1Dollar = 1
EndIf
If RedeemType = "2_dollar" Then Var Seeker.redeemDiscount = RedeemType
Var Seeker.redeem2Dollar = 1
EndIf
Var congratsState = "Invisible" Var congratsState = "Invisible"
Var sendCodeState = "Enable" Var sendCodeState = "Enable"

4
xml/open_page_collect_point.ev
View file

@ -2,8 +2,8 @@
; default ; default
Var PageCollectPoint1 = "ROOT/taobin_project/xml/page_collect_point_1.xml" Var PageCollectPoint1 = "ROOT/taobin_project/xml/page_collect_point_1.xml"
If Country = "Australia" Then If CountryName = "Australia" Then
Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.xml" Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.lxml"
EndIf EndIf
If CountryName = "Singapore" Then 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 Timeout > 30 Then
If MakeDrinkState = 1 Then If MakeDrinkState = 1 Then