DO unify
This commit is contained in:
parent
0329fdb5d4
commit
88e08cdb78
11 changed files with 6161 additions and 259 deletions
|
|
@ -161,6 +161,16 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
If IgnoreNetCore = "true" Then
|
||||
|
||||
Else
|
||||
;stop_now
|
||||
If NETCORE_LOST_CNT > 15 Then
|
||||
Var stop_now = "true"
|
||||
Var MachineErrorDetailAll = "???"
|
||||
Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
TimerReset
|
||||
|
|
@ -249,7 +259,11 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
Var NextPage = "-"
|
||||
Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml"
|
||||
If new_layout = "true" Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml"
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
<Button>
|
||||
|
|
@ -262,7 +276,11 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
Var NextPage = "-"
|
||||
Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml"
|
||||
If new_layout = "true" Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml"
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -3644,15 +3662,15 @@ SODA" </Value>
|
|||
<Value> Var( "฿" + $12-05-03-0034.Price ) </Value>
|
||||
</Text>
|
||||
</Block>
|
||||
; - 12-05-02-0003 -
|
||||
; - 12-05-02-0003 12-05-03-0003
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-05-02-0003.Button,) </State>
|
||||
<State> Flag( 12-05-02-0003.Button,12-05-03-0003.Button,) </State>
|
||||
<Button>
|
||||
<State> Flag( 12-05-02-0003.Button,) </State>
|
||||
<State> Flag( 12-05-02-0003.Button,12-05-03-0003.Button,) </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_sala_lime.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_sala_lime.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_sala_lime.png" </FilenameDisable>
|
||||
|
|
@ -3668,13 +3686,13 @@ SODA" </Value>
|
|||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $-.Price
|
||||
Var PriceD2 = $12-05-02-0003.Price
|
||||
Var PriceD3 = $-.Price
|
||||
Var PriceD3 = $12-05-03-0003.Price
|
||||
Var PD_CODE1 = "##-##-##-####"
|
||||
Var PD_CODE2 = "12-05-02-0003"
|
||||
Var PD_CODE3 = "##-##-##-####"
|
||||
Var PD_CODE3 = "12-05-03-0003"
|
||||
Var PD_STAGE_1 = "Disable2"
|
||||
Var PD_STAGE_2 = $12-05-02-0003.Button
|
||||
Var PD_STAGE_3 = "Disable2"
|
||||
Var PD_STAGE_3 = $12-05-03-0003.Button
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Var PD_STAGE_2 = "PressForever"
|
||||
Else
|
||||
|
|
@ -3777,7 +3795,7 @@ Water, Ice" </Value>
|
|||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
|
||||
<State> "Invisible" </State>
|
||||
<State> $12-05-03-0003.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 183 </X>
|
||||
|
|
@ -3787,19 +3805,19 @@ Water, Ice" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> Var( "฿" + $-.Price ) </Value>
|
||||
<State> $12-05-03-0003.Button </State>
|
||||
<Value> Var( "฿" + $12-05-03-0003.Price ) </Value>
|
||||
</Text>
|
||||
</Block>
|
||||
; - 12-05-02-0004 -
|
||||
; - 12-05-02-0004 12-05-03-0004
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-05-02-0004.Button,) </State>
|
||||
<State> Flag( 12-05-02-0004.Button,12-05-03-0004.Button,) </State>
|
||||
<Button>
|
||||
<State> Flag( 12-05-02-0004.Button,) </State>
|
||||
<State> Flag( 12-05-02-0004.Button,12-05-03-0004.Button,) </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Lychee.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Lychee.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_Lychee.png" </FilenameDisable>
|
||||
|
|
@ -3815,13 +3833,13 @@ Water, Ice" </Value>
|
|||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $-.Price
|
||||
Var PriceD2 = $12-05-02-0004.Price
|
||||
Var PriceD3 = $-.Price
|
||||
Var PriceD3 = $12-05-03-0004.Price
|
||||
Var PD_CODE1 = "##-##-##-####"
|
||||
Var PD_CODE2 = "12-05-02-0004"
|
||||
Var PD_CODE3 = "##-##-##-####"
|
||||
Var PD_CODE3 = "12-05-03-0004"
|
||||
Var PD_STAGE_1 = "Disable2"
|
||||
Var PD_STAGE_2 = $12-05-02-0004.Button
|
||||
Var PD_STAGE_3 = "Disable2"
|
||||
Var PD_STAGE_3 = $12-05-03-0004.Button
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Var PD_STAGE_2 = "PressForever"
|
||||
Else
|
||||
|
|
@ -3923,7 +3941,7 @@ Water, Ice" </Value>
|
|||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
|
||||
<State> "Invisible" </State>
|
||||
<State> $12-05-03-0004.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 183 </X>
|
||||
|
|
@ -3933,19 +3951,19 @@ Water, Ice" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> Var( "฿" + $-.Price ) </Value>
|
||||
<State> $12-05-03-0004.Button </State>
|
||||
<Value> Var( "฿" + $12-05-03-0004.Price ) </Value>
|
||||
</Text>
|
||||
</Block>
|
||||
; - 12-05-02-0002 -
|
||||
; - 12-05-02-0002 12-05-03-0002
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-05-02-0002.Button,) </State>
|
||||
<State> Flag( 12-05-02-0002.Button,12-05-03-0002.Button,) </State>
|
||||
<Button>
|
||||
<State> Flag( 12-05-02-0002.Button,) </State>
|
||||
<State> Flag( 12-05-02-0002.Button,12-05-03-0002.Button,) </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_sala.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_sala.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_sala.png" </FilenameDisable>
|
||||
|
|
@ -3961,13 +3979,13 @@ Water, Ice" </Value>
|
|||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $-.Price
|
||||
Var PriceD2 = $12-05-02-0002.Price
|
||||
Var PriceD3 = $-.Price
|
||||
Var PriceD3 = $12-05-03-0002.Price
|
||||
Var PD_CODE1 = "##-##-##-####"
|
||||
Var PD_CODE2 = "12-05-02-0002"
|
||||
Var PD_CODE3 = "##-##-##-####"
|
||||
Var PD_CODE3 = "12-05-03-0002"
|
||||
Var PD_STAGE_1 = "Disable2"
|
||||
Var PD_STAGE_2 = $12-05-02-0002.Button
|
||||
Var PD_STAGE_3 = "Disable2"
|
||||
Var PD_STAGE_3 = $12-05-03-0002.Button
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Var PD_STAGE_2 = "PressForever"
|
||||
Else
|
||||
|
|
@ -4069,7 +4087,7 @@ Water, Ice" </Value>
|
|||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
|
||||
<State> "Invisible" </State>
|
||||
<State> $12-05-03-0002.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 183 </X>
|
||||
|
|
@ -4079,8 +4097,8 @@ Water, Ice" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> Var( "฿" + $-.Price ) </Value>
|
||||
<State> $12-05-03-0002.Button </State>
|
||||
<Value> Var( "฿" + $12-05-03-0002.Price ) </Value>
|
||||
</Text>
|
||||
</Block>
|
||||
; - 12-05-02-0005 -
|
||||
|
|
@ -4520,15 +4538,15 @@ Water, Ice" </Value>
|
|||
<Value> Var( "฿" + $12-05-03-0026.Price ) </Value>
|
||||
</Text>
|
||||
</Block>
|
||||
; 12-05-02-0032 - -
|
||||
; - 12-05-02-0032 12-05-03-0032
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-05-02-0032.Button,) </State>
|
||||
<State> Flag( 12-05-02-0032.Button,12-05-03-0032.Button,) </State>
|
||||
<Button>
|
||||
<State> Flag( 12-05-02-0032.Button,) </State>
|
||||
<State> Flag( 12-05-02-0032.Button,12-05-03-0032.Button,) </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Lychee.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Lychee.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_Lychee.png" </FilenameDisable>
|
||||
|
|
@ -4539,18 +4557,18 @@ Water, Ice" </Value>
|
|||
Var NameDrinkTH = "น้ำลิ้นจี่ "
|
||||
Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ น้ำ "
|
||||
Var DrinkDescription = "Lychee, Sugar, Water, Ice"
|
||||
Topping "Load" "-"
|
||||
Topping "Load" "12-05-02-0032"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + "bn_iced_Lychee.png"
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $12-05-02-0032.Price
|
||||
Var PriceD2 = $-.Price
|
||||
Var PriceD3 = $-.Price
|
||||
Var PD_CODE1 = "12-05-02-0032"
|
||||
Var PD_CODE2 = "##-##-##-####"
|
||||
Var PD_CODE3 = "##-##-##-####"
|
||||
Var PD_STAGE_1 = $12-05-02-0032.Button
|
||||
Var PD_STAGE_2 = "Disable2"
|
||||
Var PD_STAGE_3 = "Disable2"
|
||||
Var PriceD1 = $-.Price
|
||||
Var PriceD2 = $12-05-02-0032.Price
|
||||
Var PriceD3 = $12-05-03-0032.Price
|
||||
Var PD_CODE1 = "##-##-##-####"
|
||||
Var PD_CODE2 = "12-05-02-0032"
|
||||
Var PD_CODE3 = "12-05-03-0032"
|
||||
Var PD_STAGE_1 = "Disable2"
|
||||
Var PD_STAGE_2 = $12-05-02-0032.Button
|
||||
Var PD_STAGE_3 = $12-05-03-0032.Button
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Var PD_STAGE_2 = "PressForever"
|
||||
Else
|
||||
|
|
@ -4614,7 +4632,7 @@ Water, Ice" </Value>
|
|||
<Image>
|
||||
<X> 16 </X>
|
||||
<Y> 264 </Y>
|
||||
<State> $12-05-02-0032.Button </State>
|
||||
<State> "Invisible" </State>
|
||||
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
|
||||
</Image>
|
||||
|
|
@ -4626,15 +4644,15 @@ Water, Ice" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> $12-05-02-0032.Button </State>
|
||||
<Value> Var( "฿" + $12-05-02-0032.Price ) </Value>
|
||||
<State> "Invisible" </State>
|
||||
<Value> Var( "฿" + $-.Price ) </Value>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 81 </X>
|
||||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
|
||||
<State> "Invisible" </State>
|
||||
<State> $12-05-02-0032.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 115 </X>
|
||||
|
|
@ -4644,15 +4662,15 @@ Water, Ice" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> Var( "฿" + $-.Price ) </Value>
|
||||
<State> $12-05-02-0032.Button </State>
|
||||
<Value> Var( "฿" + $12-05-02-0032.Price ) </Value>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 146 </X>
|
||||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
|
||||
<State> "Invisible" </State>
|
||||
<State> $12-05-03-0032.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 183 </X>
|
||||
|
|
@ -4662,19 +4680,19 @@ Water, Ice" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> Var( "฿" + $-.Price ) </Value>
|
||||
<State> $12-05-03-0032.Button </State>
|
||||
<Value> Var( "฿" + $12-05-03-0032.Price ) </Value>
|
||||
</Text>
|
||||
</Block>
|
||||
; 12-05-02-0040 - -
|
||||
; - 12-05-02-0040 12-05-03-0040
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-05-02-0040.Button,) </State>
|
||||
<State> Flag( 12-05-02-0040.Button,12-05-03-0040.Button,) </State>
|
||||
<Button>
|
||||
<State> Flag( 12-05-02-0040.Button,) </State>
|
||||
<State> Flag( 12-05-02-0040.Button,12-05-03-0040.Button,) </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_strawberry.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_strawberry.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_iced_strawberry.png" </FilenameDisable>
|
||||
|
|
@ -4685,18 +4703,18 @@ Water, Ice" </Value>
|
|||
Var NameDrinkTH = "น้ำสตอเบอร์รี่ "
|
||||
Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ น้ำ "
|
||||
Var DrinkDescription = "Strawberry Syrup, Water, Ice"
|
||||
Topping "Load" "-"
|
||||
Topping "Load" "12-05-02-0040"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + "bn_iced_strawberry.png"
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $12-05-02-0040.Price
|
||||
Var PriceD2 = $-.Price
|
||||
Var PriceD3 = $-.Price
|
||||
Var PD_CODE1 = "12-05-02-0040"
|
||||
Var PD_CODE2 = "##-##-##-####"
|
||||
Var PD_CODE3 = "##-##-##-####"
|
||||
Var PD_STAGE_1 = $12-05-02-0040.Button
|
||||
Var PD_STAGE_2 = "Disable2"
|
||||
Var PD_STAGE_3 = "Disable2"
|
||||
Var PriceD1 = $-.Price
|
||||
Var PriceD2 = $12-05-02-0040.Price
|
||||
Var PriceD3 = $12-05-03-0040.Price
|
||||
Var PD_CODE1 = "##-##-##-####"
|
||||
Var PD_CODE2 = "12-05-02-0040"
|
||||
Var PD_CODE3 = "12-05-03-0040"
|
||||
Var PD_STAGE_1 = "Disable2"
|
||||
Var PD_STAGE_2 = $12-05-02-0040.Button
|
||||
Var PD_STAGE_3 = $12-05-03-0040.Button
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Var PD_STAGE_2 = "PressForever"
|
||||
Else
|
||||
|
|
@ -4760,7 +4778,7 @@ Water, Ice" </Value>
|
|||
<Image>
|
||||
<X> 16 </X>
|
||||
<Y> 264 </Y>
|
||||
<State> $12-05-02-0040.Button </State>
|
||||
<State> "Invisible" </State>
|
||||
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
|
||||
</Image>
|
||||
|
|
@ -4772,15 +4790,15 @@ Water, Ice" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> $12-05-02-0040.Button </State>
|
||||
<Value> Var( "฿" + $12-05-02-0040.Price ) </Value>
|
||||
<State> "Invisible" </State>
|
||||
<Value> Var( "฿" + $-.Price ) </Value>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 81 </X>
|
||||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
|
||||
<State> "Invisible" </State>
|
||||
<State> $12-05-02-0040.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 115 </X>
|
||||
|
|
@ -4790,15 +4808,15 @@ Water, Ice" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> Var( "฿" + $-.Price ) </Value>
|
||||
<State> $12-05-02-0040.Button </State>
|
||||
<Value> Var( "฿" + $12-05-02-0040.Price ) </Value>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 146 </X>
|
||||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
|
||||
<State> "Invisible" </State>
|
||||
<State> $12-05-03-0040.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 183 </X>
|
||||
|
|
@ -4808,8 +4826,8 @@ Water, Ice" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> Var( "฿" + $-.Price ) </Value>
|
||||
<State> $12-05-03-0040.Button </State>
|
||||
<Value> Var( "฿" + $12-05-03-0040.Price ) </Value>
|
||||
</Text>
|
||||
</Block>
|
||||
; 12-06-01-0001 - -
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue