DO unify
This commit is contained in:
kong
parent
0329fdb5d4
commit
88e08cdb78
11 changed files with 6161 additions and 259 deletions
|
|
@ -163,6 +163,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
|
||||
|
|
@ -251,7 +261,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>
|
||||
|
|
@ -264,7 +278,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>
|
||||
|
||||
|
|
@ -4082,15 +4100,15 @@ LIMENADE" </Value>
|
|||
<Value> Var( "฿" + $-.Price ) </Value>
|
||||
</Text>
|
||||
</Block>
|
||||
; 12-02-01-0031 12-02-02-0032 -
|
||||
; 12-02-01-0032 12-02-02-0032 -
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-02-01-0031.Button,12-02-02-0032.Button,) </State>
|
||||
<State> Flag( 12-02-01-0032.Button,12-02-02-0032.Button,) </State>
|
||||
<Button>
|
||||
<State> Flag( 12-02-01-0031.Button,12-02-02-0032.Button,) </State>
|
||||
<State> Flag( 12-02-01-0032.Button,12-02-02-0032.Button,) </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_lime_Oolong_tea.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_lime_Oolong_tea.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_lime_Oolong_tea.png" </FilenameDisable>
|
||||
|
|
@ -4104,13 +4122,13 @@ LIMENADE" </Value>
|
|||
Topping "Load" "12-02-02-0032"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + "bn_hot_lime_Oolong_tea.png"
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $12-02-01-0031.Price
|
||||
Var PriceD1 = $12-02-01-0032.Price
|
||||
Var PriceD2 = $12-02-02-0032.Price
|
||||
Var PriceD3 = $-.Price
|
||||
Var PD_CODE1 = "12-02-01-0031"
|
||||
Var PD_CODE1 = "12-02-01-0032"
|
||||
Var PD_CODE2 = "12-02-02-0032"
|
||||
Var PD_CODE3 = "##-##-##-####"
|
||||
Var PD_STAGE_1 = $12-02-01-0031.Button
|
||||
Var PD_STAGE_1 = $12-02-01-0032.Button
|
||||
Var PD_STAGE_2 = $12-02-02-0032.Button
|
||||
Var PD_STAGE_3 = "Disable2"
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
|
|
@ -4178,7 +4196,7 @@ Water, and Ice" </Value>
|
|||
<Image>
|
||||
<X> 16 </X>
|
||||
<Y> 264 </Y>
|
||||
<State> $12-02-01-0031.Button </State>
|
||||
<State> $12-02-01-0032.Button </State>
|
||||
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
|
||||
</Image>
|
||||
|
|
@ -4190,8 +4208,8 @@ Water, and Ice" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> $12-02-01-0031.Button </State>
|
||||
<Value> Var( "฿" + $12-02-01-0031.Price ) </Value>
|
||||
<State> $12-02-01-0032.Button </State>
|
||||
<Value> Var( "฿" + $12-02-01-0032.Price ) </Value>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 81 </X>
|
||||
|
|
@ -4230,15 +4248,15 @@ Water, and Ice" </Value>
|
|||
<Value> Var( "฿" + $-.Price ) </Value>
|
||||
</Text>
|
||||
</Block>
|
||||
; 12-02-01-0016 - -
|
||||
; 12-02-01-0016 12-02-02-0017 12-02-03-0017
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-02-01-0016.Button,) </State>
|
||||
<State> Flag( 12-02-01-0016.Button,12-02-02-0017.Button,12-02-03-0017.Button,) </State>
|
||||
<Button>
|
||||
<State> Flag( 12-02-01-0016.Button,) </State>
|
||||
<State> Flag( 12-02-01-0016.Button,12-02-02-0017.Button,12-02-03-0017.Button,) </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_hot_ume_tea.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_hot_ume_tea.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n//bn_hot_ume_tea.png" </FilenameDisable>
|
||||
|
|
@ -4249,18 +4267,18 @@ Water, and Ice" </Value>
|
|||
Var NameDrinkTH = "ชาบ๊วย "
|
||||
Var DrinkDescriptionTH = "ชาไทย น้ำเชื่อมบ๊วย"
|
||||
Var DrinkDescription = "Thai tea, Ume Syrup, and water"
|
||||
Topping "Load" "-"
|
||||
Topping "Load" "12-02-02-0017"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + "bn_hot_ume_tea.png"
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $12-02-01-0016.Price
|
||||
Var PriceD2 = $-.Price
|
||||
Var PriceD3 = $-.Price
|
||||
Var PriceD2 = $12-02-02-0017.Price
|
||||
Var PriceD3 = $12-02-03-0017.Price
|
||||
Var PD_CODE1 = "12-02-01-0016"
|
||||
Var PD_CODE2 = "##-##-##-####"
|
||||
Var PD_CODE3 = "##-##-##-####"
|
||||
Var PD_CODE2 = "12-02-02-0017"
|
||||
Var PD_CODE3 = "12-02-03-0017"
|
||||
Var PD_STAGE_1 = $12-02-01-0016.Button
|
||||
Var PD_STAGE_2 = "Disable2"
|
||||
Var PD_STAGE_3 = "Disable2"
|
||||
Var PD_STAGE_2 = $12-02-02-0017.Button
|
||||
Var PD_STAGE_3 = $12-02-03-0017.Button
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Var PD_STAGE_2 = "PressForever"
|
||||
Else
|
||||
|
|
@ -4344,7 +4362,7 @@ and water" </Value>
|
|||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
|
||||
<State> "Invisible" </State>
|
||||
<State> $12-02-02-0017.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 115 </X>
|
||||
|
|
@ -4354,15 +4372,15 @@ and water" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> Var( "฿" + $-.Price ) </Value>
|
||||
<State> $12-02-02-0017.Button </State>
|
||||
<Value> Var( "฿" + $12-02-02-0017.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-02-03-0017.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 183 </X>
|
||||
|
|
@ -4372,8 +4390,8 @@ and water" </Value>
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> Var( "฿" + $-.Price ) </Value>
|
||||
<State> $12-02-03-0017.Button </State>
|
||||
<Value> Var( "฿" + $12-02-03-0017.Price ) </Value>
|
||||
</Text>
|
||||
</Block>
|
||||
</FrameScroll>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue