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

Fix taobin_notopup. Using string contain

Browse source
This commit is contained in:
wanlop run 2024-05-03 10:22:23 +07:00
parent 51bb9a4172
commit 63c2aab907
11 changed files with 41 additions and 32164 deletions
Download patch file Download diff file Expand all files Collapse all files

146
xml/event/promotion_energy_drink_1_bath.xml
View file

@ -12665,23 +12665,14 @@ LIMENADE SODA" </Value>
</Image>
<Text>
<X> 50 </X>
<<<<<<< HEAD
<Y> 265 </Y>
<Size> 14 </Size>
=======
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<<<<<<< HEAD
<Value> Var( "฿" + $-.Price ) </Value>
=======
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
</Text>
<Image>
<X> 81 </X>
@ -12692,23 +12683,14 @@ LIMENADE SODA" </Value>
</Image>
<Text>
<X> 115 </X>
<<<<<<< HEAD
<Y> 265 </Y>
<Size> 14 </Size>
=======
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<<<<<<< HEAD
<Value> Var( "฿" + $.Price ) </Value>
=======
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
</Text>
<Image>
<X> 146 </X>
@ -12718,7 +12700,6 @@ LIMENADE SODA" </Value>
<State> $12-05-03-0092.Button </State>
</Image>
<Text>
<<<<<<< HEAD
<X> 183 </X>
<Y> 264 </Y>
<Size> 14 </Size>
@ -12728,17 +12709,6 @@ LIMENADE SODA" </Value>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-05-03-0092.Button </State>
<Value> Var( "฿" + $12-05-03-0092.Price ) </Value>
=======
<X> 180 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitRegularTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-05-03-0092.Button </State>
<Value> StringFmt( $12-05-03-0092.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
</Text>
<Image>
<X> 81 </X>
@ -12948,23 +12918,14 @@ Water" </Value>
</Image>
<Text>
<X> 50 </X>
<<<<<<< HEAD
<Y> 265 </Y>
<Size> 14 </Size>
=======
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<<<<<<< HEAD
<Value> Var( "฿" + $-.Price ) </Value>
=======
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
</Text>
<Image>
<X> 81 </X>
@ -12975,23 +12936,14 @@ Water" </Value>
</Image>
<Text>
<X> 115 </X>
<<<<<<< HEAD
<Y> 265 </Y>
<Size> 14 </Size>
=======
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-03-02-0058.Button </State>
<<<<<<< HEAD
<Value> Var( "฿" + $12-03-02-0058.Price ) </Value>
=======
<Value> StringFmt( $12-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
</Text>
<Image>
<X> 146 </X>
@ -13001,7 +12953,6 @@ Water" </Value>
<State> $12-03-03-0058.Button </State>
</Image>
<Text>
<<<<<<< HEAD
<X> 183 </X>
<Y> 264 </Y>
<Size> 14 </Size>
@ -13011,17 +12962,6 @@ Water" </Value>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-03-03-0058.Button </State>
<Value> Var( "฿" + $12-03-03-0058.Price ) </Value>
=======
<X> 180 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitRegularTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-03-03-0058.Button </State>
<Value> StringFmt( $12-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
</Text>
<Image>
<X> 81 </X>
@ -13112,92 +13052,6 @@ Water" </Value>
<Button>
<X> 42 </X>
<Y> 518 </Y>
<State> BigButtonEnable </State>
<Filename>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
Else
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
EndIf
)
</Filename>
<FilenamePress>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
Else
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
EndIf
)
</FilenamePress>
<FilenameDisable>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
Else
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
EndIf
)
</FilenameDisable>
<EventOnClick>
Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_catalog.xml"
</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/energy_drink_1_bath/energy_drink_1_bath_th.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/energy_drink_1_bath/energy_drink_1_bath_en.mp4" </Filename>
</Video>
</Button>
<EventUnitTest1>
Var BigButtonEnable = "Enable"
Refresh
</EventUnitTest1>
<EventUnitTest2>
Var BigButtonEnable = "Invisible"
Refresh
</EventUnitTest2>
<Button>
<X> 780 </X>