Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
b19b0509d7
3 changed files with 1396 additions and 12 deletions
1384
ui/error_code.tsv
Normal file
1384
ui/error_code.tsv
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -73,27 +73,27 @@
|
|||
<Filename>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4"
|
||||
Var return = "ROOT/taobin_project/image/event/americano/americano_banner.png"
|
||||
Else
|
||||
Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4"
|
||||
Var return = "ROOT/taobin_project/image/event/americano/americano_banner.png"
|
||||
EndIf
|
||||
)
|
||||
</Filename>
|
||||
<FilenamePress>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4"
|
||||
Var return = "ROOT/taobin_project/image/event/americano/americano_banner.png"
|
||||
Else
|
||||
Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4"
|
||||
Var return = "ROOT/taobin_project/image/event/americano/americano_banner.png"
|
||||
EndIf
|
||||
)
|
||||
</FilenamePress>
|
||||
<FilenameDisable>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4"
|
||||
Var return = "ROOT/taobin_project/image/event/americano/americano_banner.png"
|
||||
Else
|
||||
Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4"
|
||||
Var return = "ROOT/taobin_project/image/event/americano/americano_banner.png"
|
||||
EndIf
|
||||
)
|
||||
</FilenameDisable>
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
"name": "americano",
|
||||
"template": "/event/promotion_video_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
|
||||
"press_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
|
||||
"press_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
|
||||
"normal_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
|
||||
"video_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
|
||||
"video_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue