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

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-09-13 17:49:27 +07:00
commit eb74607983
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
xml/vending_tasks_pre_main.xml
View file

@ -31,6 +31,9 @@
If Timeout > 60 Then If Timeout > 60 Then
StatusLog "exit" StatusLog "exit"
__CMD "cancel-pw-newui" "-" "-" "-"
Open "ROOT/taobin_project/xml/page_board.xml" Open "ROOT/taobin_project/xml/page_board.xml"
EndIf EndIf
@ -42,6 +45,8 @@
Var BackToMainTime = 60 - Timeout Var BackToMainTime = 60 - Timeout
DEBUGVAR tmpPassPhrase DEBUGVAR tmpPassPhrase
__CMD "still-stay-on-pre-main" "-" "-" "-"
Refresh Refresh
@ -70,6 +75,8 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
__CMD "cancel-pw-newui" "-" "-" "-"
Open "ROOT/taobin_project/xml/vending_info2.xml" Open "ROOT/taobin_project/xml/vending_info2.xml"
</EventClick> </EventClick>
@ -218,6 +225,9 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
StatusLog "exit" StatusLog "exit"
__CMD "cancel-pw-newui" "-" "-" "-"
Open "ROOT/taobin_project/xml/page_board.xml" Open "ROOT/taobin_project/xml/page_board.xml"
</EventClick> </EventClick>
</Button> </Button>

5
xml_main/startup.xml
View file

@ -108,13 +108,8 @@
Var RandomPromotionMyworld = 0 Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0 Var RandomSalePackage = 0
<<<<<<< HEAD
Var XMLPageVersion = "8.92" Var XMLPageVersion = "8.92"
Var XMLPageVersionInt = 892 Var XMLPageVersionInt = 892
=======
Var XMLPageVersion = "8.91"
Var XMLPageVersionInt = 891
>>>>>>> 2056d9a5c4d5969c7c875c78137b83fd4d1eb872
;Oreo ;Oreo
Var OreoGuarantee = 0 Var OreoGuarantee = 0