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

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Pakin 2024-03-11 11:37:13 +07:00
commit 08a2046432
4 changed files with 16 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xml/event/dummy_layout_promotion.py
View file

@ -409,9 +409,9 @@ else:
file_xml_double3.close()
if "triple_template1" in param:
file_inc_triple1 = open(directory_to_process + "/event/triple_promotion_template2.inc", 'r')
file_inc_triple1 = open(directory_to_process + "/event/triple_promotion_template1.inc", 'r')
file_inc_triple1_content = file_inc_triple1.read()
file_inc_img = open(directory_to_process + "../image/event/image_triple_template2", 'r')
file_inc_img = open(directory_to_process + "../image/event/image_triple_template1", 'r')
file_inc_triple1_img_content = file_inc_img.read()
# replace key.

12
xml/event/script_common_for_open_promotion_xml.ev
View file

@ -22,18 +22,6 @@ Else
; check profile to enable free energy drink promotion
STRCONTAIN "ProEnergyDrinkFreePerCardID" XMLProfile EnableFreeEnergyDrink
; Debug
If BoxID = 177746 Then
Var EnableFreeEnergyDrink = "true"
Var PepsiSecondCup30Enable = 0
EndIf
Var EnableFreeEnergyDrink = "true"
If EnableFreeEnergyDrink = "true" Then
Var FreeEnergyDrink = 1
EndIf
DEBUGVAR FreeEnergyDrink
;Var EnableFreeEnergyDrink = "true"

8
xml/event/tricker.ev
View file

@ -241,13 +241,13 @@ If BoxID = 201316 Then
EndIf
If BoxID = 105005 Then
Var PepsiSecondCup30Enable = 0
Var PepsiSecondCup30DiscountEnable = 0
Var PepsiSecondCup30Enable = 1
Var PepsiSecondCup30DiscountEnable = 1
Var NewFlowPaymentCode = 1
Var LipitPro = 1
Var LipitPro = 0
Var MondayBananaPro = 1
Var FreeEnergyDrink = 1
Var FreeEnergyDrink = 0
EndIf
If BoxID = 172644 Then

20
xml/event/triple_promotion_pepsi_second_cup_30_and_monday_banana_and_free_energy_drink.xml
View file

@ -13495,33 +13495,33 @@ LIMENADE SODA" </Value>
<Filename>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/lipit/lipit_en.png"
Var return = "ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png"
Else
Var return = "ROOT/taobin_project/image/event/lipit/lipit_th.png"
Var return = "ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png"
EndIf
)
</Filename>
<FilenamePress>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/lipit/lipit_en.png"
Var return = "ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png"
Else
Var return = "ROOT/taobin_project/image/event/lipit/lipit_th.png"
Var return = "ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png"
EndIf
)
</FilenamePress>
<FilenameDisable>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/lipit/lipit_en.png"
Var return = "ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png"
Else
Var return = "ROOT/taobin_project/image/event/lipit/lipit_th.png"
Var return = "ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30.png"
EndIf
)
</FilenameDisable>
<EventOnClick>
Open "ROOT/taobin_project/xml/page_catalog_group_pro_lipit.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepsi_second_cup_30.xml"
</EventOnClick>
@ -13541,7 +13541,7 @@ LIMENADE SODA" </Value>
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image/event/lipitpage_catalog_group_pro_lipit/pro_lipitpage_catalog_group_pro_lipit_th.mp4" </Filename>
<Filename> "ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30_th.mp4" </Filename>
</Video>
<Video>
@ -13559,7 +13559,7 @@ LIMENADE SODA" </Value>
)
</State>
<Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/image/event/lipitpage_catalog_group_pro_lipit/pro_lipitpage_catalog_group_pro_lipit_en.mp4" </Filename>
<Filename> "ROOT/taobin_project/image/event/pepsi_second_cup_30/pro_pepsi_second_cup_30_en.mp4" </Filename>
</Video>
</Button>
@ -13636,7 +13636,7 @@ LIMENADE SODA" </Value>
</FilenameDisable>
<EventOnClick>
Open "ROOT/taobin_project/xml/event/powerup_free_1/page_powerup_bridge.xml"
Open "ROOT/taobin_project/xml/event/powerup_free_1/page_powerup_bridge.xml"
</EventOnClick>