Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
d4dbb49be7
3 changed files with 13 additions and 17 deletions
|
|
@ -9,8 +9,8 @@
|
|||
; Enable app game
|
||||
Var GameEnableFromTrickerEv = 0
|
||||
|
||||
Var New_Payment = 1
|
||||
Var CleanFeedbackFlag = 1
|
||||
Var New_Payment = 0
|
||||
Var CleanFeedbackFlag = 0
|
||||
|
||||
Var HappyEasterPro = 0
|
||||
Var AutumnBreezePro = 0
|
||||
|
|
|
|||
|
|
@ -577,12 +577,12 @@
|
|||
|
||||
DEBUGVAR OpenFromInstMenuTab
|
||||
If OpenFromInstMenuTab > 0 Then
|
||||
DEBUGVAR OpenFromInstMenuTab
|
||||
TabMenuVisibleInst OpenFromInstMenuTab
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Open OpenFromXML
|
||||
EndIf
|
||||
|
||||
Open OpenFromXML
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -3584,12 +3584,12 @@
|
|||
|
||||
DEBUGVAR OpenFromInstMenuTab
|
||||
If OpenFromInstMenuTab > 0 Then
|
||||
DEBUGVAR OpenFromInstMenuTab
|
||||
TabMenuVisibleInst OpenFromInstMenuTab
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
|
||||
Else
|
||||
Open OpenFromXML
|
||||
EndIf
|
||||
|
||||
Open OpenFromXML
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<X> 53 </X>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue