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

fix Conflict merge

Browse source
This commit is contained in:
miggaze 2021-11-10 15:46:37 +07:00
commit cea1107abf
60 changed files with 4728 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

5
xml/page_board.xml
View file

@ -11,6 +11,7 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml"
Var FileNumber = 1
DEBUGVAR SoundVolume
Var GetFreeFromError = 0
Var taobin_version = "1.53"
@ -490,7 +491,7 @@
<State> ShowButtonClick </State>
;<Color> "0x00BDFF" </Color>
<FilenamePress> "ROOT/taobin_project/image/main_page/bp_main_page_start.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
@ -626,7 +627,7 @@
Var countClick = 0
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_tel_number_mask.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_free.xml"
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"