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

MYS: fix promo bug (wrong rec path & wrong menu)

Browse source
This commit is contained in:
Pakin 2024-07-05 08:30:06 +07:00
parent f72f39eb6b
commit b6e6011eb0
4 changed files with 224 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inter/mys/xml/event/double_promotion_thai_tea_and_yuzu.lxml
View file

@ -174,7 +174,7 @@
</EventOpen> </EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.lxml" ;include="ROOT/taobin_project/inter/mys/xml/menu_catalog_new.lxml"
<FrameScroll> <FrameScroll>

54
inter/mys/xml/page_catalog_group_pro_yuzu.lxml
View file

@ -1989,15 +1989,15 @@
</Text> </Text>
</Block> </Block>
; ==================> Len = 3 ; ==================> Len = 3
; - 12-05-02-0053 - ; - 12-05-02-0076 -
<Block> <Block>
<MarginLeft> 33 </MarginLeft> <MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop> <MarginTop> 22 </MarginTop>
<Width> 225 </Width> <Width> 225 </Width>
<Height> 296 </Height> <Height> 296 </Height>
<State> Flag( 12-05-02-0053.Button,$Sum1205020053) </State> <State> Flag( 12-05-02-0076.Button,$Sum1205020076) </State>
<Button> <Button>
<State> $Sum1205020053 </State> <State> $Sum1205020076 </State>
<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_iced_pepsi_yuzu.png" </Filename> <Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_iced_pepsi_yuzu.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </FilenameDisable>
@ -2007,22 +2007,22 @@
Var PictureDrink = "ROOT/taobin_project/inter/mys/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png" Var PictureDrink = "ROOT/taobin_project/inter/mys/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price Var PriceD1 = $-.Price
Var PriceD2 = $12-05-02-0053.Price Var PriceD2 = $12-05-02-0076.Price
Var PriceD3 = $-.Price Var PriceD3 = $-.Price
Var PD_CODE1 = "##-##-##-####" Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "12-05-02-0053" Var PD_CODE2 = "12-05-02-0076"
Var PD_CODE3 = "##-##-##-####" Var PD_CODE3 = "##-##-##-####"
; begin lang ; begin lang
Var aliasName[0] = "PEPSI YUZU" Var aliasName[0] = "PEPSI Black YUZU"
Var aliasDesc[0] = "Pepsi, Yuzu Syrup& Ice" Var aliasDesc[0] = "Pepsi Black, Yuzu Syrup& Ice"
Var aliasName[1] = "เป๊ปซี่ยูซุ" Var aliasName[1] = "เป๊ปซี่ยูซุ"
Var aliasDesc[1] = "เป๊ปซี่ น้ำเชื่อมยูซุ โซดา" Var aliasDesc[1] = "เป๊ปซี่ น้ำเชื่อมยูซุ โซดา"
Var aliasName[2] = "-" Var aliasName[2] = "-"
Var aliasDesc[2] = "-" Var aliasDesc[2] = "-"
Var aliasName[3] = "-" Var aliasName[3] = "-"
Var aliasDesc[3] = "-" Var aliasDesc[3] = "-"
Var aliasName[4] = "PEPSI YUZU" Var aliasName[4] = "PEPSI Black YUZU"
Var aliasDesc[4] = "Pepsi, Sirap Yuzu, Ais" Var aliasDesc[4] = "Pepsi Black, Sirap Yuzu, Ais"
Var aliasName[5] = "-" Var aliasName[5] = "-"
Var aliasDesc[5] = "-" Var aliasDesc[5] = "-"
Var NameLang[0][0] = "" Var NameLang[0][0] = ""
@ -2037,17 +2037,17 @@
Var DescLang[0][3] = "" Var DescLang[0][3] = ""
Var DescLang[0][4] = "" Var DescLang[0][4] = ""
Var DescLang[0][5] = "" Var DescLang[0][5] = ""
Var NameLang[1][0] = "PEPSI YUZU" Var NameLang[1][0] = "PEPSI Black YUZU"
Var NameLang[1][1] = "เป๊ปซี่ยูซุ" Var NameLang[1][1] = "เป๊ปซี่ยูซุ"
Var NameLang[1][2] = "-" Var NameLang[1][2] = "-"
Var NameLang[1][3] = "-" Var NameLang[1][3] = "-"
Var NameLang[1][4] = "PEPSI YUZU" Var NameLang[1][4] = "PEPSI Black YUZU"
Var NameLang[1][5] = "" Var NameLang[1][5] = ""
Var DescLang[1][0] = "Pepsi, Yuzu Syrup& Ice" Var DescLang[1][0] = "Pepsi Black, Yuzu Syrup& Ice"
Var DescLang[1][1] = "เป๊ปซี่ น้ำเชื่อมยูซุ โซดา" Var DescLang[1][1] = "เป๊ปซี่ น้ำเชื่อมยูซุ โซดา"
Var DescLang[1][2] = "-" Var DescLang[1][2] = "-"
Var DescLang[1][3] = "-" Var DescLang[1][3] = "-"
Var DescLang[1][4] = "Pepsi, Sirap Yuzu, Ais" Var DescLang[1][4] = "Pepsi Black, Sirap Yuzu, Ais"
Var DescLang[1][5] = "" Var DescLang[1][5] = ""
Var NameLang[2][0] = "" Var NameLang[2][0] = ""
Var NameLang[2][1] = "" Var NameLang[2][1] = ""
@ -2063,7 +2063,7 @@
Var DescLang[2][5] = "" Var DescLang[2][5] = ""
; end lang ; end lang
Var PD_STAGE_1 = "Disable2" Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $12-05-02-0053.Button Var PD_STAGE_2 = $12-05-02-0076.Button
Var PD_STAGE_3 = "Disable2" Var PD_STAGE_3 = "Disable2"
Var SelectCountDrinkType = 0 Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0 Var DefaultDrinkType = 0
@ -2080,7 +2080,7 @@
Var DefaultDrinkType = 3 Var DefaultDrinkType = 3
EndIf EndIf
If PD_STAGE_2 = "Enable" Then If PD_STAGE_2 = "Enable" Then
Topping "Load" "12-05-02-0053" Topping "Load" "12-05-02-0076"
Else Else
If PD_STAGE_1 = "Enable" Then If PD_STAGE_1 = "Enable" Then
Topping "Load" "-" Topping "Load" "-"
@ -2109,11 +2109,11 @@
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color> <Color> 0x322B26 </Color>
<LanguageGroup> <LanguageGroup>
<LanguageSlot1>PEPSI YUZU</LanguageSlot1> <LanguageSlot1>PEPSI Black YUZU</LanguageSlot1>
<LanguageSlot2>เป๊ปซี่ยูซุ</LanguageSlot2> <LanguageSlot2>เป๊ปซี่ยูซุ</LanguageSlot2>
<LanguageSlot3>PEPSI YUZU</LanguageSlot3> <LanguageSlot3>PEPSI Black YUZU</LanguageSlot3>
<LanguageSlot4>เป๊ปซี่ยูซุ</LanguageSlot4> <LanguageSlot4>เป๊ปซี่ยูซุ</LanguageSlot4>
<LanguageSlot5>PEPSI YUZU</LanguageSlot5> <LanguageSlot5>PEPSI Black YUZU</LanguageSlot5>
<LanguageSlot6>เป๊ปซี่ยูซุ</LanguageSlot6> <LanguageSlot6>เป๊ปซี่ยูซุ</LanguageSlot6>
</LanguageGroup> </LanguageGroup>
</Text> </Text>
@ -2125,11 +2125,11 @@
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<LanguageGroup> <LanguageGroup>
<LanguageSlot1>Pepsi, Yuzu Syrup& Ice</LanguageSlot1> <LanguageSlot1>Pepsi Black, Yuzu Syrup& Ice</LanguageSlot1>
<LanguageSlot2>เป๊ปซี่ น้ำเชื่อมยูซุ โซดา</LanguageSlot2> <LanguageSlot2>เป๊ปซี่ น้ำเชื่อมยูซุ โซดา</LanguageSlot2>
<LanguageSlot3>Pepsi, Yuzu Syrup& Ice</LanguageSlot3> <LanguageSlot3>Pepsi Black, Yuzu Syrup& Ice</LanguageSlot3>
<LanguageSlot4>เป๊ปซี่ น้ำเชื่อมยูซุ โซดา</LanguageSlot4> <LanguageSlot4>เป๊ปซี่ น้ำเชื่อมยูซุ โซดา</LanguageSlot4>
<LanguageSlot5>Pepsi, Sirap Yuzu, Ais</LanguageSlot5> <LanguageSlot5>Pepsi Black, Sirap Yuzu, Ais</LanguageSlot5>
<LanguageSlot6>เป๊ปซี่ น้ำเชื่อมยูซุ โซดา</LanguageSlot6> <LanguageSlot6>เป๊ปซี่ น้ำเชื่อมยูซุ โซดา</LanguageSlot6>
</LanguageGroup> </LanguageGroup>
</Text> </Text>
@ -2161,7 +2161,7 @@
<Y> 264 </Y> <Y> 264 </Y>
<Filename> Var( DirImage2 + "cold.png" ) </Filename> <Filename> Var( DirImage2 + "cold.png" ) </Filename>
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable> <FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
<State> $12-05-02-0053.Button </State> <State> $12-05-02-0076.Button </State>
</Image> </Image>
<Text> <Text>
<X> 113 </X> <X> 113 </X>
@ -2171,8 +2171,8 @@
<Font> KanitMediumTTF </Font> <Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-05-02-0053.Button </State> <State> $12-05-02-0076.Button </State>
<Value> StringFmt( $12-05-02-0053.Price , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( $12-05-02-0076.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 146 </X> <X> 146 </X>
@ -2215,9 +2215,9 @@
<Y> 117 </Y> <Y> 117 </Y>
<State> <State>
eval( eval(
If $Sum1205020053 = "Disable" Then If $Sum1205020076 = "Disable" Then
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
STRCONTAIN "ERR" $12-05-02-0053.TAG tag2_is_disable STRCONTAIN "ERR" $12-05-02-0076.TAG tag2_is_disable
STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
Var return = "Invisible" Var return = "Invisible"
If tag1_is_disable = "true" Then If tag1_is_disable = "true" Then
@ -2252,7 +2252,7 @@
<Width>128</Width> <Width>128</Width>
<Height>64</Height> <Height>64</Height>
<Mode> "disable-show" </Mode> <Mode> "disable-show" </Mode>
<State> $Sum1205020053 </State> <State> $Sum1205020076 </State>
<Language> <Language>
<ID> 000013 </ID> <ID> 000013 </ID>
</Language> </Language>

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

@ -166,7 +166,7 @@
</EventOpen> </EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.lxml" ;include="ROOT/taobin_project/inter/mys/xml/menu_catalog_new.lxml"
<FrameScroll> <FrameScroll>

2
inter/mys/xml/page_catalog_group_recommend_multi_pro.skt
View file

@ -47,7 +47,7 @@
</EventOpen> </EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.lxml" ;include="ROOT/taobin_project/inter/mys/xml/menu_catalog_new.lxml"
<?hurr <?hurr