merge
This commit is contained in:
commit
cc7ace4baf
314 changed files with 5768 additions and 1322 deletions
|
|
@ -7,6 +7,9 @@
|
|||
<Sound> PlaySoundLag </Sound>
|
||||
<EventOpen>
|
||||
|
||||
Var cash_disable = "0"
|
||||
READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable
|
||||
DEBUGVAR cash_disable
|
||||
|
||||
|
||||
|
||||
|
|
@ -159,6 +162,11 @@
|
|||
|
||||
Else
|
||||
Var PayState1 = "Enable"
|
||||
|
||||
If cash_disable = "1" Then
|
||||
Var PayState1 = "Press"
|
||||
EndIf
|
||||
|
||||
If Seeker.IntVendingCampaign = 0 Then
|
||||
Var PayState2 = "Enable"
|
||||
Var PayState4 = "Enable"
|
||||
|
|
@ -541,15 +549,12 @@
|
|||
|
||||
|
||||
If ReqPayInfoFlag2 = 1 Then
|
||||
|
||||
DEBUGVAR VendingBank
|
||||
If VendingBank = "kbank" Then
|
||||
Var Seeker.CampaignPayChanel = "kbank"
|
||||
Else
|
||||
Var Seeker.CampaignPayChanel = "cash"
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
If ReqPayInfoFlag2 = 2 Then
|
||||
Var Seeker.CampaignPayChanel = "shopee"
|
||||
|
|
@ -1201,11 +1206,12 @@
|
|||
</EventVDCancle>
|
||||
|
||||
|
||||
;<Image>
|
||||
;<X> 0 </X>
|
||||
;<Y> 0 </Y>
|
||||
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
|
||||
;</Image>
|
||||
<Image>
|
||||
<X> 91 </X>
|
||||
<Y> 1180 </Y>
|
||||
<State> MenuCautionImageStage0 </State>
|
||||
<Filename> "ROOT/taobin_project/image/warning/image_warning_energy_drink.png" </Filename>
|
||||
</Image>
|
||||
|
||||
<Video>
|
||||
<X> 0 </X>
|
||||
|
|
@ -1714,7 +1720,7 @@
|
|||
|
||||
<Text>
|
||||
<X> 0 </X>
|
||||
<Y> 1132 </Y>
|
||||
<Y> 1065 </Y>
|
||||
<Width> 1080</Width>
|
||||
<Align> Center </Align>
|
||||
<Size> 72 </Size>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue