Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
wanlop run 2025-02-27 11:11:02 +07:00
commit 661b9eb661
30 changed files with 7408 additions and 135 deletions

View file

@ -1,3 +1,3 @@
normal_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st_extended.png
press_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st_extended.png
disable_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st_extended.png
normal_eng=ROOT/taobin_project/inter/aus/image/event/st_patrick_banner.png
press_eng=ROOT/taobin_project/inter/aus/image/event/st_patrick_banner.png
disable_eng=ROOT/taobin_project/inter/aus/image/event/st_patrick_banner.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -1 +1 @@
/event/promotion_anniversary_1st.lxml
/event/promotion_st_patrick_day.lxml

View file

@ -1 +1 @@
; Do nothing
Open "ROOT/taobin_project/inter/aus/xml/page_catalog_group_pro_st_patrick.lxml"

File diff suppressed because it is too large Load diff

View file

@ -10,6 +10,10 @@ If ValentinePro = 1 Then
Var RecommendPage = "ROOT/taobin_project/inter/aus/xml/event/promotion_valentine.lxml"
EndIf
If StPatrickDayPro = 1 Then
Var RecommendPage = "ROOT/taobin_project/inter/aus/xml/event/promotion_st_patrick_day.lxml"
EndIf
If OpenFromPageBoard = 1 Then
OpenInst 2 RecommendPage
Else

View file

@ -12,11 +12,16 @@ Var GameEnableFromTrickerEv = 0
Var NewCollectPointFlag = 1
Var ValentinePro = 0
Var StPatrickDayPro = 0
If SystemDateMonthInt = 2 Then
Var ValentinePro = 1
EndIf
If SystemDateMonthInt = 3 Then
Var StPatrickDayPro = 1
EndIf
Var XMLLiveInfoEnable = 1
DEBUGVAR Propepsi99Enable

View file

@ -12589,13 +12589,13 @@
<State> Flag( 51-01-01-0004.Button,51-01-02-0002.Button,51-01-03-0002.Button,$Sum510101000451010200025101030002) </State>
<Button>
<State> $Sum510101000451010200025101030002 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-01-01-0004.Price
Var PriceD2 = $51-01-02-0002.Price
@ -12863,13 +12863,13 @@
<State> Flag( 51-21-01-0004.Button,51-21-02-0002.Button,51-21-03-0002.Button,$Sum512101000451210200025121030002) </State>
<Button>
<State> $Sum512101000451210200025121030002 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-21-01-0004.Price
Var PriceD2 = $51-21-02-0002.Price
@ -13685,13 +13685,13 @@
<State> Flag( 51-01-01-0006.Button,51-01-02-0003.Button,51-01-03-0003.Button,$Sum510101000651010200035101030003) </State>
<Button>
<State> $Sum510101000651010200035101030003 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-01-01-0006.Price
Var PriceD2 = $51-01-02-0003.Price
@ -13959,13 +13959,13 @@
<State> Flag( 51-21-01-0006.Button,51-21-02-0003.Button,51-21-03-0003.Button,$Sum512101000651210200035121030003) </State>
<Button>
<State> $Sum512101000651210200035121030003 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-21-01-0006.Price
Var PriceD2 = $51-21-02-0003.Price
@ -14507,13 +14507,13 @@
<State> Flag( 51-01-01-0007.Button,51-01-02-0004.Button,51-01-03-0004.Button,$Sum510101000751010200045101030004) </State>
<Button>
<State> $Sum510101000751010200045101030004 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-01-01-0007.Price
Var PriceD2 = $51-01-02-0004.Price
@ -14781,13 +14781,13 @@
<State> Flag( 51-21-01-0007.Button,51-21-02-0004.Button,51-21-03-0004.Button,$Sum512101000751210200045121030004) </State>
<Button>
<State> $Sum512101000751210200045121030004 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-21-01-0007.Price
Var PriceD2 = $51-21-02-0004.Price

View file

@ -4955,13 +4955,13 @@
<State> Flag( 51-01-01-0004.Button,$Sum5101010004) </State>
<Button>
<State> $Sum5101010004 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-01-01-0004.Price
Var PriceD2 = $-.Price
@ -5229,13 +5229,13 @@
<State> Flag( 51-21-01-0004.Button,$Sum5121010004) </State>
<Button>
<State> $Sum5121010004 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-21-01-0004.Price
Var PriceD2 = $-.Price
@ -5503,13 +5503,13 @@
<State> Flag( 51-01-01-0006.Button,$Sum5101010006) </State>
<Button>
<State> $Sum5101010006 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-01-01-0006.Price
Var PriceD2 = $-.Price
@ -5777,13 +5777,13 @@
<State> Flag( 51-21-01-0006.Button,$Sum5121010006) </State>
<Button>
<State> $Sum5121010006 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-21-01-0006.Price
Var PriceD2 = $-.Price
@ -6325,13 +6325,13 @@
<State> Flag( 51-01-01-0007.Button,$Sum5101010007) </State>
<Button>
<State> $Sum5101010007 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-01-01-0007.Price
Var PriceD2 = $-.Price
@ -6599,13 +6599,13 @@
<State> Flag( 51-21-01-0007.Button,$Sum5121010007) </State>
<Button>
<State> $Sum5121010007 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-21-01-0007.Price
Var PriceD2 = $-.Price

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,40 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml"
SAVELOG PreviseXMLFileName2
Var Timeout = 0
;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml"
</EventOpen>
;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml"
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
</Popup>

View file

@ -2507,13 +2507,13 @@
<State> Flag( 51-01-01-0007.Button,51-01-02-0004.Button,51-01-03-0004.Button,Disable=Invisible,$Sum510101000751010200045101030004) </State>
<Button>
<State> $Sum510101000751010200045101030004 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-01-01-0007.Price
Var PriceD2 = $51-01-02-0004.Price
@ -2781,13 +2781,13 @@
<State> Flag( 51-21-01-0007.Button,51-21-02-0004.Button,51-21-03-0004.Button,Disable=Invisible,$Sum512101000751210200045121030004) </State>
<Button>
<State> $Sum512101000751210200045121030004 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-21-01-0007.Price
Var PriceD2 = $51-21-02-0004.Price

View file

@ -2482,13 +2482,13 @@
<State> Flag( 51-01-01-0007.Button,51-01-02-0004.Button,51-01-03-0004.Button,$Sum510101000751010200045101030004) </State>
<Button>
<State> $Sum510101000751010200045101030004 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-01-01-0007.Price
Var PriceD2 = $51-01-02-0004.Price
@ -2756,13 +2756,13 @@
<State> Flag( 51-21-01-0007.Button,51-21-02-0004.Button,51-21-03-0004.Button,$Sum512101000751210200045121030004) </State>
<Button>
<State> $Sum512101000751210200045121030004 </State>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $51-21-01-0007.Price
Var PriceD2 = $51-21-02-0004.Price

View file

@ -204,10 +204,6 @@
Var VendingTSID = ""
EndIf
If Seeker.VendingCode = "MKFOO" Then
Var AddData = 0
EndIf
If GetFreeFromError = 1 Then
;Var GetFreeFromError = 0
@ -306,11 +302,6 @@
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
EndIf
If Seeker.CreditCard = 1 Then
Var SelectMenuBetweenBrewEnable1Blink = "Enable"
Var SelectMenuBetweenBrewEnable1 = "Enable"
EndIf
If NeedUpgrade = "true" Then
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
Var SelectMenuBetweenBrewEnable1 = "Invisible"
@ -321,9 +312,6 @@
Var SelectMenuBetweenBrewEnable1 = "Invisible"
EndIf
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
Var SelectMenuBetweenBrewEnable1 = "Invisible"
DEBUGVAR NeedUpgrade
DEBUGVAR NeedReboot
@ -444,8 +432,6 @@
Var XPercent = 0
EndIf
CashlessReq SUCCESS ""
</EventOpen>
<EventLanguageOnChange>
Var XPosiShowCountDownBrew = 768

View file

@ -130,33 +130,6 @@
Var VendingTSIDTmp1 = ""
EndIf
If Seeker.VendingCode = "MKFOO" Then
Var AddData = 0
EndIf
If MyMintEnable = 1 Then
If FromMyMintPro = 1 Then
Var AddData = 0
EndIf
EndIf
If ProBadValentineEnable = 1 Then
If FromBadValentinePro = 1 Then
Var AddData = 0
EndIf
EndIf
If LipitPro = 1 Then
If FromLipitPro = 1 Then
If Seeker.CodeChannel = 1 Then
If Seeker.CollectPointMain = 1 Then
Else
Var AddData = 0
EndIf
EndIf
EndIf
EndIf
If LedLidBlink = "true" Then
Var LedLidBlink = "no"
LED LedDoorLid Blink 255 255 255 255
@ -178,10 +151,6 @@
Var StrawStateX = "Invisible"
Var LidStateX = "Invisible"
If Seeker.CreditCard = 1 Then
Var EnableSelectMenuBetweenBrew = "Invisible"
EndIf
Var CreditCardVoid = 0
DEBUGVAR ButtonGameCountDownState

View file

@ -2128,8 +2128,7 @@
<Button>
<X> 680 </X>
<Y> 79 </Y>
;<State> SugarState5 </State>
<State> "Invisible" </State>
<State> SugarState5 </State>
<Filename> SugarNormalPicLv5 </Filename>
<FilenamePress> SugarPressPicLv5 </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg5.png" </FilenameDisable>
@ -2183,8 +2182,7 @@
<Button>
<X> 820 </X>
<Y> 79 </Y>
;<State> SugarState6 </State>
<State> "Invisible" </State>
<State> SugarState6 </State>
<Filename> SugarNormalPicLv6 </Filename>
<FilenamePress> SugarPressPicLv6 </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg6.png" </FilenameDisable>