Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
wanlop run
commit
500366e317
136 changed files with 4695 additions and 902 deletions
|
|
@ -1120,9 +1120,9 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 51-05-02-0054.Button,$Sum5105020054) </State>
|
||||
<State> Flag( 51-05-02-0077.Button,$Sum5105020077) </State>
|
||||
<Button>
|
||||
<State> $Sum5105020054 </State>
|
||||
<State> $Sum5105020077 </State>
|
||||
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_pepsi_Banana.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_pepsi_Banana.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_pepsi_Banana.png" </FilenameDisable>
|
||||
|
|
@ -1132,14 +1132,14 @@
|
|||
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_pepsi_Banana.png"
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $-.Price
|
||||
Var PriceD2 = $51-05-02-0054.Price
|
||||
Var PriceD2 = $51-05-02-0077.Price
|
||||
Var PriceD3 = $-.Price
|
||||
Var PD_CODE1 = "##-##-##-####"
|
||||
Var PD_CODE2 = "51-05-02-0054"
|
||||
Var PD_CODE2 = "51-05-02-0077"
|
||||
Var PD_CODE3 = "##-##-##-####"
|
||||
; begin lang
|
||||
Var aliasName[0] = "PEPSI BANANA"
|
||||
Var aliasDesc[0] = "Pepsi, Banana Syrup& Ice"
|
||||
Var aliasName[0] = "PEPSI Max BANANA"
|
||||
Var aliasDesc[0] = "Pepsi Max, Banana Syrup& Ice"
|
||||
Var aliasName[1] = "เป๊ปซี่กล้วย"
|
||||
Var aliasDesc[1] = "เป๊ปซี่ น้ำเชื่อมกล้วย โซดา"
|
||||
Var aliasName[2] = "-"
|
||||
|
|
@ -1162,17 +1162,17 @@
|
|||
Var DescLang[0][3] = ""
|
||||
Var DescLang[0][4] = ""
|
||||
Var DescLang[0][5] = ""
|
||||
Var NameLang[1][0] = "PEPSI BANANA"
|
||||
Var NameLang[1][0] = "PEPSI Max BANANA"
|
||||
Var NameLang[1][1] = "เป๊ปซี่กล้วย"
|
||||
Var NameLang[1][2] = ""
|
||||
Var NameLang[1][3] = ""
|
||||
Var NameLang[1][4] = "PEPSI PISANG"
|
||||
Var NameLang[1][2] = "-"
|
||||
Var NameLang[1][3] = "-"
|
||||
Var NameLang[1][4] = "PEPSI Max BANANA"
|
||||
Var NameLang[1][5] = ""
|
||||
Var DescLang[1][0] = "Pepsi, Banana Syrup& Ice"
|
||||
Var DescLang[1][0] = "Pepsi Max, Banana Syrup& Ice"
|
||||
Var DescLang[1][1] = "เป๊ปซี่ น้ำเชื่อมกล้วย โซดา"
|
||||
Var DescLang[1][2] = ""
|
||||
Var DescLang[1][3] = ""
|
||||
Var DescLang[1][4] = "Pepsi, Sirap Pisang, Ais"
|
||||
Var DescLang[1][2] = "-"
|
||||
Var DescLang[1][3] = "-"
|
||||
Var DescLang[1][4] = "Pepsi Max, Banana Syrup& Ice"
|
||||
Var DescLang[1][5] = ""
|
||||
Var NameLang[2][0] = ""
|
||||
Var NameLang[2][1] = ""
|
||||
|
|
@ -1188,7 +1188,7 @@
|
|||
Var DescLang[2][5] = ""
|
||||
; end lang
|
||||
Var PD_STAGE_1 = "Disable2"
|
||||
Var PD_STAGE_2 = $51-05-02-0054.Button
|
||||
Var PD_STAGE_2 = $51-05-02-0077.Button
|
||||
Var PD_STAGE_3 = "Disable2"
|
||||
Var SelectCountDrinkType = 0
|
||||
Var DefaultDrinkType = 0
|
||||
|
|
@ -1205,7 +1205,7 @@
|
|||
Var DefaultDrinkType = 3
|
||||
EndIf
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Topping "Load" "51-05-02-0054"
|
||||
Topping "Load" "51-05-02-0077"
|
||||
Else
|
||||
If PD_STAGE_1 = "Enable" Then
|
||||
Topping "Load" "-"
|
||||
|
|
@ -1233,9 +1233,9 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<LanguageGroup>
|
||||
<LanguageSlot1>PEPSI BANANA</LanguageSlot1>
|
||||
<LanguageSlot1>PEPSI Max BANANA</LanguageSlot1>
|
||||
<LanguageSlot2>เป๊ปซี่กล้วย</LanguageSlot2>
|
||||
<LanguageSlot3>PEPSI BANANA</LanguageSlot3>
|
||||
<LanguageSlot3>PEPSI Max BANANA</LanguageSlot3>
|
||||
<LanguageSlot4>เป๊ปซี่กล้วย</LanguageSlot4>
|
||||
<LanguageSlot5></LanguageSlot5>
|
||||
<LanguageSlot6>เป๊ปซี่กล้วย</LanguageSlot6>
|
||||
|
|
@ -1249,9 +1249,9 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<LanguageGroup>
|
||||
<LanguageSlot1>Pepsi, Banana Syrup& Ice</LanguageSlot1>
|
||||
<LanguageSlot1>Pepsi Max, Banana Syrup& Ice</LanguageSlot1>
|
||||
<LanguageSlot2>เป๊ปซี่ น้ำเชื่อมกล้วย โซดา</LanguageSlot2>
|
||||
<LanguageSlot3>Pepsi, Banana Syrup& Ice</LanguageSlot3>
|
||||
<LanguageSlot3>Pepsi Max, Banana Syrup& Ice</LanguageSlot3>
|
||||
<LanguageSlot4>เป๊ปซี่ น้ำเชื่อมกล้วย โซดา</LanguageSlot4>
|
||||
<LanguageSlot5></LanguageSlot5>
|
||||
<LanguageSlot6>เป๊ปซี่ น้ำเชื่อมกล้วย โซดา</LanguageSlot6>
|
||||
|
|
@ -1285,7 +1285,7 @@
|
|||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
|
||||
<State> $51-05-02-0054.Button </State>
|
||||
<State> $51-05-02-0077.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 113 </X>
|
||||
|
|
@ -1295,8 +1295,8 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> $51-05-02-0054.Button </State>
|
||||
<Value> StringFmt( $51-05-02-0054.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
<State> $51-05-02-0077.Button </State>
|
||||
<Value> StringFmt( $51-05-02-0077.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 146 </X>
|
||||
|
|
@ -1339,9 +1339,9 @@
|
|||
<Y> 117 </Y>
|
||||
<State>
|
||||
eval(
|
||||
If $Sum5105020054 = "Disable" Then
|
||||
If $Sum5105020077 = "Disable" Then
|
||||
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
|
||||
STRCONTAIN "ERR" $51-05-02-0054.TAG tag2_is_disable
|
||||
STRCONTAIN "ERR" $51-05-02-0077.TAG tag2_is_disable
|
||||
STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
|
||||
Var return = "Invisible"
|
||||
If tag1_is_disable = "true" Then
|
||||
|
|
@ -1376,7 +1376,7 @@
|
|||
<Width>128</Width>
|
||||
<Height>64</Height>
|
||||
<Mode> "disable-show" </Mode>
|
||||
<State> $Sum5105020054 </State>
|
||||
<State> $Sum5105020077 </State>
|
||||
<Language>
|
||||
<ID> 000013 </ID>
|
||||
</Language>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue