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

after merge Release taobin 1.24

Browse source
This commit is contained in:
kong 2021-02-05 15:40:53 +07:00
parent 36ceee08bc
commit 944a206b77
3 changed files with 2 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

11
xml/page_board.xml
View file

@ -107,15 +107,12 @@
StopLongPlay
<<<<<<< HEAD
Var TimerFirst = "true"
; TODO: remove when release
;Var IgnoreNetCore = "true"
=======
>>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
</EventOpen>
<Timeout> 1000 </Timeout>
@ -243,11 +240,7 @@
<Video>
<X> 0 </X>
<Y> 0 </Y>
<<<<<<< HEAD
;<Loop>"true"</Loop>
=======
<Loop>"true"</Loop>
>>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
;<Volume> 80 </Volume>
<Filename> "ROOT/taobin_project/video/main_page.mp4" </Filename>
</Video>
@ -309,11 +302,7 @@
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
<<<<<<< HEAD
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_memeber.xml"
=======
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"
>>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"