AUS: remove redeem button
This commit is contained in:
parent
486cf50a40
commit
5edf072bff
5 changed files with 76 additions and 77 deletions
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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] = ""
|
||||||
|
|
|
||||||
|
|
@ -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] = ""
|
||||||
|
|
|
||||||
|
|
@ -960,7 +960,7 @@
|
||||||
</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>
|
||||||
|
|
@ -979,39 +979,39 @@
|
||||||
</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>
|
||||||
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue