Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
51bb9a4172
6 changed files with 43 additions and 19 deletions
|
|
@ -1781,6 +1781,8 @@ EndIf
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
;VendingQR OFF
|
||||
|
||||
SAVELOG "AdultState1 click"
|
||||
|
||||
If CoinInOK = 0 Then
|
||||
If CancelFlag = 0 Then
|
||||
|
|
@ -1830,6 +1832,9 @@ EndIf
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
;VendingQR OFF
|
||||
|
||||
SAVELOG "AdultState3 click"
|
||||
|
||||
|
||||
If CoinInOK = 0 Then
|
||||
If CancelFlag = 0 Then
|
||||
|
|
@ -1867,7 +1872,8 @@ EndIf
|
|||
|
||||
|
||||
|
||||
|
||||
SAVELOG "alphaState2 click"
|
||||
|
||||
If CoinInOK = 0 Then
|
||||
If CancelFlag = 0 Then
|
||||
SAVELOG "ButtonCancleAlpha2 > Cancle Order."
|
||||
|
|
@ -1920,11 +1926,7 @@ EndIf
|
|||
<Y> 748 </Y>
|
||||
<State> alphaState3 </State>
|
||||
<Filename> eval(
|
||||
If EnoughChange = "yes" Then
|
||||
Var return = DirImage2 + "/img_popup12.png"
|
||||
Else
|
||||
Var return = DirImage2 + "/img_popup12_NotEnoughCoin.png"
|
||||
EndIf
|
||||
Var return = DirImage2 + "/img_popup12_NotEnoughCoin.png"
|
||||
) </Filename>
|
||||
</Image>
|
||||
|
||||
|
|
@ -1959,13 +1961,14 @@ EndIf
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
|
||||
SAVELOG "alphaState3 click"
|
||||
CoinVending BILLREJECT
|
||||
Var alphaState3 = "Invisible"
|
||||
|
||||
If SettingDisableTaobinCredit = "true" Then
|
||||
|
||||
If EnoughChange = "yes" Then
|
||||
If EnoughChange = "yes" Then
|
||||
|
||||
|
||||
Else
|
||||
|
|
@ -2027,7 +2030,7 @@ EndIf
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
SAVELOG "alphaState3_offline click"
|
||||
CoinVending BILLREJECT
|
||||
Var alphaState3_offline = "Invisible"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue