Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
e42bd8119e
12 changed files with 304 additions and 227 deletions
|
|
@ -1 +1 @@
|
|||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_peach.xml"
|
||||
Var BigButtonEnable = "Invisible"
|
||||
|
|
|
|||
|
|
@ -11314,8 +11314,9 @@ LIMENADE SODA" </Value>
|
|||
<Button>
|
||||
<X> 42 </X>
|
||||
<Y> 520 </Y>
|
||||
<State> BigButtonEnable </State>
|
||||
<Filename>
|
||||
|
||||
<State> BigButtonEnable </State>
|
||||
<Filename>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/pro_peach.png"
|
||||
|
|
@ -11327,7 +11328,7 @@ LIMENADE SODA" </Value>
|
|||
<FilenamePress>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/pro_peach.png"
|
||||
Var return = "ROOT/taobin_project/image/event/pro_peach.png"
|
||||
Else
|
||||
Var return = "ROOT/taobin_project/image/event/pro_peach.png"
|
||||
EndIf
|
||||
|
|
@ -11345,9 +11346,46 @@ LIMENADE SODA" </Value>
|
|||
<EventOnClick>
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_peach.xml"
|
||||
|
||||
|
||||
</EventOnClick>
|
||||
|
||||
|
||||
<Video>
|
||||
<X> 42 </X>
|
||||
<Y> 520 </Y>
|
||||
<Width> 484 </Width>
|
||||
<Height> 616 </Height>
|
||||
<Loop> "true" </Loop>
|
||||
<State>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "Invisible"
|
||||
Else
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Filename> "ROOT/taobin_project/image/event/pro_peach_th.mp4" </Filename>
|
||||
</Video>
|
||||
|
||||
<Video>
|
||||
<X> 42 </X>
|
||||
<Y> 520 </Y>
|
||||
<Width> 484 </Width>
|
||||
<Height> 616 </Height>
|
||||
<State>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Loop> "true" </Loop>
|
||||
<Filename> "ROOT/taobin_project/image/event/pro_peach_en.mp4" </Filename>
|
||||
</Video>
|
||||
|
||||
</Button>
|
||||
|
||||
<EventUnitTest1>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,9 @@
|
|||
<Button>
|
||||
<X> 42 </X>
|
||||
<Y> 520 </Y>
|
||||
<State> BigButtonEnable </State>
|
||||
<Filename>
|
||||
|
||||
<State> BigButtonEnable </State>
|
||||
<Filename>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = ###normal_eng
|
||||
|
|
@ -15,26 +16,64 @@
|
|||
<FilenamePress>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = ###press_eng
|
||||
Var return = ###normal_eng
|
||||
Else
|
||||
Var return = ###press_thai
|
||||
Var return = ###normal_thai
|
||||
EndIf
|
||||
)
|
||||
</FilenamePress>
|
||||
<FilenameDisable>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = ###disable_eng
|
||||
Var return = ###normal_eng
|
||||
Else
|
||||
Var return = ###disable_thai
|
||||
Var return = ###normal_thai
|
||||
EndIf
|
||||
)
|
||||
</FilenameDisable>
|
||||
<EventOnClick>
|
||||
|
||||
###EventOnClick
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_peach.xml"
|
||||
|
||||
</EventOnClick>
|
||||
|
||||
|
||||
<Video>
|
||||
<X> 42 </X>
|
||||
<Y> 520 </Y>
|
||||
<Width> 484 </Width>
|
||||
<Height> 616 </Height>
|
||||
<Loop> "true" </Loop>
|
||||
<State>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "Invisible"
|
||||
Else
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Filename> "ROOT/taobin_project/image/event/pro_peach_th.mp4" </Filename>
|
||||
</Video>
|
||||
|
||||
<Video>
|
||||
<X> 42 </X>
|
||||
<Y> 520 </Y>
|
||||
<Width> 484 </Width>
|
||||
<Height> 616 </Height>
|
||||
<State>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Loop> "true" </Loop>
|
||||
<Filename> "ROOT/taobin_project/image/event/pro_peach_en.mp4" </Filename>
|
||||
</Video>
|
||||
|
||||
</Button>
|
||||
|
||||
<EventUnitTest1>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue