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

This commit is contained in:
wanlop run 2024-12-20 20:30:12 +07:00
commit 97bbf7e95c
62 changed files with 26232 additions and 3508 deletions

View file

@ -30,16 +30,16 @@ else:
if len( key_val) == 2:
#print("k = " + key_val[0] + " val=" + key_val[1])
file_inc1_content = file_inc1_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_content = file_inc_event_click.read()
file_inc1_content = file_inc1_content.replace("###EventOnClick", file_inc_event_click_content)
#print(file_inc2_content)
#print( file_inc_content)
file_inc = open(directory_to_process + "/dummy_layout.inc", 'r')
file_inc_content = file_inc.read()
@ -50,13 +50,14 @@ else:
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))
disable_show_menus = content_data[begin_text + 7 : end_text]
disable_show_menus = disable_show_menus.replace(",Disable=Invisible", "")
tmp1 = content_data[: begin_text - 7]
tmp2 = content_data[ end_text:-1]
#print("tmp1=" + tmp1)
#print("tmp2=" + tmp2)
content_data = tmp1 + tmp2
content_data = tmp1 + tmp2
content_data = content_data.replace(";disable_show_menu_placeholder", disable_show_menus)
file_xml3_out = open(directory_to_process + "/event/out_put_file1.txt", 'r')
file_xml3_out_content = file_xml3_out.read()
@ -67,7 +68,7 @@ else:
file_xml3 = open(directory_to_process + file_xml3_out_content, 'w')
file_xml3.write( content_data)
file_xml3.close()
if "template2" in param:
file_inc2 = open(directory_to_process + "/event/promotion_template2.inc", 'r')
@ -85,16 +86,16 @@ else:
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')
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_inc2_content)
#print( file_inc_content)
file_inc = open(directory_to_process + "/dummy_layout.inc", 'r')
file_inc_content = file_inc.read()
@ -104,14 +105,13 @@ else:
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))
disable_show_menus = content_data[begin_text + 7 : end_text]
disable_show_menus = disable_show_menus.replace(",Disable=Invisible", "")
tmp1 = content_data[: begin_text - 7]
tmp2 = content_data[ end_text:-1]
#print("tmp1=" + tmp1)
#print("tmp2=" + tmp2)
content_data = tmp1 + tmp2
content_data = tmp1 + tmp2
content_data = content_data.replace(";disable_show_menu_placeholder", disable_show_menus)
file_xml3_out = open(directory_to_process + "/event/out_put_file2.txt", 'r')
file_xml3_out_content = file_xml3_out.read()
@ -122,7 +122,7 @@ else:
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()
@ -140,16 +140,16 @@ else:
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_onclick3.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)
file_inc = open(directory_to_process + "/dummy_layout.inc", 'r')
file_inc_content = file_inc.read()
@ -159,14 +159,13 @@ else:
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))
disable_show_menus = content_data[begin_text + 7 : end_text]
disable_show_menus = disable_show_menus.replace(",Disable=Invisible", "")
tmp1 = content_data[: begin_text - 7]
tmp3 = content_data[ end_text:-1]
#print("tmp1=" + tmp1)
#print("tmp3=" + tmp3)
content_data = tmp1 + tmp3
tmp2 = content_data[ end_text:-1]
content_data = tmp1 + tmp2
content_data = content_data.replace(";disable_show_menu_placeholder", disable_show_menus)
file_xml3_out = open(directory_to_process + "/event/out_put_file3.txt", 'r')
file_xml3_out_content = file_xml3_out.read()
@ -195,16 +194,16 @@ else:
if len( key_val) == 2:
#print("k = " + key_val[0] + " val=" + key_val[1])
file_inc4_content = file_inc4_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_inc4_content = file_inc4_content.replace("###EventOnClick", file_inc_event_click_content)
#print(file_inc4_content)
#print( file_inc_content)
file_inc = open(directory_to_process + "/dummy_layout.inc", 'r')
file_inc_content = file_inc.read()
@ -214,14 +213,13 @@ else:
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))
disable_show_menus = content_data[begin_text + 7 : end_text]
disable_show_menus = disable_show_menus.replace(",Disable=Invisible", "")
tmp1 = content_data[: begin_text - 7]
tmp3 = content_data[ end_text:-1]
#print("tmp1=" + tmp1)
#print("tmp3=" + tmp3)
content_data = tmp1 + tmp3
tmp2 = content_data[ end_text:-1]
content_data = tmp1 + tmp2
content_data = content_data.replace(";disable_show_menu_placeholder", disable_show_menus)
file_xml4_out = open(directory_to_process + "/event/out_put_file4.txt", 'r')
file_xml4_out_content = file_xml4_out.read()
@ -244,7 +242,7 @@ else:
#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):
@ -262,12 +260,12 @@ else:
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)
if index == 2:
# expend block3 to full width bottom
inner_block = re.search(r'(?is);block{0}(.*);endblock{0}'.format(index+1), recommend_multi_pro_buff).group(1)

View file

@ -1 +1 @@
/event/promotion_12_day_12_menu.xml
/event/promotion_strawberry_series.xml

View file

@ -1 +1 @@
Open "ROOT/taobin_project/xml/page_catalog_group_pro_12_day_12_menu.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_pro_strawberry_series.xml"

File diff suppressed because it is too large Load diff

View file

@ -37,6 +37,42 @@
</EventOnClick>
<Video>
<X> 42 </X>
<Y> 518 </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/strawberry_series/strawberry_series.mp4" </Filename>
</Video>
<Video>
<X> 42 </X>
<Y> 518 </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/strawberry_series/strawberry_series.mp4" </Filename>
</Video>
</Button>
<EventUnitTest1>

File diff suppressed because it is too large Load diff

View file

@ -6,7 +6,7 @@ DEBUGVAR OpenFromPageBoard
DEBUGVAR ThickTeaByBrewerBanner
DEBUGVAR ThickTeaByBrewerPro
DEBUGVAR 12Day12MenuPro
DEBUGVAR StrawberrySeriesPro
Var PromotionState1 = "Invisible"
Var PromotionState2 = "Invisible"
@ -28,26 +28,14 @@ Else
; zone promote
If 12Day12MenuPro = 1 Then
Var CountEnablePromotion = 1
Var PromotionState1 = "Enable"
If ThickTeaByBrewerBanner = 1 Then
Var CountEnablePromotion = 1
Var PromotionState2 = "Enable"
EndIf
If CountEnablePromotion > 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_12_day_12_menu_and_thick_tea_by_brewer.xml"
Else
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_12_day_12_menu.xml"
EndIf
Else
If StrawberrySeriesPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_strawberry_series.xml"
Else
If ThickTeaByBrewerBanner = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_thick_tea_by_brewer.xml"
EndIf
EndIf
EndIf
If OpenFromPageBoard = 1 Then
DEBUGVAR FreeEnergyDrink

View file

@ -171,6 +171,9 @@ Var WinterWonderPro = 0
Var ThickTeaByBrewerPro = 0
Var ThickTeaByBrewerBanner = 0
; Strawberry Series, 7 - 31 Jan
Var StrawberrySeriesPro = 0
Var NewCollectPoint = 1
Var PayMentCodeShouldCollectPromotionPoint = 0
Var NotCollectPointPromotion = 0
@ -189,6 +192,10 @@ If SystemDateMonthInt = 1 Then
Var ThickTeaByBrewerPro = 1
Var ThickTeaByBrewerBanner = 1
EndIf
If SystemDateDayInt >= 7 Then
Var StrawberrySeriesPro = 1
EndIf
EndIf
@ -335,15 +342,10 @@ EndIf
If BoxID = 105005 Then
Var NewFlowPaymentCode = 1
Var New_Payment = 1
Var JemilaPro = 0
Var HalloweenPro = 0
Var WeekdayDiscountPro = 0
Var WeekdayDiscountProEventOn = 0
Var OreoDiscount11Pro = 0
Var HappyTriosPro = 0
Var 12Day12MenuPro = 0
Var WinterWonderPro = 1
Var ThickTeaByBrewerPro = 1
;Var WinterWonderPro = 0
;Var ThickTeaByBrewerBanner = 0
;Var StrawberrySeriesPro = 0
Var JemilaToppingFlag = 1
Var JemilaToppingFreeFlag = 1
@ -404,11 +406,11 @@ If BoxID = 172644 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
Var 12Day12MenuPro = 0
Var WinterWonderPro = 1
Var ThickTeaByBrewerPro = 1
Var JemilaToppingFlag = 1
EndIf