No merge. New gen py override
This commit is contained in:
commit
9462efba8f
3 changed files with 34 additions and 57 deletions
|
|
@ -3826,15 +3826,15 @@
|
|||
</Text>
|
||||
</Block>
|
||||
; ==================> Len = 3
|
||||
; 51-01-01-0036,- -,- -
|
||||
; 51-01-01-0036 - -
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 51-01-01-0036,-.Button,-,-.Button,Disable=Invisible,$Sum5101010036,,) </State>
|
||||
<State> Flag( 51-01-01-0036.Button,Disable=Invisible,$Sum5101010036) </State>
|
||||
<Button>
|
||||
<State> $Sum5101010036,, </State>
|
||||
<State> $Sum5101010036 </State>
|
||||
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_espresso_light_geisha.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_espresso_light_geisha.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_espresso_light_geisha.png" </FilenameDisable>
|
||||
|
|
@ -3843,11 +3843,11 @@
|
|||
<EventOnClick>
|
||||
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_espresso_light_geisha.png"
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $51-01-01-0036,-.Price
|
||||
Var PriceD2 = $-,-.Price
|
||||
Var PriceD1 = $51-01-01-0036.Price
|
||||
Var PriceD2 = $-.Price
|
||||
Var PriceD3 = $-.Price
|
||||
Var PD_CODE1 = "51-01-01-0036,-"
|
||||
Var PD_CODE2 = "-,-"
|
||||
Var PD_CODE1 = "51-01-01-0036"
|
||||
Var PD_CODE2 = "##-##-##-####"
|
||||
Var PD_CODE3 = "##-##-##-####"
|
||||
; begin lang
|
||||
Var aliasName[0] = "GEISHA ESPRESSO"
|
||||
|
|
@ -3860,16 +3860,16 @@
|
|||
Var aliasDesc[3] = "-"
|
||||
Var aliasName[4] = ""
|
||||
Var aliasDesc[4] = ""
|
||||
Var NameLang[0][0] = ""
|
||||
Var NameLang[0][1] = ""
|
||||
Var NameLang[0][0] = "GEISHA ESPRESSO"
|
||||
Var NameLang[0][1] = "เอสเพรสโซ่ช็อต GEISHA"
|
||||
Var NameLang[0][2] = ""
|
||||
Var NameLang[0][3] = ""
|
||||
Var NameLang[0][4] = ""
|
||||
Var DescLang[0][0] = ""
|
||||
Var DescLang[0][1] = ""
|
||||
Var NameLang[0][4] = "ESPRESSO GEISHA"
|
||||
Var DescLang[0][0] = "Light roast (natural process) Note: Floral & Tropical fruit"
|
||||
Var DescLang[0][1] = "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน"
|
||||
Var DescLang[0][2] = ""
|
||||
Var DescLang[0][3] = ""
|
||||
Var DescLang[0][4] = ""
|
||||
Var DescLang[0][4] = "Proses Semulajadi Panggang Ringan Aroma: Bungaan & Buah-buahan Tropika"
|
||||
Var NameLang[1][0] = ""
|
||||
Var NameLang[1][1] = ""
|
||||
Var NameLang[1][2] = ""
|
||||
|
|
@ -3891,8 +3891,8 @@
|
|||
Var DescLang[2][3] = ""
|
||||
Var DescLang[2][4] = ""
|
||||
; end lang
|
||||
Var PD_STAGE_1 = $51-01-01-0036,-.Button
|
||||
Var PD_STAGE_2 = $-,-.Button
|
||||
Var PD_STAGE_1 = $51-01-01-0036.Button
|
||||
Var PD_STAGE_2 = "Disable2"
|
||||
Var PD_STAGE_3 = "Disable2"
|
||||
Var SelectCountDrinkType = 0
|
||||
Var DefaultDrinkType = 0
|
||||
|
|
@ -3909,10 +3909,10 @@
|
|||
Var DefaultDrinkType = 3
|
||||
EndIf
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Topping "Load" "-,-"
|
||||
Topping "Load" "-"
|
||||
Else
|
||||
If PD_STAGE_1 = "Enable" Then
|
||||
Topping "Load" "51-01-01-0036,-"
|
||||
Topping "Load" "51-01-01-0036"
|
||||
Else
|
||||
Topping "Load" "-"
|
||||
EndIf
|
||||
|
|
@ -3969,7 +3969,7 @@
|
|||
<Image>
|
||||
<X> 16 </X>
|
||||
<Y> 264 </Y>
|
||||
<State> $51-01-01-0036,-.Button </State>
|
||||
<State> $51-01-01-0036.Button </State>
|
||||
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
|
||||
</Image>
|
||||
|
|
@ -3981,15 +3981,15 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> $51-01-01-0036,-.Button </State>
|
||||
<Value> StringFmt( $51-01-01-0036,-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
<State> $51-01-01-0036.Button </State>
|
||||
<Value> StringFmt( $51-01-01-0036.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 81 </X>
|
||||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "cold.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
|
||||
<State> $-,-.Button </State>
|
||||
<State> "Invisible" </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 113 </X>
|
||||
|
|
@ -3999,8 +3999,8 @@
|
|||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> $-,-.Button </State>
|
||||
<Value> StringFmt( $-,-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
<State> "Invisible" </State>
|
||||
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 146 </X>
|
||||
|
|
@ -4027,7 +4027,7 @@
|
|||
eval(
|
||||
If ICE_PROCESS_STATUS = 2 Then
|
||||
|
||||
If $Sum5101010036,, = "Disable" Then
|
||||
If $Sum5101010036 = "Disable" Then
|
||||
Var ice_tab_process_show = "Disable"
|
||||
Else
|
||||
Var ice_tab_process_show = "Enable"
|
||||
|
|
@ -4047,9 +4047,9 @@
|
|||
<Y> 117 </Y>
|
||||
<State>
|
||||
eval(
|
||||
If $Sum5101010036,, = "Disable" Then
|
||||
STRCONTAIN "ERR" $51-01-01-0036,-.TAG tag1_is_disable
|
||||
STRCONTAIN "ERR" $-,-.TAG tag2_is_disable
|
||||
If $Sum5101010036 = "Disable" Then
|
||||
STRCONTAIN "ERR" $51-01-01-0036.TAG tag1_is_disable
|
||||
STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
|
||||
STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
|
||||
Var return = "Invisible"
|
||||
If tag1_is_disable = "true" Then
|
||||
|
|
@ -4084,7 +4084,7 @@
|
|||
<Width>128</Width>
|
||||
<Height>64</Height>
|
||||
<Mode> "disable-show" </Mode>
|
||||
<State> $Sum5101010036,, </State>
|
||||
<State> $Sum5101010036 </State>
|
||||
<Language>
|
||||
<ID> 000013 </ID>
|
||||
</Language>
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@
|
|||
Var countClick = 0
|
||||
Var countClick2 = 0
|
||||
|
||||
Var CountryName = "Malaysia"
|
||||
Var CountryName = "Australia"
|
||||
|
||||
DEBUGVAR "MALAY Remove Cup"
|
||||
DEBUGVAR "AUS Remove Cup"
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/"
|
||||
|
||||
|
|
@ -134,32 +134,6 @@
|
|||
</Button>
|
||||
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 990 </X>
|
||||
<Y> 400 </Y>
|
||||
<State> show_eng_button_stage </State>
|
||||
<Filename> show_btn </Filename>
|
||||
<FilenamePress> show_btp </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
; eng
|
||||
If show_eng = "true" Then
|
||||
Var show_eng = "false"
|
||||
Else
|
||||
Var show_eng = "true"
|
||||
EndIf
|
||||
Open CurrentXMLFileName2
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<Text>
|
||||
<X> 5 </X>
|
||||
<Y> 1868 </Y>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue