Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
Pakin 2024-07-05 08:33:23 +07:00
commit 4e9fcc61b6
29 changed files with 16720 additions and 5425 deletions

View file

@ -12806,91 +12806,6 @@ LIMENADE SODA" </Value>
<Button>
<X> 42 </X>
<Y> 518 </Y>
<State> BigButtonEnable </State>
<Filename>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/cocoa77/cocoa77.png"
Else
Var return = "ROOT/taobin_project/image/event/cocoa77/cocoa77.png"
EndIf
)
</Filename>
<FilenamePress>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/cocoa77/cocoa77.png"
Else
Var return = "ROOT/taobin_project/image/event/cocoa77/cocoa77.png"
EndIf
)
</FilenamePress>
<FilenameDisable>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/cocoa77/cocoa77.png"
Else
Var return = "ROOT/taobin_project/image/event/cocoa77/cocoa77.png"
EndIf
)
</FilenameDisable>
<EventOnClick>
Open "ROOT/taobin_project/xml/page_catalog_group_pro_cocoa_77_ignore.xml"
</EventOnClick>
<Video>
<X> 42 </X>
<Y> 518 </Y>
<Width> 484 </Width>
<Height> 616 </Height>
<Loop> "true" </Loop>
<State>
eval(
If show_eng = "true" Then
Var return = "Invisible"
Else
Var return = "Enable"
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image/event/cocoa77/cocoa77.mp4" </Filename>
</Video>
<Video>
<X> 42 </X>
<Y> 518 </Y>
<Width> 484 </Width>
<Height> 616 </Height>
<State>
eval(
If show_eng = "true" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
)
</State>
<Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/image/event/cocoa77/cocoa77.mp4" </Filename>
</Video>
</Button>
<EventUnitTest1>
Var BigButtonEnable = "Enable"
Refresh
</EventUnitTest1>
<EventUnitTest2>
Var BigButtonEnable = "Invisible"
Refresh
</EventUnitTest2>
<Button>
<X> 780 </X>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,60 @@
<?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/xml/menu_catalog_default_init.xml"
Var Timeout = 0
Var FromWednesdayMelonPro = 0
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
If show_eng = "true" Then
Var extension = "_en.png"
Else
Var extension = ".png"
EndIf
</EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
;BigLogoLayout
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>
</Popup>

File diff suppressed because it is too large Load diff

View file

@ -578,7 +578,7 @@
Var block_index_override = 0
Var block_index_move = 0
</Script>
; menu_new_list 17
; menu_new_list 20
; ==================> Len = 17
; - 12-04-02-0001 -
<Block>

View file

@ -181,38 +181,73 @@ Else
Var showMultiAds = "true"
If InternationalEnable = 1 Then
Var video_menu_0 = "00"
Var video_menu2_1 = "00"
Var a_video_menu[0] = video_menu_0
Var a_video_menu[1] = video_menu_0
Var a_video_menu[2] = video_menu_0
Var a_video_menu[3] = video_menu_0
Var a_video_menu[4] = video_menu_0
Var a_video_menu[5] = video_menu_0
Var a_video_menu[6] = video_menu_0
Var a_video_menu[7] = video_menu_0
Var a_video_menu[8] = video_menu_0
Var a_video_menu[9] = video_menu_0
Var a_video_menu[10] = video_menu_0
Var a_video_menu[11] = video_menu_0
Var a_video_menu[12] = video_menu_0
Var a_video_menu[13] = video_menu_0
Var a_video_menu[14] = video_menu_0
Var a_video_menu[15] = video_menu_0
Var a_video_menu[16] = video_menu_0
Var a_video_menu[17] = video_menu_0
Var a_video_menu[18] = video_menu_0
Var a_video_menu[19] = video_menu_0
Var a_video_menu[20] = video_menu_0
Var a_video_menu[21] = video_menu_0
Var a_video_menu[22] = video_menu_0
Var a_video_menu[23] = video_menu_0
Var a_video_menu[24] = video_menu_0
Var a_video_menu[25] = video_menu_0
Var a_video_menu[26] = video_menu_0
Var a_video_menu[27] = video_menu_0
Var a_video_menu[28] = video_menu_0
Var a_video_menu[29] = video_menu_0
Else
SPLIT AdvertiseProfile "/" 1 a_video_menu[0]
SPLIT AdvertiseProfile "/" 2 a_video_menu[1]
SPLIT AdvertiseProfile "/" 3 a_video_menu[2]
SPLIT AdvertiseProfile "/" 4 a_video_menu[3]
SPLIT AdvertiseProfile "/" 5 a_video_menu[4]
SPLIT AdvertiseProfile "/" 6 a_video_menu[5]
SPLIT AdvertiseProfile "/" 7 a_video_menu[6]
SPLIT AdvertiseProfile "/" 8 a_video_menu[7]
SPLIT AdvertiseProfile "/" 9 a_video_menu[8]
SPLIT AdvertiseProfile "/" 10 a_video_menu[9]
SPLIT AdvertiseProfile "/" 11 a_video_menu[10]
SPLIT AdvertiseProfile "/" 12 a_video_menu[11]
SPLIT AdvertiseProfile "/" 13 a_video_menu[12]
SPLIT AdvertiseProfile "/" 14 a_video_menu[13]
SPLIT AdvertiseProfile "/" 15 a_video_menu[14]
SPLIT AdvertiseProfile "/" 16 a_video_menu[15]
SPLIT AdvertiseProfile "/" 17 a_video_menu[16]
SPLIT AdvertiseProfile "/" 18 a_video_menu[17]
SPLIT AdvertiseProfile "/" 19 a_video_menu[18]
SPLIT AdvertiseProfile "/" 20 a_video_menu[19]
SPLIT AdvertiseProfile "/" 21 a_video_menu[20]
SPLIT AdvertiseProfile "/" 22 a_video_menu[21]
SPLIT AdvertiseProfile "/" 23 a_video_menu[22]
SPLIT AdvertiseProfile "/" 24 a_video_menu[23]
SPLIT AdvertiseProfile "/" 25 a_video_menu[24]
SPLIT AdvertiseProfile "/" 26 a_video_menu[25]
SPLIT AdvertiseProfile "/" 27 a_video_menu[26]
SPLIT AdvertiseProfile "/" 28 a_video_menu[27]
SPLIT AdvertiseProfile "/" 29 a_video_menu[28]
SPLIT AdvertiseProfile "/" 30 a_video_menu[29]
EndIf
SPLIT AdvertiseProfile "/" 1 a_video_menu[0]
SPLIT AdvertiseProfile "/" 2 a_video_menu[1]
SPLIT AdvertiseProfile "/" 3 a_video_menu[2]
SPLIT AdvertiseProfile "/" 4 a_video_menu[3]
SPLIT AdvertiseProfile "/" 5 a_video_menu[4]
SPLIT AdvertiseProfile "/" 6 a_video_menu[5]
SPLIT AdvertiseProfile "/" 7 a_video_menu[6]
SPLIT AdvertiseProfile "/" 8 a_video_menu[7]
SPLIT AdvertiseProfile "/" 9 a_video_menu[8]
SPLIT AdvertiseProfile "/" 10 a_video_menu[9]
SPLIT AdvertiseProfile "/" 11 a_video_menu[10]
SPLIT AdvertiseProfile "/" 12 a_video_menu[11]
SPLIT AdvertiseProfile "/" 13 a_video_menu[12]
SPLIT AdvertiseProfile "/" 14 a_video_menu[13]
SPLIT AdvertiseProfile "/" 15 a_video_menu[14]
SPLIT AdvertiseProfile "/" 16 a_video_menu[15]
SPLIT AdvertiseProfile "/" 17 a_video_menu[16]
SPLIT AdvertiseProfile "/" 18 a_video_menu[17]
SPLIT AdvertiseProfile "/" 19 a_video_menu[18]
SPLIT AdvertiseProfile "/" 20 a_video_menu[19]
SPLIT AdvertiseProfile "/" 21 a_video_menu[20]
SPLIT AdvertiseProfile "/" 22 a_video_menu[21]
SPLIT AdvertiseProfile "/" 23 a_video_menu[22]
SPLIT AdvertiseProfile "/" 24 a_video_menu[23]
SPLIT AdvertiseProfile "/" 25 a_video_menu[24]
SPLIT AdvertiseProfile "/" 26 a_video_menu[25]
SPLIT AdvertiseProfile "/" 27 a_video_menu[26]
SPLIT AdvertiseProfile "/" 28 a_video_menu[27]
SPLIT AdvertiseProfile "/" 29 a_video_menu[28]
SPLIT AdvertiseProfile "/" 30 a_video_menu[29]
DEBUGVAR a_video_menu[12]
DEBUGVAR a_video_menu[18]

View file

@ -159,9 +159,7 @@
EndIf
; move to TRY actoin.
Var RoadShow = "false"
TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev"
@ -1112,6 +1110,11 @@
DEBUGVAR CLOSE_ORDER_NOW
; move to TRY actoin.
; Move to end of EventOpen for override war
Var RoadShow = "false"
TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev"
</EventOpen>
<EventActionOk>

View file

@ -1120,6 +1120,7 @@
Var SeekerTmp = "next"
Var TelephoneNumber = SeekerTmp.TNumberTaobinCredit
Var PayCredit = 1
Else
Var topupCreditWithCash = "Enable"
@ -1127,12 +1128,13 @@
Var TelephoneNumber = SeekerTmp.TNumberTaobinCredit
CoinPause
Var PayCredit = 0
EndIf
SAVELOG "User click topup-credit button"
Var Seeker = "topupCredit"
Var PayCredit = 0
If TelephoneNumber = "" Then
Open "ROOT/taobin_project/xml/page_topup_credit.xml"

View file

@ -85,7 +85,7 @@
DEBUGVAR MachineStage
Var PayReference = ""
Var PayType = ""
Var PayType = "newpay"
Var SelectDrink = Seeker.selected_a_drink

View file

@ -226,6 +226,8 @@
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev"
; zone cup on arm
If CupOnArm = "true" Then

File diff suppressed because it is too large Load diff

View file

@ -1,32 +1,32 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
; soda and other
Var Menu62Selected = "PressForever"
SAVELOG PreviseXMLFileName2
Var Timeout = 0
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
</EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
; soda and other
Var Menu62Selected = "PressForever"
SAVELOG PreviseXMLFileName2
Var Timeout = 0
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
</EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
<FrameScroll>
<X> 10 </X>
<Y> 497 </Y>
@ -893,7 +893,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "เครื่องดื่มเต่าทรงพลัง โซดา
<Value> "เครื่องดื่มเต่าทรงพลัง โซดา
(มีคาเฟอีน)" </Value>
</Text>
<Text>
@ -905,7 +905,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "TAO POWER
<Value> "TAO POWER
DRINK SODA" </Value>
</Text>
<Text>
@ -1146,7 +1146,7 @@ DRINK SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "น้ำเชื่อมเมล่อน โซดา
<Value> "น้ำเชื่อมเมล่อน โซดา
และน้ำแข็ง" </Value>
</Text>
<Text>
@ -1398,7 +1398,7 @@ DRINK SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "น้ำเชื่อมยูซุ โซดา
<Value> "น้ำเชื่อมยูซุ โซดา
และน้ำแข็ง" </Value>
</Text>
<Text>
@ -1661,7 +1661,7 @@ DRINK SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "LIMENADE
<Value> "LIMENADE
SODA" </Value>
</Text>
<Text>
@ -2153,7 +2153,7 @@ SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "น้ำเชื่อมลิ้นจี่ มะนาว
<Value> "น้ำเชื่อมลิ้นจี่ มะนาว
โซดา " </Value>
</Text>
<Text>
@ -2165,7 +2165,7 @@ SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "LYCHEE
<Value> "LYCHEE
LIMENADE SODA" </Value>
</Text>
<Text>
@ -2176,7 +2176,7 @@ LIMENADE SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Lychee Syrup,
<Value> "Lychee Syrup,
Limenade, Soda & Ice" </Value>
</Text>
<Image>
@ -3171,7 +3171,7 @@ Limenade, Soda & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "LIME
<Value> "LIME
SALAK SODA" </Value>
</Text>
<Text>
@ -3182,7 +3182,7 @@ SALAK SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Salak Syrup, Limenade,
<Value> "Salak Syrup, Limenade,
Soda & Ice" </Value>
</Text>
<Image>
@ -3675,7 +3675,7 @@ Soda & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "PLUM
<Value> "PLUM
LIMENADE SODA" </Value>
</Text>
<Text>
@ -3686,7 +3686,7 @@ LIMENADE SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Ume Syrup, Limenade,
<Value> "Ume Syrup, Limenade,
Soda & Ice" </Value>
</Text>
<Image>
@ -7191,7 +7191,7 @@ Soda & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "GINGER LIME
<Value> "GINGER LIME
SODA" </Value>
</Text>
<Text>
@ -7694,7 +7694,7 @@ SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "GINGER LIME
<Value> "GINGER LIME
SODA" </Value>
</Text>
<Text>
@ -8176,7 +8176,7 @@ SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "สตรอเบอร์รี่
<Value> "สตรอเบอร์รี่
มินต์โซดา" </Value>
</Text>
<Text>
@ -8198,7 +8198,7 @@ SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "STRAWBERRY
<Value> "STRAWBERRY
MINT SODA" </Value>
</Text>
<Text>
@ -8680,7 +8680,7 @@ MINT SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "บ๊วยมะนาว
<Value> "บ๊วยมะนาว
มินต์โซดา" </Value>
</Text>
<Text>
@ -8702,7 +8702,7 @@ MINT SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "PLUM LIMENADE
<Value> "PLUM LIMENADE
MINT SODA" </Value>
</Text>
<Text>
@ -8933,7 +8933,7 @@ MINT SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "มินต์ลิ้นจี่
<Value> "มินต์ลิ้นจี่
มะนาวโซดา" </Value>
</Text>
<Text>
@ -8955,7 +8955,7 @@ MINT SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "MINT LYCHEE
<Value> "MINT LYCHEE
LEMON SODA" </Value>
</Text>
<Text>
@ -12198,7 +12198,7 @@ LEMON SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "มะพร้าวน้ำหอม
<Value> "มะพร้าวน้ำหอม
ลิ้นจี่โซดา" </Value>
</Text>
<Text>
@ -12220,7 +12220,7 @@ LEMON SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Coconut
<Value> "Coconut
Lychee Soda" </Value>
</Text>
<Text>
@ -12963,7 +12963,7 @@ Lychee Soda" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "เครื่องดื่มเต่าทรงพลัง
<Value> "เครื่องดื่มเต่าทรงพลัง
(มีคาเฟอีน)" </Value>
</Text>
<Text>
@ -13215,7 +13215,7 @@ Lychee Soda" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "น้ำแดงกลิ่นสละ น้ำมะนาว
<Value> "น้ำแดงกลิ่นสละ น้ำมะนาว
" </Value>
</Text>
<Text>
@ -13237,7 +13237,7 @@ Lychee Soda" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Salak Syrup, Limenade,
<Value> "Salak Syrup, Limenade,
Water & Ice" </Value>
</Text>
<Image>
@ -13489,7 +13489,7 @@ Water & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Lychee Syrup, Sugar,
<Value> "Lychee Syrup, Sugar,
Water & Ice" </Value>
</Text>
<Image>
@ -13720,7 +13720,7 @@ Water & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "น้ำแดงกลิ่นสละ
<Value> "น้ำแดงกลิ่นสละ
" </Value>
</Text>
<Text>
@ -13972,7 +13972,7 @@ Water & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "น้ำเชื่อมสตอเบอร์รี่ น้ำ
<Value> "น้ำเชื่อมสตอเบอร์รี่ น้ำ
" </Value>
</Text>
<Text>
@ -13994,7 +13994,7 @@ Water & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Strawberry Syrup,
<Value> "Strawberry Syrup,
Water & Ice" </Value>
</Text>
<Image>
@ -14752,7 +14752,7 @@ Water & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Lychee Syrup, Sugar,
<Value> "Lychee Syrup, Sugar,
Water & Ice" </Value>
</Text>
<Image>
@ -15004,7 +15004,7 @@ Water & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Strawberry Syrup,
<Value> "Strawberry Syrup,
Water, Ice" </Value>
</Text>
<Image>
@ -15496,7 +15496,7 @@ Water, Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "CONGEE WITH
<Value> "CONGEE WITH
PLANT PROTEIN" </Value>
</Text>
<Text>
@ -16666,7 +16666,7 @@ PLANT PROTEIN" </Value>
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>
</Popup>
</Popup>

File diff suppressed because it is too large Load diff

View file

@ -44,7 +44,7 @@
Var block_index_override = 0
Var block_index_move = 0
</Script>
; menu_new_list 17
; menu_new_list 20
; ==================> Len = 17
; - 12-04-02-0001 -
<Block>