Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
a1e5470449
5 changed files with 954 additions and 667 deletions
Binary file not shown.
|
After Width: | Height: | Size: 6.6 KiB |
BIN
inter/sgp/image/page_drink_n/bn_almost_dirty_normal_coffee.png
Normal file
BIN
inter/sgp/image/page_drink_n/bn_almost_dirty_normal_coffee.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 6.9 KiB |
|
|
@ -146,6 +146,8 @@
|
|||
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR 52-21-02-0071.Button
|
||||
|
||||
</EventOpen>
|
||||
|
||||
|
||||
|
|
@ -22938,6 +22940,291 @@
|
|||
</Language>
|
||||
<Align> center-vertical-horizontal </Align>
|
||||
</Text>
|
||||
</Block>
|
||||
; ==================> Len = 3
|
||||
; - 52-21-02-0071 -
|
||||
<Block>
|
||||
<MarginLeft> 33 </MarginLeft>
|
||||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 52-21-02-0071.Button,$Sum5221020071) </State>
|
||||
<Button>
|
||||
<State> $Sum5221020071 </State>
|
||||
<Filename> "ROOT/taobin_project/inter/sgp/image/page_drink_n//bn_almost_dirty_normal_coffee.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/sgp/image/page_drink_press_n//bn_almost_dirty_normal_coffee.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/inter/sgp/image/page_drink_disable_n2//bn_almost_dirty_normal_coffee.png" </FilenameDisable>
|
||||
<OverlayImage> xmlpro( 52-21-02-0071, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_catalog_6_posi1.png") </OverlayImage>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
Var PictureDrink = "ROOT/taobin_project/inter/sgp/image/page_drink_picture2_n/" + "bn_almost_dirty_normal_coffee.png"
|
||||
Var OpenFromXML = CurrentXMLFileName2
|
||||
Var PriceD1 = $-.Price
|
||||
Var PriceD2 = $52-21-02-0071.Price
|
||||
Var PriceD3 = $-.Price
|
||||
Var PD_CODE1 = "##-##-##-####"
|
||||
Var PD_CODE2 = "52-21-02-0071"
|
||||
Var PD_CODE3 = "##-##-##-####"
|
||||
; begin lang
|
||||
Var aliasName[0] = "ALMOST DIRTY"
|
||||
Var aliasDesc[0] = "Espresso, Caramel Syrup, Milk"
|
||||
Var aliasName[1] = "ALMOST DIRTY"
|
||||
Var aliasDesc[1] = "Espresso, Caramel Syrup, Milk"
|
||||
Var aliasName[2] = "-"
|
||||
Var aliasDesc[2] = "-"
|
||||
Var aliasName[3] = "-"
|
||||
Var aliasDesc[3] = "-"
|
||||
Var aliasName[4] = ""
|
||||
Var aliasDesc[4] = ""
|
||||
Var aliasName[5] = ""
|
||||
Var aliasDesc[5] = ""
|
||||
Var NameLang[0][0] = ""
|
||||
Var NameLang[0][1] = ""
|
||||
Var NameLang[0][2] = ""
|
||||
Var NameLang[0][3] = ""
|
||||
Var NameLang[0][4] = ""
|
||||
Var NameLang[0][5] = ""
|
||||
Var DescLang[0][0] = ""
|
||||
Var DescLang[0][1] = ""
|
||||
Var DescLang[0][2] = ""
|
||||
Var DescLang[0][3] = ""
|
||||
Var DescLang[0][4] = ""
|
||||
Var DescLang[0][5] = ""
|
||||
Var NameLang[1][0] = "Iced ALMOST DIRTY"
|
||||
Var NameLang[1][1] = ""
|
||||
Var NameLang[1][2] = ""
|
||||
Var NameLang[1][3] = ""
|
||||
Var NameLang[1][4] = ""
|
||||
Var NameLang[1][5] = ""
|
||||
Var DescLang[1][0] = "Espresso, Caramel Syrup, Milk"
|
||||
Var DescLang[1][1] = ""
|
||||
Var DescLang[1][2] = ""
|
||||
Var DescLang[1][3] = ""
|
||||
Var DescLang[1][4] = ""
|
||||
Var DescLang[1][5] = ""
|
||||
Var NameLang[2][0] = ""
|
||||
Var NameLang[2][1] = ""
|
||||
Var NameLang[2][2] = ""
|
||||
Var NameLang[2][3] = ""
|
||||
Var NameLang[2][4] = ""
|
||||
Var NameLang[2][5] = ""
|
||||
Var DescLang[2][0] = ""
|
||||
Var DescLang[2][1] = ""
|
||||
Var DescLang[2][2] = ""
|
||||
Var DescLang[2][3] = ""
|
||||
Var DescLang[2][4] = ""
|
||||
Var DescLang[2][5] = ""
|
||||
; end lang
|
||||
Var PD_STAGE_1 = "Disable2"
|
||||
Var PD_STAGE_2 = $52-21-02-0071.Button
|
||||
Var PD_STAGE_3 = "Disable2"
|
||||
Var SelectCountDrinkType = 0
|
||||
Var DefaultDrinkType = 0
|
||||
If PD_STAGE_1 = "Enable" Then
|
||||
Var SelectCountDrinkType = SelectCountDrinkType + 1
|
||||
Var DefaultDrinkType = 1
|
||||
EndIf
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Var SelectCountDrinkType = SelectCountDrinkType + 1
|
||||
Var DefaultDrinkType = 2
|
||||
EndIf
|
||||
If PD_STAGE_3 = "Enable" Then
|
||||
Var SelectCountDrinkType = SelectCountDrinkType + 1
|
||||
Var DefaultDrinkType = 3
|
||||
EndIf
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Topping "Load" "52-21-02-0071"
|
||||
Else
|
||||
If PD_STAGE_1 = "Enable" Then
|
||||
Topping "Load" "-"
|
||||
Else
|
||||
Topping "Load" "-"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR PD_STAGE_1
|
||||
DEBUGVAR PD_STAGE_2
|
||||
DEBUGVAR PD_STAGE_3
|
||||
Var SelectDrinkType = 0
|
||||
Var OverlayMenuFilter = ""
|
||||
Var OverlayMenuFilter1 = ""
|
||||
Var OverlayMenuFilter2 = ""
|
||||
Var OverlayMenuFilter3 = ""
|
||||
|
||||
If PD_STAGE_2 = "Enable" Then
|
||||
Var OverlayMenuFilter2 = "52-21-02-0071"
|
||||
Var OverlayMenuFilter2_Value !assigned xmlpro( 52-21-02-0071, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi1.png")
|
||||
DEBUGVAR OverlayMenuFilter2
|
||||
DEBUGVAR OverlayMenuFilter2_Value
|
||||
Else
|
||||
Var OverlayMenuFilter = ""
|
||||
EndIf
|
||||
Var OverlayMenuFilter = "xmlpro( 52-21-02-0071, "ROOT/taobin_project/inter/sgp/image/menu_overlay_set/gradeC/button_overlay_6_posi1.png")"
|
||||
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
|
||||
|
||||
</EventOnClick>
|
||||
</Button>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
<Y> 164 </Y>
|
||||
<Size> 22 </Size>
|
||||
<Width>222</Width>
|
||||
<Mode> "multi2" </Mode>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x322B26 </Color>
|
||||
<LanguageGroup>
|
||||
<LanguageSlot1>ALMOST DIRTY</LanguageSlot1>
|
||||
<LanguageSlot2>ALMOST DIRTY</LanguageSlot2>
|
||||
<LanguageSlot3>ALMOST DIRTY</LanguageSlot3>
|
||||
<LanguageSlot4>ALMOST DIRTY</LanguageSlot4>
|
||||
<LanguageSlot5></LanguageSlot5>
|
||||
<LanguageSlot6>ALMOST DIRTY</LanguageSlot6>
|
||||
</LanguageGroup>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 16 </X>
|
||||
<Y> 220 </Y>
|
||||
<Size> 14 </Size>
|
||||
<Width>222</Width>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<LanguageGroup>
|
||||
<LanguageSlot1>Espresso, Caramel Syrup, Milk</LanguageSlot1>
|
||||
<LanguageSlot2>Espresso, Caramel Syrup, Milk</LanguageSlot2>
|
||||
<LanguageSlot3>Espresso, Caramel Syrup, Milk</LanguageSlot3>
|
||||
<LanguageSlot4>Espresso, Caramel Syrup, Milk</LanguageSlot4>
|
||||
<LanguageSlot5></LanguageSlot5>
|
||||
<LanguageSlot6>Espresso, Caramel Syrup, Milk</LanguageSlot6>
|
||||
</LanguageGroup>
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 16 </X>
|
||||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
|
||||
</Image>
|
||||
<Image>
|
||||
<X> 16 </X>
|
||||
<Y> 264 </Y>
|
||||
<State> "Invisible" </State>
|
||||
<Filename> Var( DirImage2 + "hot.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> TextPriceMenuHotX </X>
|
||||
<Y> TextPriceMenuY </Y>
|
||||
<Size> TextPriceMenuSize </Size>
|
||||
<Width>220</Width>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> StringFmt( $-.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> $52-21-02-0071.Button </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 113 </X>
|
||||
<Y> TextPriceMenuY </Y>
|
||||
<Size> TextPriceMenuSize </Size>
|
||||
<Width>220</Width>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> $52-21-02-0071.Button </State>
|
||||
<Value> StringFmt( $52-21-02-0071.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 146 </X>
|
||||
<Y> 264 </Y>
|
||||
<Filename> Var( DirImage2 + "blend.png" ) </Filename>
|
||||
<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
|
||||
<State> "Invisible" </State>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> TextPriceMenuBlendX </X>
|
||||
<Y> TextPriceMenuY </Y>
|
||||
<Size> TextPriceMenuSize </Size>
|
||||
<Width>220</Width>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Color> 0x6F5F51 </Color>
|
||||
<ColorDisable> 0xEAE6E1 </ColorDisable>
|
||||
<State> "Invisible" </State>
|
||||
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
|
||||
</Text>
|
||||
<Image>
|
||||
<X> 81 </X>
|
||||
<Y> 264 </Y>
|
||||
<State>
|
||||
eval(
|
||||
If ICE_PROCESS_STATUS = 2 Then
|
||||
|
||||
Var ice_tab_process_show = "Invisible"
|
||||
|
||||
Else
|
||||
Var ice_tab_process_show = "Invisible"
|
||||
EndIf
|
||||
Var return = ice_tab_process_show
|
||||
)
|
||||
</State>
|
||||
<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
|
||||
</Image>
|
||||
<Image>
|
||||
<X> 49 </X>
|
||||
<Y> 117 </Y>
|
||||
<State>
|
||||
eval(
|
||||
If $Sum5221020071 = "Disable" Then
|
||||
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
|
||||
STRCONTAIN "ERR" $52-21-02-0071.TAG tag2_is_disable
|
||||
STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
|
||||
Var return = "Invisible"
|
||||
If tag1_is_disable = "true" Then
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
If tag2_is_disable = "true" Then
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
If tag3_is_disable = "true" Then
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
|
||||
</Image>
|
||||
<Text>
|
||||
<X> 84 </X>
|
||||
<Y> 266 </Y>
|
||||
<Size> 10 </Size>
|
||||
<Font> OpunMediumTTF </Font>
|
||||
<Color> 0xDE794E </Color>
|
||||
<State> ice_tab_process_show </State>
|
||||
<Value> ice_show_open </Value>
|
||||
</Text>
|
||||
<Text>
|
||||
<X> 48 </X>
|
||||
<Y> 116 </Y>
|
||||
<Size> 32 </Size>
|
||||
<Width>128</Width>
|
||||
<Height>64</Height>
|
||||
<Mode> "disable-show" </Mode>
|
||||
<State> $Sum5221020071 </State>
|
||||
<Language>
|
||||
<ID> 000013 </ID>
|
||||
</Language>
|
||||
<Align> center-vertical-horizontal </Align>
|
||||
</Text>
|
||||
</Block>
|
||||
</FrameScroll>
|
||||
; Cart
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue