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

AUS: remove redeem button

Browse source
This commit is contained in:
Kenta420 2025-02-05 10:57:15 +07:00
parent 486cf50a40
commit 5edf072bff
5 changed files with 76 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1118,13 +1118,13 @@
Var Cid = 26 Var Cid = 26
If NewCollectPointFlag = 1 Then If NewCollectPointFlag = 1 Then
If Seeker.redeemDiscount = "2_dollar" Then ;If Seeker.redeemDiscount = "2_dollar" Then
Var Cid = 49 ; Var Cid = 49
EndIf ;EndIf
If Seeker.redeemDiscount = "1_dollar" Then ;If Seeker.redeemDiscount = "1_dollar" Then
Var Cid = 48 ; Var Cid = 48
EndIf ;EndIf
Var Seeker.redeemDiscount = "" Var Seeker.redeemDiscount = ""
EndIf EndIf
@ -1234,13 +1234,13 @@
If AddData = 1 Then If AddData = 1 Then
Var Cid = 26 Var Cid = 26
If NewCollectPointFlag = 1 Then If NewCollectPointFlag = 1 Then
If Seeker.redeemDiscount = "2_dollar" Then ;If Seeker.redeemDiscount = "2_dollar" Then
Var Cid = 49 ; Var Cid = 49
EndIf ;EndIf
If Seeker.redeemDiscount = "1_dollar" Then ;If Seeker.redeemDiscount = "1_dollar" Then
Var Cid = 48 ; Var Cid = 48
EndIf ;EndIf
Var Seeker.redeemDiscount = "" Var Seeker.redeemDiscount = ""
EndIf EndIf

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

@ -619,13 +619,13 @@
Var Cid = 26 Var Cid = 26
DEBUGVAR "Brewing3Conti" DEBUGVAR "Brewing3Conti"
If NewCollectPointFlag = 1 Then If NewCollectPointFlag = 1 Then
If Seeker.redeemDiscount = "2_dollar" Then ;If Seeker.redeemDiscount = "2_dollar" Then
Var Cid = 49 ; Var Cid = 49
EndIf ;EndIf
If Seeker.redeemDiscount = "1_dollar" Then ;If Seeker.redeemDiscount = "1_dollar" Then
Var Cid = 48 ; Var Cid = 48
EndIf ;EndIf
DEBUGVAR Seeker.redeemDiscount DEBUGVAR Seeker.redeemDiscount
Var Seeker.redeemDiscount = "" Var Seeker.redeemDiscount = ""
@ -747,13 +747,13 @@
Var Cid = 26 Var Cid = 26
If NewCollectPointFlag = 1 Then If NewCollectPointFlag = 1 Then
If Seeker.redeemDiscount = "2_dollar" Then ;If Seeker.redeemDiscount = "2_dollar" Then
Var Cid = 49 ; Var Cid = 49
EndIf ;EndIf
If Seeker.redeemDiscount = "1_dollar" Then ;If Seeker.redeemDiscount = "1_dollar" Then
Var Cid = 48 ; Var Cid = 48
EndIf ;EndIf
Var Seeker.redeemDiscount = "" Var Seeker.redeemDiscount = ""
EndIf EndIf

2
inter/aus/xml/page_catalog_group_other.lxml
View file

@ -3327,7 +3327,7 @@
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "COCONUT LYCHEE SODA" Var NameLang[1][0] = ""
Var NameLang[1][1] = "" Var NameLang[1][1] = ""
Var NameLang[1][2] = "" Var NameLang[1][2] = ""
Var NameLang[1][3] = "" Var NameLang[1][3] = ""

2
inter/aus/xml/page_catalog_group_promotion_coconut.lxml
View file

@ -3867,7 +3867,7 @@
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "COCONUT LYCHEE SODA" Var NameLang[1][0] = ""
Var NameLang[1][1] = "" Var NameLang[1][1] = ""
Var NameLang[1][2] = "" Var NameLang[1][2] = ""
Var NameLang[1][3] = "" Var NameLang[1][3] = ""

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

@ -27,7 +27,7 @@
Var DirImage = "ROOT/taobin_project/inter/aus/image/collect_point/show_point" Var DirImage = "ROOT/taobin_project/inter/aus/image/collect_point/show_point"
If show_eng = "true" Then If show_eng = "true" Then
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
Else Else
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
@ -44,7 +44,7 @@
Var TaobinExpireMonthX = "" Var TaobinExpireMonthX = ""
Var TaobinExpireYear = "" Var TaobinExpireYear = ""
SPLIT TaobinExpire "/" 1 TaobinExpireDay SPLIT TaobinExpire "/" 1 TaobinExpireDay
SPLIT TaobinExpire "/" 2 TaobinExpireMonth SPLIT TaobinExpire "/" 2 TaobinExpireMonth
@ -127,7 +127,7 @@
If TaobinLevel = "1" Then If TaobinLevel = "1" Then
Var PointMaskState = "Enable" Var PointMaskState = "Enable"
EndIf EndIf
@ -168,7 +168,7 @@
If TaobinLevel = "3" Then If TaobinLevel = "3" Then
Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp
Var PointDiff = 200 - CoffeePointRank Var PointDiff = 200 - CoffeePointRank
Var TaobinLevelDesc2 = "Earn " + PointDiff Var TaobinLevelDesc2 = "Earn " + PointDiff
Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells " Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells "
@ -189,7 +189,7 @@
If TaobinLevel = "4" Then If TaobinLevel = "4" Then
Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp
Var TaobinLevelDesc2 = "" Var TaobinLevelDesc2 = ""
Var TaobinLeveImg = "/taoLevel4.png" Var TaobinLeveImg = "/taoLevel4.png"
@ -465,7 +465,7 @@
;inter-from-consent ;inter-from-consent
Var Seeker.FromConsent = 0 Var Seeker.FromConsent = 0
Var AlradyRedeem = 0 Var AlradyRedeem = 0
DEBUGVAR Seeker DEBUGVAR Seeker
@ -482,7 +482,7 @@
If CurrSeeker.redeemDiscount = "" Then If CurrSeeker.redeemDiscount = "" Then
Else Else
If CurrSeeker.redeemDiscount = "get_free" Then If CurrSeeker.redeemDiscount = "get_free" Then
Var redeemButtonState = "Invisible" Var redeemButtonState = "Invisible"
Var closeButtonState = "Invisible" Var closeButtonState = "Invisible"
@ -498,13 +498,13 @@
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
Var CountDownBrewing = BREW_CNT Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If Timeout > TargetTimeout Then If Timeout > TargetTimeout Then
@ -527,18 +527,18 @@
EndIf EndIf
EndIf EndIf
TimerReset TimerReset
Refresh Refresh
</EventTimeout> </EventTimeout>
<EventSecurity> <EventSecurity>
Open "/media/bt/xml/security_alarm.xml" Open "/media/bt/xml/security_alarm.xml"
</EventSecurity> </EventSecurity>
@ -960,58 +960,58 @@
</Text> </Text>
<Button> <Button>
<X> 212 </X> <X> 262 </X>
<Y> 1752 </Y> <Y> 1752 </Y>
<State> closeButtonState </State> <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>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
; goto lid straw ; goto lid straw
If CoffeePoint >= 30 Then If CoffeePoint >= 30 Then
Var RedeemType = "get_free" Var RedeemType = "get_free"
Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml" Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
EndIf EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick> </EventClick>
</Button> </Button>
<Button> ;<Button>
<X> 548 </X> ;<X> 548 </X>
<Y> 1752 </Y> ;<Y> 1752 </Y>
<State> redeemButtonState </State> ;<State> redeemButtonState </State>
<Filename> Var( DirImage + "/redeem_btn.png" )</Filename> ;<Filename> Var( DirImage + "/redeem_btn.png" )</Filename>
<FilenamePress> Var( DirImage + "/redeem_btn_pressed.png" )</FilenamePress> ;<FilenamePress> Var( DirImage + "/redeem_btn_pressed.png" )</FilenamePress>
<FilenameDisable> Var( DirImage + "/redeem_btn_disable.png" ) </FilenameDisable> ;<FilenameDisable> Var( DirImage + "/redeem_btn_disable.png" ) </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> ;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> ;<Volume> SoundVolume </Volume>
<EventClick> ;<EventClick>
; goto lid straw ; ; goto lid straw
;
If CoffeePoint >= 10 Then ; If CoffeePoint >= 10 Then
Var RedeemType = "1_dollar" ; Var RedeemType = "1_dollar"
EndIf ; EndIf
;
If CoffeePoint >= 20 Then ; If CoffeePoint >= 20 Then
Var RedeemType = "2_dollar" ; Var RedeemType = "2_dollar"
EndIf ; EndIf
;
If CoffeePoint >= 30 Then ; If CoffeePoint >= 30 Then
Var RedeemType = "get_free" ; Var RedeemType = "get_free"
EndIf ; EndIf
;
DEBUGVAR RedeemType ; DEBUGVAR RedeemType
;
If RedeemType = "" Then ; If RedeemType = "" Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml" ; Open "ROOT/taobin_project/xml/page_lid_straw.xml"
Else ; Else
Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml" ; Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
EndIf ; EndIf
</EventClick> ;</EventClick>
</Button> ;</Button>
@ -1047,4 +1047,3 @@
</EventUnitTest4> </EventUnitTest4>
</Popup> </Popup>