Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
51a78f7f0e
3 changed files with 12 additions and 31 deletions
|
|
@ -101,6 +101,10 @@ Else
|
|||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_powerup_free_1.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
If MondayBananaPro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_monday_banana.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
<Video>
|
||||
<Width> 484 </Width>
|
||||
<Height> 616 </Height>
|
||||
<Loop> "true" </Loop>
|
||||
<State>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Filename> ###video_en </Filename>
|
||||
</Video>
|
||||
|
||||
<Video>
|
||||
<Width> 484 </Width>
|
||||
<Height> 616 </Height>
|
||||
<State>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "Invisible"
|
||||
Else
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Loop> "true" </Loop>
|
||||
<Filename> ###video_th </Filename>
|
||||
</Video>
|
||||
8
xml/sometime/top_spender.xml
Normal file
8
xml/sometime/top_spender.xml
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<Popup>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 846 </Height>
|
||||
<Background> "0xFF0000" </Background>
|
||||
<EventOpen>
|
||||
</EventOpen>
|
||||
|
||||
</Popup>
|
||||
Loading…
Add table
Add a link
Reference in a new issue