Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
Pakin
|
|
@ -1,6 +1,3 @@
|
|||
normal_eng=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
|
||||
normal_thai=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
|
||||
press_eng=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
|
||||
press_thai=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
|
||||
disable_eng=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
|
||||
disable_thai=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
|
||||
normal_eng=ROOT/taobin_project/inter/aus/image/event/valentine_banner.png
|
||||
disable_eng=ROOT/taobin_project/inter/aus/image/event/valentine_banner.png
|
||||
press_eng=ROOT/taobin_project/inter/aus/image/event/valentine_banner.png
|
||||
|
|
|
|||
BIN
inter/aus/image/event/valentine_banner.png
Normal file
|
After Width: | Height: | Size: 224 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 9.8 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 9.8 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 9.5 KiB |
|
After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 9.3 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
BIN
inter/aus/image/page_drink_n/bn_Yuzu_americano_pro_valentine.png
Normal file
|
After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 9.8 KiB |
BIN
inter/aus/image/page_drink_n/bn_iced_yuzu_soda_pro_valentine.png
Normal file
|
After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 9.3 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 24 KiB |
|
After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 37 KiB |
|
After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.5 KiB |
|
After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 9.5 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 9.5 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 9.7 KiB |
|
After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
|
@ -37,19 +37,30 @@ if "template1" in param:
|
|||
print(file_inc2_content)
|
||||
|
||||
#print( file_inc_content)
|
||||
content_data_was_repack = file_content_main.replace(";dummy_layout.inc", file_inc_content)
|
||||
content_data = content_data_was_repack.replace(";BigLogoLayout", file_inc2_content)
|
||||
#content_data_was_repack = file_content_main.replace(";dummy_layout.inc", file_inc_content)
|
||||
content_data = file_content_main.replace(";BigLogoLayout", file_inc2_content)
|
||||
content_data = content_data.replace("<Max> 16 </Max>", "<Max> 12 </Max>")
|
||||
content_data = content_data.replace(";layout_mode", '<Mode> "EnableAdjust" </Mode>')
|
||||
content_data = content_data.replace(";banner_shifting",
|
||||
'''Var ColumnOverride[0] = 2
|
||||
Var ColumnOverride[1] = 2
|
||||
Var ColumnOverride[2] = 4
|
||||
Var ColumnOverride[3] = 4
|
||||
Var ColumnOverride[4] = 4
|
||||
Var ColumnGravity[0] = 3
|
||||
Var ColumnGravity[1] = 3
|
||||
''')
|
||||
|
||||
begin_text = content_data.index(";TAGESP")
|
||||
end_text = content_data.index(";TAGESP", begin_text + 7)
|
||||
print("TAGESP sub text = " + str(begin_text) + " end = " + str(end_text))
|
||||
tmp1 = content_data[: begin_text - 7]
|
||||
# begin_text = content_data.index(";TAGESP")
|
||||
# end_text = content_data.index(";TAGESP", begin_text + 7)
|
||||
# print("TAGESP sub text = " + str(begin_text) + " end = " + str(end_text))
|
||||
# tmp1 = content_data[: begin_text - 7]
|
||||
|
||||
tmp2 = content_data[ end_text:-1]
|
||||
#print("tmp1=" + tmp1)
|
||||
#print("tmp2=" + tmp2)
|
||||
# tmp2 = content_data[ end_text:-1]
|
||||
# #print("tmp1=" + tmp1)
|
||||
# #print("tmp2=" + tmp2)
|
||||
|
||||
content_data = tmp1 + tmp2
|
||||
# content_data = tmp1 + tmp2
|
||||
|
||||
file_xml3_out = open(directory_to_process + "/event/out_put_file1.txt", 'r')
|
||||
file_xml3_out_content = file_xml3_out.read()
|
||||
|
|
@ -88,19 +99,30 @@ if "template2" in param:
|
|||
print(file_inc2_content)
|
||||
|
||||
#print( file_inc_content)
|
||||
content_data_was_repack = file_content_main.replace(";dummy_layout.inc", file_inc_content)
|
||||
content_data = content_data_was_repack.replace(";BigLogoLayout", file_inc2_content)
|
||||
# content_data_was_repack = file_content_main.replace(";dummy_layout.inc", file_inc_content)
|
||||
content_data = file_content_main.replace(";BigLogoLayout", file_inc2_content)
|
||||
content_data = content_data.replace("<Max> 16 </Max>", "<Max> 12 </Max>")
|
||||
content_data = content_data.replace(";layout_mode", '<Mode> "EnableAdjust" </Mode>')
|
||||
content_data = content_data.replace(";banner_shifting",
|
||||
'''Var ColumnOverride[0] = 2
|
||||
Var ColumnOverride[1] = 2
|
||||
Var ColumnOverride[2] = 4
|
||||
Var ColumnOverride[3] = 4
|
||||
Var ColumnOverride[4] = 4
|
||||
Var ColumnGravity[0] = 3
|
||||
Var ColumnGravity[1] = 3
|
||||
''')
|
||||
|
||||
begin_text = content_data.index(";TAGESP")
|
||||
end_text = content_data.index(";TAGESP", begin_text + 7)
|
||||
#print("sub text = " + str(begin_text) + " end = " + str(end_text))
|
||||
tmp1 = content_data[: begin_text - 7]
|
||||
# begin_text = content_data.index(";TAGESP")
|
||||
# end_text = content_data.index(";TAGESP", begin_text + 7)
|
||||
# #print("sub text = " + str(begin_text) + " end = " + str(end_text))
|
||||
# tmp1 = content_data[: begin_text - 7]
|
||||
|
||||
tmp2 = content_data[ end_text:-1]
|
||||
#print("tmp1=" + tmp1)
|
||||
#print("tmp2=" + tmp2)
|
||||
# tmp2 = content_data[ end_text:-1]
|
||||
# #print("tmp1=" + tmp1)
|
||||
# #print("tmp2=" + tmp2)
|
||||
|
||||
content_data = tmp1 + tmp2
|
||||
# content_data = tmp1 + tmp2
|
||||
|
||||
file_xml3_out = open(directory_to_process + "/event/out_put_file2.txt", 'r')
|
||||
file_xml3_out_content = file_xml3_out.read()
|
||||
|
|
@ -140,19 +162,30 @@ if "template3" in param:
|
|||
print(file_inc3_content)
|
||||
|
||||
#print( file_inc_content)
|
||||
content_data_was_repack = file_content_main.replace(";dummy_layout.inc", file_inc_content)
|
||||
content_data = content_data_was_repack.replace(";BigLogoLayout", file_inc3_content)
|
||||
# content_data_was_repack = file_content_main.replace(";dummy_layout.inc", file_inc_content)
|
||||
content_data = file_content_main.replace(";BigLogoLayout", file_inc3_content)
|
||||
content_data = content_data.replace("<Max> 16 </Max>", "<Max> 12 </Max>")
|
||||
content_data = content_data.replace(";layout_mode", '<Mode> "EnableAdjust" </Mode>')
|
||||
content_data = content_data.replace(";banner_shifting",
|
||||
'''Var ColumnOverride[0] = 2
|
||||
Var ColumnOverride[1] = 2
|
||||
Var ColumnOverride[2] = 4
|
||||
Var ColumnOverride[3] = 4
|
||||
Var ColumnOverride[4] = 4
|
||||
Var ColumnGravity[0] = 3
|
||||
Var ColumnGravity[1] = 3
|
||||
''')
|
||||
|
||||
begin_text = content_data.index(";TAGESP")
|
||||
end_text = content_data.index(";TAGESP", begin_text + 7)
|
||||
#print("sub text = " + str(begin_text) + " end = " + str(end_text))
|
||||
tmp1 = content_data[: begin_text - 7]
|
||||
# begin_text = content_data.index(";TAGESP")
|
||||
# end_text = content_data.index(";TAGESP", begin_text + 7)
|
||||
# #print("sub text = " + str(begin_text) + " end = " + str(end_text))
|
||||
# tmp1 = content_data[: begin_text - 7]
|
||||
|
||||
tmp3 = content_data[ end_text:-1]
|
||||
#print("tmp1=" + tmp1)
|
||||
#print("tmp3=" + tmp3)
|
||||
# tmp3 = content_data[ end_text:-1]
|
||||
# #print("tmp1=" + tmp1)
|
||||
# #print("tmp3=" + tmp3)
|
||||
|
||||
content_data = tmp1 + tmp3
|
||||
# content_data = tmp1 + tmp3
|
||||
|
||||
file_xml3_out = open(directory_to_process + "/event/out_put_file3.txt", 'r')
|
||||
file_xml3_out_content = file_xml3_out.read()
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
/event/promotion_winter_warmers.lxml
|
||||
/event/promotion_valentine.lxml
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Open "ROOT/taobin_project/inter/aus/xml/page_catalog_group_winter_warmers_ignore.lxml"
|
||||
Open "ROOT/taobin_project/inter/aus/xml/page_catalog_group_pro_valentine.lxml"
|
||||
|
|
|
|||
|
|
@ -4,33 +4,9 @@
|
|||
<Y> 520 </Y>
|
||||
|
||||
<State> BigButtonEnable </State>
|
||||
<Filename>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = ###normal_eng
|
||||
Else
|
||||
Var return = ###normal_thai
|
||||
EndIf
|
||||
)
|
||||
</Filename>
|
||||
<FilenamePress>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = ###press_eng
|
||||
Else
|
||||
Var return = ###press_thai
|
||||
EndIf
|
||||
)
|
||||
</FilenamePress>
|
||||
<FilenameDisable>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = ###disable_eng
|
||||
Else
|
||||
Var return = ###disable_thai
|
||||
EndIf
|
||||
)
|
||||
</FilenameDisable>
|
||||
<Filename> ###normal_eng </Filename>
|
||||
<FilenamePress> ###press_eng </FilenamePress>
|
||||
<FilenameDisable> ###disable_eng </FilenameDisable>
|
||||
<EventOnClick>
|
||||
|
||||
###EventOnClick
|
||||
|
|
|
|||