Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
e80ce060cc
82 changed files with 728 additions and 1008 deletions
|
|
@ -458,12 +458,6 @@
|
|||
Machine DoorClose
|
||||
|
||||
|
||||
If ShoppyPayEnable = "true" Then
|
||||
Else
|
||||
Var PayState5 = "Disable"
|
||||
Var PayState6 = "Disable"
|
||||
EndIf
|
||||
|
||||
|
||||
If web_readyOK = "true" Then
|
||||
|
||||
|
|
|
|||
|
|
@ -441,12 +441,6 @@
|
|||
Machine DoorClose
|
||||
|
||||
|
||||
If ShoppyPayEnable = "true" Then
|
||||
Else
|
||||
Var PayState5 = "Disable"
|
||||
Var PayState6 = "Disable"
|
||||
EndIf
|
||||
|
||||
|
||||
If web_readyOK = "true" Then
|
||||
|
||||
|
|
|
|||
|
|
@ -1121,14 +1121,7 @@
|
|||
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
|
||||
;</Image>
|
||||
|
||||
<Video>
|
||||
<X> 0 </X>
|
||||
<Y> 0 </Y>
|
||||
<Width> 1080</Width>
|
||||
<Height> 380 </Height>
|
||||
<Loop> "true" </Loop>
|
||||
<Filename> video_menu_0 </Filename>
|
||||
</Video>
|
||||
;include="ROOT/taobin_project/inc/video.inc"
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue