pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-06-24 19:11:35 +07:00
commit a96622d3c8
40 changed files with 64170 additions and 1653 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inter/aus/xml/page_brewing3.lxml
View file

@ -581,9 +581,6 @@
EndIf EndIf
EndIf EndIf
CashlessReq SUCCESS
</EventOpen> </EventOpen>
<EventLanguageOnChange> <EventLanguageOnChange>
Var XPosiShowCountDownBrew = 768 Var XPosiShowCountDownBrew = 768

1293
inter/aus/xml/page_brewing3Conti.xml Normal file
View file

File diff suppressed because it is too large Load diff

6
inter/mys/animation01/play_list.tsv
View file

@ -199,9 +199,9 @@ ROSALYN ALMOST DIRTY 12-01-02-0037 1 7 50 2 3 4 5 24 66 6:06 32
นมยูซุร้อน 12-03-01-0023 1 53 6 16 24 120 3:00 23 นมโตเกียวบานาน่า 12-03-01-0023 1 56 6 16 24 120 3:00 23
นมยูซุเย็น 12-03-02-0023 1 53 6 23 24 120 4:00 23 นมโตเกียวบานาน่า 12-03-02-0023 1 56 6 23 24 120 4:00 23
นมยูซุปั่น 12-03-03-0023 1 53 6 23 41 24 120 5:00 23 นมโตเกียวบานาน่า 12-03-03-0023 1 56 6 23 41 24 120 5:00 23
ยูซุโซดา 12-05-02-0045 1 53 23 23 13 24 120 6:00 23 ยูซุโซดา 12-05-02-0045 1 53 23 23 13 24 120 6:00 23
อเมริกาโซดา 12-01-02-0041 1 2 3 4 5 23 16 13 24 120 3:00 23 อเมริกาโซดา 12-01-02-0041 1 2 3 4 5 23 16 13 24 120 3:00 23

Can't render this file because it has a wrong number of fields in line 40.

12129
inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml Normal file
View file

File diff suppressed because it is too large Load diff

540
inter/mys/xml/event/dummy_layout_promotion.py
View file

@ -12,264 +12,346 @@ file_inc_content = file_inc.read()
file_xml.close() file_xml.close()
if "template1" in param:
file_inc2 = open(directory_to_process + "/event/promotion_template1.inc", 'r')
file_inc2_content = file_inc2.read()
file_inc_img = open(directory_to_process + "/../image/event/image_template1", 'r')
file_inc2_img_content = file_inc_img.read()
file_inc2 = open(directory_to_process + "/event/promotion_template1.inc", 'r') # replace key.
file_inc2_content = file_inc2.read()
file_inc_img = open(directory_to_process + "/../image/event/image_template1", 'r')
file_inc2_img_content = file_inc_img.read()
# replace key. sp_key = file_inc2_img_content.split("\n")
print("sp_key = " + str(len( sp_key)))
sp_key = file_inc2_img_content.split("\n") for sp_line in sp_key:
print("sp_key = " + str(len( sp_key))) sp_line = sp_line.strip()
for sp_line in sp_key: key_val = sp_line.split("=")
sp_line = sp_line.strip() if len( key_val) == 2:
key_val = sp_line.split("=") print("k = " + key_val[0] + " val=" + key_val[1])
if len( key_val) == 2: file_inc2_content = file_inc2_content.replace( "###" + key_val[0], '"' + key_val[1].strip() + '"')
print("k = " + key_val[0] + " val=" + key_val[1])
file_inc2_content = file_inc2_content.replace( "###" + key_val[0], '"' + key_val[1].strip() + '"')
file_inc_event_click = open(directory_to_process + "/event/promotion_onclick1.inc", 'r') file_inc_event_click = open(directory_to_process + "/event/promotion_onclick1.inc", 'r')
file_inc_event_click_content = file_inc_event_click.read() file_inc_event_click_content = file_inc_event_click.read()
file_inc2_content = file_inc2_content.replace("###EventOnClick", file_inc_event_click_content) file_inc2_content = file_inc2_content.replace("###EventOnClick", file_inc_event_click_content)
print(file_inc2_content) print(file_inc2_content)
#print( file_inc_content) #print( file_inc_content)
content_data_was_repack = file_content_main.replace(";dummy_layout.inc", 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 = content_data_was_repack.replace(";BigLogoLayout", file_inc2_content)
begin_text = content_data.index(";TAGESP") begin_text = content_data.index(";TAGESP")
end_text = content_data.index(";TAGESP", begin_text + 7) end_text = content_data.index(";TAGESP", begin_text + 7)
print("TAGESP sub text = " + str(begin_text) + " end = " + str(end_text)) print("TAGESP sub text = " + str(begin_text) + " end = " + str(end_text))
tmp1 = content_data[: begin_text - 7] tmp1 = content_data[: begin_text - 7]
tmp2 = content_data[ end_text:-1] tmp2 = content_data[ end_text:-1]
#print("tmp1=" + tmp1) #print("tmp1=" + tmp1)
#print("tmp2=" + tmp2) #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 = open(directory_to_process + "/event/out_put_file1.txt", 'r')
file_xml3_out_content = file_xml3_out.read() file_xml3_out_content = file_xml3_out.read()
file_xml3_out_content = file_xml3_out_content.strip() file_xml3_out_content = file_xml3_out_content.strip()
file_xml3_out_content = file_xml3_out_content.replace("\r", "") file_xml3_out_content = file_xml3_out_content.replace("\r", "")
file_xml3_out_content = file_xml3_out_content.replace("\n", "") file_xml3_out_content = file_xml3_out_content.replace("\n", "")
file_xml3 = open(directory_to_process + file_xml3_out_content, 'w') file_xml3 = open(directory_to_process + file_xml3_out_content, 'w')
file_xml3.write( content_data) file_xml3.write( content_data)
file_xml3.close() file_xml3.close()
if "template2" in param:
file_inc2 = open(directory_to_process + "/event/promotion_template2.inc", 'r')
file_inc2_content = file_inc2.read()
file_inc_img = open(directory_to_process + "/../image/event/image_template2", 'r')
file_inc2_img_content = file_inc_img.read()
# replace key.
sp_key = file_inc2_img_content.split("\n")
print("sp_key = " + str(len( sp_key)))
for sp_line in sp_key:
sp_line = sp_line.strip()
key_val = sp_line.split("=")
if len( key_val) == 2:
print("k = " + key_val[0] + " val=" + key_val[1])
file_inc2_content = file_inc2_content.replace( "###" + key_val[0], '"' + key_val[1].strip() + '"')
file_inc2 = open(directory_to_process + "/event/promotion_template2.inc", 'r') file_inc_event_click = open(directory_to_process + "/event/promotion_onclick2.inc", 'r')
file_inc2_content = file_inc2.read() file_inc_event_click_content = file_inc_event_click.read()
file_inc_img = open(directory_to_process + "/../image/event/image_template2", 'r')
file_inc2_img_content = file_inc_img.read()
# replace key. file_inc2_content = file_inc2_content.replace("###EventOnClick", file_inc_event_click_content)
sp_key = file_inc2_img_content.split("\n")
print("sp_key = " + str(len( sp_key)))
for sp_line in sp_key:
sp_line = sp_line.strip()
key_val = sp_line.split("=")
if len( key_val) == 2:
print("k = " + key_val[0] + " val=" + key_val[1])
file_inc2_content = file_inc2_content.replace( "###" + key_val[0], '"' + key_val[1].strip() + '"')
file_inc_event_click = open(directory_to_process + "/event/promotion_onclick2.inc", 'r') print(file_inc2_content)
file_inc_event_click_content = file_inc_event_click.read()
file_inc2_content = file_inc2_content.replace("###EventOnClick", file_inc_event_click_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)
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)
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()
file_xml3_out_content = file_xml3_out_content.strip()
file_xml3_out_content = file_xml3_out_content.replace("\r", "")
file_xml3_out_content = file_xml3_out_content.replace("\n", "")
file_xml3 = open(directory_to_process + file_xml3_out_content, 'w')
file_xml3.write( content_data)
file_xml3.close()
if "template3" in param:
file_inc3 = open(directory_to_process + "/event/promotion_template3.inc", 'r')
file_inc3_content = file_inc3.read()
file_inc_img = open(directory_to_process + "/../image/event/image_template3", 'r')
file_inc3_img_content = file_inc_img.read()
# replace key.
sp_key = file_inc3_img_content.split("\n")
print("sp_key = " + str(len( sp_key)))
for sp_line in sp_key:
sp_line = sp_line.strip()
key_val = sp_line.split("=")
print("Kenta420:", key_val)
if len( key_val) == 2:
print("k = " + key_val[0] + " val=" + key_val[1])
file_inc3_content = file_inc3_content.replace( "###" + key_val[0], '"' + key_val[1].strip() + '"')
print(file_inc2_content) file_inc_event_click = open(directory_to_process + "/event/promotion_onclick3.inc", 'r')
file_inc_event_click_content = file_inc_event_click.read()
#print( file_inc_content) file_inc3_content = file_inc3_content.replace("###EventOnClick", file_inc_event_click_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)
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(file_inc3_content)
#print("tmp1=" + tmp1)
#print("tmp2=" + tmp2)
content_data = tmp1 + tmp2 #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)
file_xml3_out = open(directory_to_process + "/event/out_put_file2.txt", 'r') begin_text = content_data.index(";TAGESP")
file_xml3_out_content = file_xml3_out.read() end_text = content_data.index(";TAGESP", begin_text + 7)
file_xml3_out_content = file_xml3_out_content.strip() #print("sub text = " + str(begin_text) + " end = " + str(end_text))
file_xml3_out_content = file_xml3_out_content.replace("\r", "") tmp1 = content_data[: begin_text - 7]
file_xml3_out_content = file_xml3_out_content.replace("\n", "")
file_xml3 = open(directory_to_process + file_xml3_out_content, 'w') tmp3 = content_data[ end_text:-1]
file_xml3.write( content_data) #print("tmp1=" + tmp1)
file_xml3.close() #print("tmp3=" + 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()
file_xml3_out_content = file_xml3_out_content.strip()
file_xml3_out_content = file_xml3_out_content.replace("\r", "")
file_xml3_out_content = file_xml3_out_content.replace("\n", "")
file_xml3 = open(directory_to_process + file_xml3_out_content, 'w')
file_xml3.write( content_data)
file_xml3.close()
if "template4" in param:
# NOTE: promotion_template4.inc, image_template4, promotion_onclick4.inc, out_put_file4.txt
# promotion 4
file_inc3 = open(directory_to_process + "/event/promotion_template4.inc", 'r')
file_inc3_content = file_inc3.read()
file_inc_img = open(directory_to_process + "/../image/event/image_template4", 'r')
file_inc3_img_content = file_inc_img.read()
# replace key.
sp_key = file_inc3_img_content.split("\n")
print("sp_key = " + str(len( sp_key)))
for sp_line in sp_key:
sp_line = sp_line.strip()
key_val = sp_line.split("=")
print("Kenta420:", key_val)
if len( key_val) == 2:
print("k = " + key_val[0] + " val=" + key_val[1])
file_inc3_content = file_inc3_content.replace( "###" + key_val[0], '"' + key_val[1].strip() + '"')
file_inc_event_click = open(directory_to_process + "/event/promotion_onclick4.inc", 'r')
file_inc_event_click_content = file_inc_event_click.read()
file_inc3_content = file_inc3_content.replace("###EventOnClick", file_inc_event_click_content)
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)
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)
content_data = tmp1 + tmp3
file_xml3_out = open(directory_to_process + "/event/out_put_file4.txt", 'r')
file_xml3_out_content = file_xml3_out.read()
file_xml3_out_content = file_xml3_out_content.strip()
file_xml3_out_content = file_xml3_out_content.replace("\r", "")
file_xml3_out_content = file_xml3_out_content.replace("\n", "")
file_xml3 = open(directory_to_process + file_xml3_out_content, 'w')
file_xml3.write( content_data)
file_xml3.close()
if "template5" in param:
# promotion thai tea
file_inc3 = open(directory_to_process + "/event/promotion_template5.inc", 'r')
file_inc3_content = file_inc3.read()
file_inc_img = open(directory_to_process + "/../image/event/image_template5", 'r')
file_inc3_img_content = file_inc_img.read()
# replace key.
sp_key = file_inc3_img_content.split("\n")
print("sp_key = " + str(len( sp_key)))
for sp_line in sp_key:
sp_line = sp_line.strip()
key_val = sp_line.split("=")
print("Kenta420:", key_val)
if len( key_val) == 2:
print("k = " + key_val[0] + " val=" + key_val[1])
file_inc3_content = file_inc3_content.replace( "###" + key_val[0], '"' + key_val[1].strip() + '"')
file_inc_event_click = open(directory_to_process + "/event/promotion_onclick5.inc", 'r')
file_inc_event_click_content = file_inc_event_click.read()
file_inc3_content = file_inc3_content.replace("###EventOnClick", file_inc_event_click_content)
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)
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)
content_data = tmp1 + tmp3
file_xml3_out = open(directory_to_process + "/event/out_put_file5.txt", 'r')
file_xml3_out_content = file_xml3_out.read()
file_xml3_out_content = file_xml3_out_content.strip()
file_xml3_out_content = file_xml3_out_content.replace("\r", "")
file_xml3_out_content = file_xml3_out_content.replace("\n", "")
file_xml3 = open(directory_to_process + file_xml3_out_content, 'w')
file_xml3.write( content_data)
file_xml3.close()
###############################################################
# MULTI PRO
###############################################################
print("dummy.current_file_name=", current_file_name)
if "multi_promotion" in param:
print("Should gen multi")
files = os.listdir(directory_to_process + "/event/")
files = [f for f in files if f.startswith("multi_promotion_config")]
for filename in files:
recommend_multi_pro = open(directory_to_process + "/page_catalog_group_recommend_multi_pro.lxml", "r")
recommend_multi_pro_buff = recommend_multi_pro.read()
recommend_multi_pro.close()
#read config
multi_pro_config_file = open(directory_to_process + "/event/"+ filename)
multi_pro_config = json.load(multi_pro_config_file)
index = 0
promotion_name = []
while index < len(multi_pro_config):
promotion_config = multi_pro_config[index]
index += 1
# add promotion name for create filename later
promotion_name.append(promotion_config["name"])
#load template
template_file = open(directory_to_process + promotion_config["template"])
template = template_file.read()
template_file.close()
for key, value in promotion_config["config"].items():
template = template.replace("###"+key, '"' + value.strip() + '"')
promotion_block_str = '\r\n<Block>\r\n\t<State> PromotionState{0} </State>\r\n\t<MarginLeft> 33 </MarginLeft>\r\n\t<MarginTop> 22 </MarginTop>\r\n\t<Width> 484 </Width>\r\n\t<Height> 602 </Height>\r\n'.format(index)
promotion_block_str += template
promotion_block_str += '\r\n</Block>\r\n'
recommend_multi_pro_buff = re.sub(r'(?is)(;block{0}).*(;endblock{0})'.format(index), r'\1{0}\2'.format(promotion_block_str), recommend_multi_pro_buff)
file_inc3 = open(directory_to_process + "/event/promotion_template3.inc", 'r') if index == 2:
file_inc3_content = file_inc3.read() # expend block3 to full width bottom
file_inc_img = open(directory_to_process + "/../image/event/image_template3", 'r') inner_block = re.search(r'(?is);block{0}(.*);endblock{0}'.format(index+1), recommend_multi_pro_buff).group(1)
file_inc3_img_content = file_inc_img.read() inner_block = inner_block.replace("<Width> 516 </Width>", "<Width> 1032 </Width>", 2)
inner_block = inner_block.replace("<Max> 4 </Max>", "<Max> 8 </Max>", 1)
inner_block = inner_block.replace("<Column> 2 </Column>", "<Column> 4 </Column>", 1)
recommend_multi_pro_buff = re.sub(r'(?is)(;block{0}).*(;endblock{0})'.format(index+1), r'\1{0}\2'.format(inner_block), recommend_multi_pro_buff)
# replace key. # remove block4
recommend_multi_pro_buff = re.sub(r'(?is)(;block{0}).*(;endblock{0})'.format(index+2), r'\1\2', recommend_multi_pro_buff)
sp_key = file_inc3_img_content.split("\n") if index == 3:
print("sp_key = " + str(len( sp_key))) # create expand block
for sp_line in sp_key: inner_block2 = re.search(r'(?is)(;block{0}.*;endblock{0})'.format(index+1), recommend_multi_pro_buff).group(1)
sp_line = sp_line.strip() inner_block2 = inner_block2.replace(";block{0}".format(index+1), ";block{0}-expand".format(index+1))
key_val = sp_line.split("=") inner_block2 = inner_block2.replace(";endblock{0}".format(index+1), ";endblock{0}-expand".format(index+1))
print("Kenta420:", key_val)
if len( key_val) == 2: inner_block2 = inner_block2.replace("<Width> 516 </Width>", "<Width> 1032 </Width>", 2)
print("k = " + key_val[0] + " val=" + key_val[1]) # inner_block2 = inner_block2.replace("<State> \"Enable\" </State> ", "<State>\r\n\teval(\r\n\tIf PromotionState{0} = \"Enable\" Then\r\n\t\tVar block_expend_show = \"Invisible\"\r\n\tElse\r\n\t\tVar block_expend_show = \"Enable\"\r\n\tEndIf\r\n\tVar return = block_expend_show\r\n\t)\r\n</State>".format(index), 1)
file_inc3_content = file_inc3_content.replace( "###" + key_val[0], '"' + key_val[1].strip() + '"') inner_block2 = inner_block2.replace("<Max> 4 </Max>", "<Max>\r\neval(\r\n\tIf CountEnablePromotion > 2 Then\r\n\t\tVar max_count = 4\r\n\tElse\r\n\t\tVar max_count = 8\r\n\tEndIf\r\n\tVar return = max_count\r\n)\r\n</Max>", 1)
inner_block2 = inner_block2.replace("<Column> 2 </Column>", "<Column>\r\neval(\r\n\tIf CountEnablePromotion > 2 Then\r\n\t\tVar column_count = 2\r\n\tElse\r\n\t\tVar column_count = 4\r\n\tEndIf\r\n\tVar return = column_count\r\n)\r\n</Column>", 1)
recommend_multi_pro_buff = re.sub(r'(?is);block{0}.*;endblock{0}'.format(index+1), inner_block2, recommend_multi_pro_buff)
file_inc_event_click = open(directory_to_process + "/event/promotion_onclick3.inc", 'r') # create promotion file
file_inc_event_click_content = file_inc_event_click.read() count_name_dict = {
2: "double_",
file_inc3_content = file_inc3_content.replace("###EventOnClick", file_inc_event_click_content) 3: "triple_"
}
promo_file = open(directory_to_process + "/event/" + count_name_dict[len(multi_pro_config)]+ "promotion_" + "_and_".join(promotion_name) + ".lxml", "w")
print(file_inc3_content) promo_file.write(recommend_multi_pro_buff)
promo_file.close()
#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)
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)
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()
file_xml3_out_content = file_xml3_out_content.strip()
file_xml3_out_content = file_xml3_out_content.replace("\r", "")
file_xml3_out_content = file_xml3_out_content.replace("\n", "")
file_xml3 = open(directory_to_process + file_xml3_out_content, 'w')
file_xml3.write( content_data)
file_xml3.close()
# NOTE: promotion_template4.inc, image_template4, promotion_onclick4.inc, out_put_file4.txt
# promotion 4
file_inc3 = open(directory_to_process + "/event/promotion_template4.inc", 'r')
file_inc3_content = file_inc3.read()
file_inc_img = open(directory_to_process + "/../image/event/image_template4", 'r')
file_inc3_img_content = file_inc_img.read()
# replace key.
sp_key = file_inc3_img_content.split("\n")
print("sp_key = " + str(len( sp_key)))
for sp_line in sp_key:
sp_line = sp_line.strip()
key_val = sp_line.split("=")
print("Kenta420:", key_val)
if len( key_val) == 2:
print("k = " + key_val[0] + " val=" + key_val[1])
file_inc3_content = file_inc3_content.replace( "###" + key_val[0], '"' + key_val[1].strip() + '"')
file_inc_event_click = open(directory_to_process + "/event/promotion_onclick4.inc", 'r')
file_inc_event_click_content = file_inc_event_click.read()
file_inc3_content = file_inc3_content.replace("###EventOnClick", file_inc_event_click_content)
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)
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)
content_data = tmp1 + tmp3
file_xml3_out = open(directory_to_process + "/event/out_put_file4.txt", 'r')
file_xml3_out_content = file_xml3_out.read()
file_xml3_out_content = file_xml3_out_content.strip()
file_xml3_out_content = file_xml3_out_content.replace("\r", "")
file_xml3_out_content = file_xml3_out_content.replace("\n", "")
file_xml3 = open(directory_to_process + file_xml3_out_content, 'w')
file_xml3.write( content_data)
file_xml3.close()
# promotion thai tea
file_inc3 = open(directory_to_process + "/event/promotion_template5.inc", 'r')
file_inc3_content = file_inc3.read()
file_inc_img = open(directory_to_process + "/../image/event/image_template5", 'r')
file_inc3_img_content = file_inc_img.read()
# replace key.
sp_key = file_inc3_img_content.split("\n")
print("sp_key = " + str(len( sp_key)))
for sp_line in sp_key:
sp_line = sp_line.strip()
key_val = sp_line.split("=")
print("Kenta420:", key_val)
if len( key_val) == 2:
print("k = " + key_val[0] + " val=" + key_val[1])
file_inc3_content = file_inc3_content.replace( "###" + key_val[0], '"' + key_val[1].strip() + '"')
file_inc_event_click = open(directory_to_process + "/event/promotion_onclick5.inc", 'r')
file_inc_event_click_content = file_inc_event_click.read()
file_inc3_content = file_inc3_content.replace("###EventOnClick", file_inc_event_click_content)
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)
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)
content_data = tmp1 + tmp3
file_xml3_out = open(directory_to_process + "/event/out_put_file5.txt", 'r')
file_xml3_out_content = file_xml3_out.read()
file_xml3_out_content = file_xml3_out_content.strip()
file_xml3_out_content = file_xml3_out_content.replace("\r", "")
file_xml3_out_content = file_xml3_out_content.replace("\n", "")
file_xml3 = open(directory_to_process + file_xml3_out_content, 'w')
file_xml3.write( content_data)
file_xml3.close()

28
inter/mys/xml/event/multi_promotion_config_thtea_yuzu.json Normal file
View file

@ -0,0 +1,28 @@
[
{
"name": "thai_tea",
"template": "/event/promotion_template.inc",
"config": {
"normal_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"normal_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"press_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"press_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"disable_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"disable_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"event_on_click": "ROOT/taobin_project/inter/mys/xml/page_catalog_group_pro_thai_tea.lxml"
}
},
{
"name": "yuzu",
"template": "/event/promotion_template.inc",
"config": {
"normal_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"normal_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"press_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"press_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"disable_eng": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"disable_thai": "ROOT/taobin_project/inter/mys/image/event/pro_thai_tea/pro_thai_tea_big_btn.png",
"event_on_click": "ROOT/taobin_project/inter/mys/xml/page_catalog_group_pro_yuzu.lxml"
}
}
]

38
inter/mys/xml/event/promotion_template.inc Normal file
View file

@ -0,0 +1,38 @@
<Button>
<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>
<EventOnClick>
Open ###event_on_click
</EventOnClick>
</Button>

51
inter/mys/xml/event/script_common_for_open_promotion_xml.ev
View file

@ -4,22 +4,57 @@
; zone promote ; zone promote
DEBUGVAR FruityRayaEnable DEBUGVAR FruityRayaEnable
DEBUGVAR ProThaiTeaEnable DEBUGVAR ProThaiTeaEnable
DEBUGVAR ProYuzuEnable
Var CountEnablePromotion = 0
Var PromotionState1 = "Invisible"
Var PromotionState2 = "Invisible"
If ProThaiTeaEnable = 1 Then
Var PromotionState1 = "Enable"
Var CountEnablePromotion = CountEnablePromotion + 1
EndIf
If ProYuzuEnable = 1 Then
Var PromotionState2 = "Enable"
Var CountEnablePromotion = CountEnablePromotion + 1
EndIf
DEBUGVAR CountEnablePromotion
If OpenFromPageBoard = 1 Then If OpenFromPageBoard = 1 Then
If ProThaiTeaEnable = 1 Then ; has-ongoing-pro
Var BigButtonEnable = "Enable" If CountEnablePromotion >= 1 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_thai_tea.lxml" Var BigButtonEnable = "Enable"
Var OpenFromPageBoard = 0
If CountEnablePromotion = 1 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_thai_tea.lxml"
EndIf
If CountEnablePromotion = 2 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml"
EndIf
Var OpenFromPageBoard = 0
Else Else
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml" OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml"
EndIf EndIf
Else Else
If ProThaiTeaEnable = 1 Then ; has-ongoing-pro
Var BigButtonEnable = "Enable" If CountEnablePromotion >= 1 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_thai_tea.lxml" Var BigButtonEnable = "Enable"
Var OpenFromPageBoard = 0
If CountEnablePromotion = 1 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_thai_tea.lxml"
EndIf
If CountEnablePromotion = 2 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml"
EndIf
Var OpenFromPageBoard = 0
Else Else
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml" OpenInst 2 "ROOT/taobin_project/inter/mys/xml/page_catalog_group_recommend.lxml"
EndIf EndIf

5
inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml
View file

@ -31,6 +31,11 @@
Var Seeker.UseProThaiTeaCode = 1 Var Seeker.UseProThaiTeaCode = 1
Var Seeker.ProThaiTea = 1 Var Seeker.ProThaiTea = 1
Else Else
DEBUGVAR Seeker.TNumberTaobinMember
DEBUGVAR TelephoneNumber
Var Seeker.TNumberTaobinMember = TelephoneNumber
DEBUGVAR Seeker.TNumberTaobinMember
Var Seeker.ProThaiTea = 1 Var Seeker.ProThaiTea = 1
Var Seeker.UseProThaiTeaCode = 0 Var Seeker.UseProThaiTeaCode = 0
DEBUGVAR Seeker.ProThaiTea DEBUGVAR Seeker.ProThaiTea

9
inter/mys/xml/event/tricker.ev
View file

@ -27,16 +27,25 @@ EndIf
If SystemDateMonthInt = 7 Then If SystemDateMonthInt = 7 Then
Var ProThaiTeaEnable = 1 Var ProThaiTeaEnable = 1
If SystemDateDayInt >= 15 Then
Var ProYuzuEnable = 1
Else
Var ProYuzuEnable = 0
EndIf
EndIf EndIf
If SystemDateMonthInt = 8 Then If SystemDateMonthInt = 8 Then
If SystemDateDayInt < 31 Then If SystemDateDayInt < 31 Then
Var ProThaiTeaEnable = 1 Var ProThaiTeaEnable = 1
Var ProYuzuEnable = 1
Else Else
Var ProThaiTeaEnable = 0 Var ProThaiTeaEnable = 0
Var ProYuzuEnable = 0
EndIf EndIf
EndIf EndIf
If BoxID = 177746 Then If BoxID = 177746 Then
Var ProThaiTeaEnable = 1 Var ProThaiTeaEnable = 1
Var ProYuzuEnable = 1
EndIf EndIf

155
inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml Normal file
View file

@ -0,0 +1,155 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
Var Timeout = 0
DEBUGVAR TelephoneNumber
DEBUGVAR FromProYuzu
DEBUGVAR Seeker.VendingCode
DEBUGVAR Seeker.ProYuzu
DEBUGVAR Seeker.UseProYuzuCode
Var Cid = 43
Var param1 = ""
Var param2 = ""
Var param3 = ""
If FromProYuzu = 1 Then
If TelephoneNumber = "" Then
Else
DEBUGVAR Seeker.TNumberTaobinMember
DEBUGVAR TelephoneNumber
Var Seeker.TNumberTaobinMember = TelephoneNumber
DEBUGVAR Seeker.TNumberTaobinMember
; Telephone must not empty
If Seeker.CodeChannel = 1 Then
DEBUGVAR Seeker.CodeChannel
Var Seeker.UseProYuzuCode = 1
Var Seeker.ProYuzu = 1
Else
Var Seeker.ProYuzu = 1
Var Seeker.UseProYuzuCode = 0
DEBUGVAR Seeker.ProYuzu
DEBUGVAR Seeker.UseProYuzuCode
; support-for-multi-pro-with-same-cid
Var param1 = "701"
AddData Cid TelephoneNumber param1 param2 param3
EndIf
EndIf
EndIf
; reset flag
Var FromProYuzu = 0
; goto lid straw
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing
Var Timeout = Timeout + 1
If Timeout > 2 Then
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
TimerReset
Refresh
</EventTimeout>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<EventActionOk>
;
</EventActionOk>
<EventMachine>
If MachineStage = "drink-success" Then
Var MachineState_Result = 1
EndIf
If MachineStage = "drink-failed" Then
Var MachineState_Result = 2
EndIf
</EventMachine>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
;include="ROOT/taobin_project/inc/video.inc"
;<Image>
;<X> 0 </X>
;<Y> 380 </Y>
;<Filename> "ROOT/taobin_project/image/display_get_free/alpha.png" </Filename>
;</Image>
<Image>
<X> 0 </X>
<Y> 560 </Y>
<State> "Enable" </State>
<Filename> Var( DirImage + img_popup6 )</Filename>
</Image>
<Image>
<X> 751 </X>
<Y> 413 </Y>
<Filename> IMG_CNT </Filename>
</Image>
;
<Text>
<X> XPosiShowCountDownBrew </X>
<Y> 470 </Y>
<Align> End </Align>
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Value> ShowCountDownBrewing </Value>
</Text>
<Text>
<X> 99 </X>
<Y> 1300 </Y>
<Align> center </Align>
<Size> 48 </Size>
<Color> 0x513C2F </Color>
<Value> "Please wait for coupon from SMS ... "
</Text>
</Popup>

2
inter/mys/xml/menu_catalog_new.py
View file

@ -15,7 +15,7 @@ else:
f.close() f.close()
else: else:
print("new layout catalog enable.") print("new layout catalog enable.")
f = open( directory_to_process + "/menu_catalog_new.xml", "r") f = open( directory_to_process + "/menu_catalog_new.lxml", "r")
#print(f.read()) #print(f.read())
out_xml(f.read()) out_xml(f.read())
f.close() f.close()

49
inter/mys/xml/menu_new_layout_gen.py
View file

@ -6,23 +6,35 @@
else: else:
touch_less_gen = False touch_less_gen = False
if current_file_name == "page_catalog_group_recommend_multi_pro.skt":
multi_pro_gen = True
else:
multi_pro_gen = False
print("Found multi pro skt: ", multi_pro_gen )
print ("######################################################################################################") print ("######################################################################################################")
idx_of_eng = 2 idx_of_eng = 2
out_xml('<FrameScroll> \r\n') out_xml('<FrameScroll> \r\n')
if touch_less_gen == True: if touch_less_gen == True:
out_xml('<Max> 16 </Max>\r\n') out_xml('<Max> 16 </Max>\r\n')
elif multi_pro_gen:
out_xml('<Max> 4 </Max>\r\n')
out_xml('<X> 10 </X>\r\n') out_xml('<X> 10 </X>\r\n')
out_xml('<Y> 497 </Y>\r\n') out_xml('<Y> 497 </Y>\r\n')
out_xml('<Width> 1080 </Width>\r\n') out_xml('<Width> 1080 </Width>\r\n')
out_xml('<ScrollHeight> "auto" </ScrollHeight>\r\n') out_xml('<ScrollHeight> "auto" </ScrollHeight>\r\n')
out_xml('<Scroll> "Vertical" </Scroll>\r\n') out_xml('<Scroll> "Vertical" </Scroll>\r\n')
out_xml('<Column> 4 </Column>\r\n') if multi_pro_gen:
out_xml('<Column> 2 </Column>\r\n')
else:
out_xml('<Column> 4 </Column>\r\n')
out_xml('<Script>\r\n') out_xml('<Script>\r\n')
print("current_file_name " + current_file_name) print("current_file_name " + current_file_name)
if touch_less_gen == False: if touch_less_gen == False or multi_pro_gen:
out_xml('\t Var block_index_override = 0\r\n') out_xml('\t Var block_index_override = 0\r\n')
out_xml('\t Var block_index_move = 0\r\n') out_xml('\t Var block_index_move = 0\r\n')
@ -86,6 +98,9 @@
out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n') out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n')
for spl in menu_new_list: for spl in menu_new_list:
#product_code = s #product_code = s
print("> ",spl, len(spl))
# spl = spl[0]
if spl[0] == "IGNORE": if spl[0] == "IGNORE":
continue continue
@ -1011,7 +1026,35 @@
#if count_test > 8 : #if count_test > 8 :
# break # break
if multi_pro_gen:
for i in range(1, 5):
out_xml(';block'+str(i)+'\r\n')
out_xml('\t<Block>\r\n')
out_xml('\t\t<State> \"Enable\" </State> \r\n')
# out_xml('\t\t<MarginTop> 22 </MarginTop>\r\n')
# out_xml('\t\t<MarginLeft> 33 </MarginLeft>\r\n')
out_xml('\t\t<Width> 516 </Width>\r\n')
out_xml('\t\t<Height> 636 </Height>\r\n')
out_xml('\t\t<FrameScroll>\r\n')
out_xml('\t\t\t<Max> 4 </Max>\r\n')
out_xml('\t\t\t<X> 0 </X>\r\n')
out_xml('\t\t\t<Y> 0 </Y>\r\n')
out_xml('\t\t\t<Width> 516 </Width>\r\n')
out_xml('\t\t\t<Height> 636 </Height>\r\n')
out_xml('\t\t\t<ScrollHeight> "auto" </ScrollHeight>\r\n')
out_xml('\t\t\t<Scroll> "Vertical" </Scroll>\r\n')
out_xml('\t\t\t<Column> 2 </Column>\r\n')
out_xml('\t\t\t<Script>\r\n')
out_xml('\t\t\t\tVar block_index_override = 0\r\n')
out_xml('\t\t\t\tVar block_index_move = 0\r\n')
out_xml('\t\t\t</Script>\r\n')
GenListMenu()
out_xml('\t\t</FrameScroll>\r\n')
out_xml('\t\t</Block>\r\n')
out_xml(';endblock'+str(i)+'\r\n')
else:
out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n')
GenListMenu()
out_xml('</FrameScroll>\r\n') out_xml('</FrameScroll>\r\n')

140
inter/mys/xml/menu_new_layout_gen_v2.py
View file

@ -1,5 +1,5 @@
if "v2" in param: if "v2" in param:
def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code): def GenMenuProductCodeBlock(spl, str_hot_product_code, str_cold_product_code, str_blend_product_code):
#print(" size " + str( len(spl)) + " img=" + spl[ idx_img][1] ) #print(" size " + str( len(spl)) + " img=" + spl[ idx_img][1] )
out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n') out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n')
menu_img = spl[ idx_img][1] menu_img = spl[ idx_img][1]
@ -181,6 +181,17 @@
out_xml( '\t\tDEBUGVAR PD_STAGE_3\r\n') out_xml( '\t\tDEBUGVAR PD_STAGE_3\r\n')
out_xml( '\t\tVar SelectDrinkType = 0\r\n') out_xml( '\t\tVar SelectDrinkType = 0\r\n')
# zone pro
if "fruity_raya" in current_file_name:
out_xml( '\t\tVar FromFruityRaya = 1 \r\n')
if "thai_tea" in current_file_name:
out_xml( '\t\tVar FromProThaiTea = 1 \r\n')
if "yuzu" in current_file_name:
out_xml( '\t\tVar FromProYuzu = 1 \r\n')
out_xml( '\t\t\r\n') out_xml( '\t\t\r\n')
out_xml( '\t\t\r\n') out_xml( '\t\t\r\n')
@ -452,7 +463,7 @@
out_xml( '</Block>\r\n') out_xml( '</Block>\r\n')
def GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code): def GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code):
GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] ) GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] )
@ -488,27 +499,40 @@
else: else:
touch_less_gen = False touch_less_gen = False
if current_file_name == "page_catalog_group_recommend_multi_pro.skt":
multi_pro_gen = True
else:
multi_pro_gen = False
print("Found multi pro skt: ", multi_pro_gen )
out_xml('<FrameScroll> \r\n') out_xml('<FrameScroll> \r\n')
if touch_less_gen == True: if touch_less_gen == True:
out_xml('<Max> 16 </Max>\r\n') out_xml('<Max> 16 </Max>\r\n')
elif multi_pro_gen:
out_xml('<Max> 4 </Max>\r\n')
out_xml('<X> 10 </X>\r\n') out_xml('<X> 10 </X>\r\n')
out_xml('<Y> 497 </Y>\r\n') out_xml('<Y> 497 </Y>\r\n')
out_xml('<Width> 1080 </Width>\r\n') out_xml('<Width> 1080 </Width>\r\n')
out_xml('<ScrollHeight> "auto" </ScrollHeight>\r\n') out_xml('<ScrollHeight> "auto" </ScrollHeight>\r\n')
out_xml('<Scroll> "Vertical" </Scroll>\r\n') out_xml('<Scroll> "Vertical" </Scroll>\r\n')
out_xml('<Column> 4 </Column>\r\n') if multi_pro_gen:
out_xml('<Column> 2 </Column>\r\n')
else:
out_xml('<Column> 4 </Column>\r\n')
out_xml('<Script>\r\n') out_xml('<Script>\r\n')
print("current_file_name " + current_file_name) print("current_file_name " + current_file_name)
if touch_less_gen == False: if touch_less_gen == False or multi_pro_gen:
out_xml('\t Var block_index_override = 0\r\n') out_xml('\t Var block_index_override = 0\r\n')
out_xml('\t Var block_index_move = 0\r\n') out_xml('\t Var block_index_move = 0\r\n')
else: else:
out_xml('\t Var block_index_override = 0\r\n')
out_xml('\t Var block_index_move = 0\r\n') out_xml('\t Var block_index_override = 4\r\n')
out_xml('\t Var block_index_move = 1\r\n')
#out_xml('\t Var block_index_override = 4\r\n') #out_xml('\t Var block_index_override = 4\r\n')
#out_xml('\t Var block_index_move = 1\r\n') #out_xml('\t Var block_index_move = 1\r\n')
#out_xml('\tIf Seeker = "curr" Then\r\n') #out_xml('\tIf Seeker = "curr" Then\r\n')
@ -561,42 +585,76 @@
out_xml(';dummy_layout.inc\r\n') out_xml(';dummy_layout.inc\r\n')
# #
#out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n') #out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n')
for spl in menu_new_list: def GenListMenu():
#product_code = s for spl in menu_new_list:
#if spl[ idx_of_eng] == "IGNORE": #product_code = s
# continue #if spl[ idx_of_eng] == "IGNORE":
if len(spl) == 1: # continue
if spl[0].startswith("TAG"): if len(spl) == 1:
out_xml( '\t;' + spl[0] + '\r\n') if spl[0].startswith("TAG"):
print("Have TAGESP") out_xml( '\t;' + spl[0] + '\r\n')
continue print("Have TAGESP")
print( '\t; '+ spl[ idx_name][ idx_hot_product_code] + ' ' + spl[ idx_name][ idx_cold_product_code] + ' ' + spl[ idx_name][ idx_blend_product_code] + ' \r\n') continue
print( '\t; '+ spl[ idx_name][ idx_hot_product_code] + ' ' + spl[ idx_name][ idx_cold_product_code] + ' ' + spl[ idx_name][ idx_blend_product_code] + ' \r\n')
if "," in spl[ idx_name][ idx_hot_product_code] and "," in spl[ idx_name][ idx_cold_product_code] and "," in spl[ idx_name][ idx_blend_product_code]:
#print(" hot = " + spl[ idx_name][ idx_hot_product_code]) if "," in spl[ idx_name][ idx_hot_product_code] and "," in spl[ idx_name][ idx_cold_product_code] and "," in spl[ idx_name][ idx_blend_product_code]:
hot_pd = spl[ idx_name][ idx_hot_product_code].split(',') #print(" hot = " + spl[ idx_name][ idx_hot_product_code])
cold_pd = spl[ idx_name][ idx_cold_product_code].split(',') hot_pd = spl[ idx_name][ idx_hot_product_code].split(',')
blend_pd = spl[ idx_name][ idx_blend_product_code].split(',') cold_pd = spl[ idx_name][ idx_cold_product_code].split(',')
blend_pd = spl[ idx_name][ idx_blend_product_code].split(',')
#print(' size = ' + str( len( hot_pd)) + ' size = ' + str( len( cold_pd)) + ' size = ' + str( len( blend_pd)) + '\r\n')
list_size = len( hot_pd)
for idx in range( list_size):
print(' hot = ' + hot_pd[ idx] + ' cold = ' + cold_pd[ idx]+ ' blend_pd = ' + blend_pd[ idx] + '\r\n')
if hot_pd[ idx] == '-' and cold_pd[ idx] == '-' and blend_pd[ idx] == '-':
print("\t\t==> ignore ")
else:
print("\t\t==> gen ")
GenMenuProductCodeBlock(spl, hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] )
else:
GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code)
#out_xml( '\t; parallel '+ spl[ idx_name][ idx_hot_product_code2] + ' ' + spl[ idx_name][ idx_cold_product_code2] + ' ' + spl[ idx_name][ idx_blend_product_code2] + ' \r\n')
#print("++++++++++++++++++++++++++++++ " + str( count_test) )
#count_test = count_test + 1
#if count_test > 5 :
# break
if len( spl[idx_name] ) >= 11:
if spl[ idx_name][ idx_hot_product_code2] != "-" or spl[ idx_name][ idx_cold_product_code2] != "-" or spl[ idx_name][ idx_blend_product_code2] != "-":
GenMenuBlock(spl, idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2)
if multi_pro_gen:
print("multi_pro_gen")
for i in range(1, 5):
out_xml(';block'+str(i)+'\r\n')
out_xml('\t<Block>\r\n')
out_xml('\t\t<State> \"Enable\" </State> \r\n')
# out_xml('\t\t<MarginTop> 22 </MarginTop>\r\n')
# out_xml('\t\t<MarginLeft> 33 </MarginLeft>\r\n')
out_xml('\t\t<Width> 516 </Width>\r\n')
out_xml('\t\t<Height> 636 </Height>\r\n')
out_xml('\t\t<FrameScroll>\r\n')
out_xml('\t\t\t<Max> 4 </Max>\r\n')
out_xml('\t\t\t<X> 0 </X>\r\n')
out_xml('\t\t\t<Y> 0 </Y>\r\n')
out_xml('\t\t\t<Width> 516 </Width>\r\n')
out_xml('\t\t\t<Height> 636 </Height>\r\n')
out_xml('\t\t\t<ScrollHeight> "auto" </ScrollHeight>\r\n')
out_xml('\t\t\t<Scroll> "Vertical" </Scroll>\r\n')
out_xml('\t\t\t<Column> 2 </Column>\r\n')
out_xml('\t\t\t<Script>\r\n')
out_xml('\t\t\t\tVar block_index_override = 0\r\n')
out_xml('\t\t\t\tVar block_index_move = 0\r\n')
out_xml('\t\t\t</Script>\r\n')
GenListMenu()
out_xml('\t\t</FrameScroll>\r\n')
out_xml('\t\t</Block>\r\n')
out_xml(';endblock'+str(i)+'\r\n')
else:
out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n')
GenListMenu()
#print(' size = ' + str( len( hot_pd)) + ' size = ' + str( len( cold_pd)) + ' size = ' + str( len( blend_pd)) + '\r\n')
list_size = len( hot_pd)
for idx in range( list_size):
print(' hot = ' + hot_pd[ idx] + ' cold = ' + cold_pd[ idx]+ ' blend_pd = ' + blend_pd[ idx] + '\r\n')
if hot_pd[ idx] == '-' and cold_pd[ idx] == '-' and blend_pd[ idx] == '-':
print("\t\t==> ignore ")
else:
print("\t\t==> gen ")
GenMenuProductCodeBlock( hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] )
else:
GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code)
#out_xml( '\t; parallel '+ spl[ idx_name][ idx_hot_product_code2] + ' ' + spl[ idx_name][ idx_cold_product_code2] + ' ' + spl[ idx_name][ idx_blend_product_code2] + ' \r\n')
#print("++++++++++++++++++++++++++++++ " + str( count_test) )
#count_test = count_test + 1
#if count_test > 5 :
# break
if len( spl[idx_name] ) >= 11:
if spl[ idx_name][ idx_hot_product_code2] != "-" or spl[ idx_name][ idx_cold_product_code2] != "-" or spl[ idx_name][ idx_blend_product_code2] != "-":
GenMenuBlock( idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2)
out_xml('</FrameScroll>\r\n') out_xml('</FrameScroll>\r\n')

1
inter/mys/xml/page_catalog_group_appfast.lxml
View file

@ -644,6 +644,7 @@
Var block_index_move = 0 Var block_index_move = 0
</Script> </Script>
;dummy_layout.inc ;dummy_layout.inc
; menu_new_list 5
; ==================> Len = 3 ; ==================> Len = 3
; - 12-04-02-1018 - ; - 12-04-02-1018 -
<Block> <Block>

1
inter/mys/xml/page_catalog_group_cocktail.lxml
View file

@ -624,6 +624,7 @@
Var block_index_move = 0 Var block_index_move = 0
</Script> </Script>
;dummy_layout.inc ;dummy_layout.inc
; menu_new_list 14
; ==================> Len = 3 ; ==================> Len = 3
; - 11-99-05-0001 - ; - 11-99-05-0001 -
<Block> <Block>

1
inter/mys/xml/page_catalog_group_coffee.lxml
View file

@ -635,6 +635,7 @@
Var block_index_move = 0 Var block_index_move = 0
</Script> </Script>
;dummy_layout.inc ;dummy_layout.inc
; menu_new_list 60
; ==================> Len = 3 ; ==================> Len = 3
; 12-01-01-0001 - - ; 12-01-01-0001 - -
<Block> <Block>

1
inter/mys/xml/page_catalog_group_forkid.lxml
View file

@ -645,6 +645,7 @@
Var block_index_move = 0 Var block_index_move = 0
</Script> </Script>
;dummy_layout.inc ;dummy_layout.inc
; menu_new_list 14
; ==================> Len = 3 ; ==================> Len = 3
; 12-03-01-0005 12-03-02-0005 12-03-03-0005 ; 12-03-01-0005 12-03-02-0005 12-03-03-0005
<Block> <Block>

1258
inter/mys/xml/page_catalog_group_fruity_raya.lxml
View file

File diff suppressed because it is too large Load diff

1
inter/mys/xml/page_catalog_group_health.lxml
View file

@ -632,6 +632,7 @@
Var block_index_move = 0 Var block_index_move = 0
</Script> </Script>
;dummy_layout.inc ;dummy_layout.inc
; menu_new_list 22
; ==================> Len = 3 ; ==================> Len = 3
; 12-01-01-1003 12-01-02-1001 - ; 12-01-01-1003 12-01-02-1001 -
<Block> <Block>

1
inter/mys/xml/page_catalog_group_milk.lxml
View file

@ -632,6 +632,7 @@
Var block_index_move = 0 Var block_index_move = 0
</Script> </Script>
;dummy_layout.inc ;dummy_layout.inc
; menu_new_list 21
; ==================> Len = 3 ; ==================> Len = 3
; 12-03-01-0005 12-03-02-0005 12-03-03-0005 ; 12-03-01-0005 12-03-02-0005 12-03-03-0005
<Block> <Block>

1
inter/mys/xml/page_catalog_group_other.lxml
View file

@ -634,6 +634,7 @@
Var block_index_move = 0 Var block_index_move = 0
</Script> </Script>
;dummy_layout.inc ;dummy_layout.inc
; menu_new_list 53
; ==================> Len = 3 ; ==================> Len = 3
; - 12-05-02-0007 12-05-03-0007 ; - 12-05-02-0007 12-05-03-0007
<Block> <Block>

1253
inter/mys/xml/page_catalog_group_pro_thai_tea.lxml
View file

File diff suppressed because it is too large Load diff

2281
inter/mys/xml/page_catalog_group_pro_yuzu.lxml Normal file
View file

File diff suppressed because it is too large Load diff

46
inter/mys/xml/page_catalog_group_pro_yuzu.skt Normal file
View file

@ -0,0 +1,46 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
<?hurr
#include=menu_catalog_default_init.xml
?>
Var FromProYuzu = 0
Var Timeout = 0
<?hurr
#include=menu_catalog_new_menu.xml
?>
</EventOpen>
<?hurr
#include=menu_catalog_new.py
?>
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
</Popup>

5
inter/mys/xml/page_catalog_group_recommend.lxml
View file

@ -646,10 +646,11 @@
<Scroll> "Vertical" </Scroll> <Scroll> "Vertical" </Scroll>
<Column> 4 </Column> <Column> 4 </Column>
<Script> <Script>
Var block_index_override = 0 Var block_index_override = 4
Var block_index_move = 0 Var block_index_move = 1
</Script> </Script>
;dummy_layout.inc ;dummy_layout.inc
; menu_new_list 42
;TAGESP ;TAGESP
; ==================> Len = 3 ; ==================> Len = 3
; - - 12-03-03-0026 ; - - 12-03-03-0026

46186
inter/mys/xml/page_catalog_group_recommend_multi_pro.lxml Normal file
View file

File diff suppressed because it is too large Load diff

80
inter/mys/xml/page_catalog_group_recommend_multi_pro.skt Normal file
View file

@ -0,0 +1,80 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
<?hurr
#include=menu_catalog_default_init.py
?>
Var Menu1Selected = "PressForever"
Var OreoBigButtonEnable = "Enable"
If $12-01-01-0001.Button = "Invisible" Then
Var esp102101001Enable = "Invisible"
Var esp122101001Enable = "Enable"
Else
Var esp102101001Enable = "Enable"
Var esp122101001Enable = "Invisible"
EndIf
SAVELOG PreviseXMLFileName2
Var Timeout = 0
If show_eng = "true" Then
Var text_unavailable = "UNAVAILABLE###size=16"
Else
Var text_unavailable = "หมด###size=32"
EndIf
<?hurr
#include=menu_catalog_new_menu.py
?>
</EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.lxml"
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
;BigLogoLayout
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>
</Popup>

1
inter/mys/xml/page_catalog_group_tea.lxml
View file

@ -637,6 +637,7 @@
Var block_index_move = 0 Var block_index_move = 0
</Script> </Script>
;dummy_layout.inc ;dummy_layout.inc
; menu_new_list 46
; ==================> Len = 3 ; ==================> Len = 3
; 12-02-01-0001 12-02-02-0001 12-02-03-0001 ; 12-02-01-0001 12-02-02-0001 12-02-03-0001
<Block> <Block>

1
inter/mys/xml/page_catalog_group_whey.lxml
View file

@ -640,6 +640,7 @@
Var block_index_move = 0 Var block_index_move = 0
</Script> </Script>
;dummy_layout.inc ;dummy_layout.inc
; menu_new_list 14
; ==================> Len = 3 ; ==================> Len = 3
; - 12-04-02-0001 - ; - 12-04-02-0001 -
<Block> <Block>

2
inter/mys/xml/page_check_member2.lxml
View file

@ -507,7 +507,7 @@
EndIf EndIf
Var text5Img = "/text5-AUS.png" Var text5Img = "/text5-MYR.png"
INT TaobinCredit INT TaobinCredit

2
inter/mys/xml/page_member_topup.lxml
View file

@ -32,7 +32,7 @@
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var text_4 = "/text_4-AUS.png" Var text_4 = "/text_4-MYR.png"
Var PayCreditChannel = "credit-card" Var PayCreditChannel = "credit-card"

2
inter/mys/xml/page_member_topupSuccess.lxml
View file

@ -29,7 +29,7 @@
Var SumCreditAmountStr !assigned StringFmt( SumCreditAmount, DisplayFormat, PreScaleConvertShow ) Var SumCreditAmountStr !assigned StringFmt( SumCreditAmount, DisplayFormat, PreScaleConvertShow )
Var text_4 = "/text_4-AUS.png" Var text_4 = "/text_4-MYR.png"
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en"

0
inter/uae_dubai/xml/page_brewing3Conti.lxml → inter/uae_dubai/xml/page_brewing3Conti.xml
View file

5
xml/event/nam_hom_coconut/page_collect_point_nam_hom_coconut_2.xml
View file

@ -107,6 +107,11 @@
;Var TumbleBottleOutOfStock = 1 ;Var TumbleBottleOutOfStock = 1
;Var ClearGelOutOfStock = 1 ;Var ClearGelOutOfStock = 1
Var E_GiftCard100BathOutOfStock = 1
Var TumbleBottleOutOfStock = 1
DEBUGVAR SuperSetOutOfStock DEBUGVAR SuperSetOutOfStock
DEBUGVAR BalanceEssenceTonerOutOfStock DEBUGVAR BalanceEssenceTonerOutOfStock

220
xml/event/nam_hom_coconut/page_nam_hom_coconut_random.xml
View file

@ -45,56 +45,6 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel" Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf EndIf
If TumbleBottleOutOfStock = 0 Then If TumbleBottleOutOfStock = 0 Then
@ -108,26 +58,6 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle" Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf EndIf
If CleansingGelOutOfStock = 0 Then If CleansingGelOutOfStock = 0 Then
@ -147,6 +77,30 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel" Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf EndIf
If BalanceEssenceTonerOutOfStock = 0 Then If BalanceEssenceTonerOutOfStock = 0 Then
@ -160,6 +114,46 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner" Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf EndIf
If SuperSetOutOfStock = 0 Then If SuperSetOutOfStock = 0 Then
@ -167,6 +161,62 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set" Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf EndIf
If E_GiftCard100BathOutOfStock = 0 Then If E_GiftCard100BathOutOfStock = 0 Then
@ -180,26 +230,6 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath" Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf EndIf
If ClearGel4mlOutOfStock = 0 Then If ClearGel4mlOutOfStock = 0 Then
@ -223,16 +253,6 @@
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml" Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1 Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf EndIf

10
xml/event/tricker.ev
View file

@ -164,9 +164,7 @@ EndIf
If SystemDateMonthInt = 6 Then If SystemDateMonthInt = 6 Then
If SystemDateDayInt >= 3 Then If SystemDateDayInt >= 3 Then
If SystemDateDayInt <= 30 Then Var NamHomCoconutPro = 1
Var NamHomCoconutPro = 1
EndIf
EndIf EndIf
If SystemDateDayInt <= 15 Then If SystemDateDayInt <= 15 Then
@ -189,6 +187,12 @@ If SystemDateMonthInt = 6 Then
EndIf EndIf
EndIf EndIf
If SystemDateMonthInt = 7 Then
If SystemDateDayInt <= 7 Then
Var NamHomCoconutPro = 1
EndIf
EndIf
If SystemDateMonthInt >= 7 Then If SystemDateMonthInt >= 7 Then
Var CheckMemberPageCampaign = 1 Var CheckMemberPageCampaign = 1
EndIf EndIf

8
xml/page_brewing3Conti.xml
View file

@ -6,6 +6,14 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOpen> <EventOpen>
If InternationalEnable = 1 Then
Var Brewing3ContiXMLFile = CountryRootPath + "/xml/page_brewing3Conti.xml"
DEBUGVAR Brewing3ContiXMLFile
Open Brewing3ContiXMLFile
EndIf
Var ActionOKCase = 0 Var ActionOKCase = 0
Var Seeker = "curr" Var Seeker = "curr"

4
xml/page_check_member2_campaign.xml
View file

@ -1051,9 +1051,9 @@
</Text> </Text>
<Text> <Text>
<X> 654 </X> <X> 620 </X>
<Y> 1076 </Y> <Y> 1076 </Y>
<Width> 120 </Width> <Width> 164 </Width>
<Height> 80 </Height> <Height> 80 </Height>
<Font> RobotoBold </Font> <Font> RobotoBold </Font>
<Size> 64 </Size> <Size> 64 </Size>

4
xml/page_payment_cash-AUS.xml
View file

@ -697,7 +697,9 @@
EndIf EndIf
Var Seeker.CreditCard = 1 Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef Var Seeker.CreditCardRef = CreditCardRef
CashlessReq SUCCESS
Open "ROOT/taobin_project/xml/page_thankyou.xml" Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf EndIf