Merge remote-tracking branch 'origin/masterpiece' into th_mmr
This commit is contained in:
commit
020098b2af
457 changed files with 95264 additions and 50614 deletions
|
|
@ -158,6 +158,8 @@
|
|||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR Seeker
|
||||
|
||||
If Seeker = "next" Then
|
||||
Var ShowButtonClick2 = "Invisible"
|
||||
Var ButtontoTopupMenu = "Invisible"
|
||||
|
|
@ -214,6 +216,14 @@
|
|||
Var SelectedMenu = ""
|
||||
Var MultiProcess = "Invisible"
|
||||
|
||||
; setvar SpiralOnline true
|
||||
Var ButtonSpiralStage = "Invisible"
|
||||
If SpiralOnline = "true" Then
|
||||
Var ButtonSpiralStage = "Enable
|
||||
EndIf
|
||||
|
||||
DEBUGVAR SpiralOnline
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
@ -489,39 +499,75 @@
|
|||
|
||||
|
||||
|
||||
; menu row 1
|
||||
<Button>
|
||||
<X> 220 </X>
|
||||
<Y> 844 </Y>
|
||||
<Filename> Var(DirImage + "/bn_diy.png") </Filename>
|
||||
<FilenamePress> Var(DirImage + "/bp_diy.png") </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
Var OpenFromMulti = 1
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
|
||||
RootLayoutVisible 3 "hide"
|
||||
RootLayoutVisible 13 "hide"
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000003 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 202 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 564 </X>
|
||||
<FrameScroll>
|
||||
<X> 1 </X>
|
||||
<Y> 844 </Y>
|
||||
<Filename> Var(DirImage + "/bn_coffee.png") </Filename>
|
||||
<FilenamePress> Var(DirImage + "/bp_coffee.png") </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<Width> 1080 </Width>
|
||||
<ScrollHeight> "auto" </ScrollHeight>
|
||||
<Scroll> "Vertical" </Scroll>
|
||||
<Column> 3 </Column>
|
||||
<Mode> "EnableAdjust" </Mode>
|
||||
<Script>
|
||||
Var block_index_override = 0
|
||||
Var block_index_move = 0
|
||||
If ButtonSpiralStage = "Invisible" Then
|
||||
Var ColumnOverride[0] = 2
|
||||
Else
|
||||
Var ColumnOverride[0] = 3
|
||||
EndIf
|
||||
|
||||
Var ColumnOverride[1] = 3
|
||||
Var ColumnOverride[2] = 3
|
||||
Var ColumnOverride[3] = 3
|
||||
|
||||
Var ColumnGravity[0] = 2
|
||||
Var ColumnGravity[1] = 2
|
||||
Var ColumnGravity[2] = 2
|
||||
Var ColumnGravity[3] = 2
|
||||
|
||||
</Script>
|
||||
<Block>
|
||||
<Width> 296 </Width>
|
||||
<Height> 344 </Height>
|
||||
<MarginLeft> 42 </MarginLeft>
|
||||
<State> "Enable" </State>
|
||||
; menu row 1
|
||||
<Button>
|
||||
<Filename> Var(DirImage + "/bn_diy.png") </Filename>
|
||||
<FilenamePress> Var(DirImage + "/bp_diy.png") </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
|
||||
<EventClick>
|
||||
|
||||
Var OpenFromMulti = 1
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
|
||||
RootLayoutVisible 3 "hide"
|
||||
RootLayoutVisible 13 "hide"
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000003 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 202 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
</Block>
|
||||
|
||||
<Block>
|
||||
<Width> 296 </Width>
|
||||
<Height> 344 </Height>
|
||||
<MarginLeft> 42 </MarginLeft>
|
||||
<State> "Enable" </State>
|
||||
<Button>
|
||||
<Filename> Var(DirImage + "/bn_coffee.png") </Filename>
|
||||
<FilenamePress> Var(DirImage + "/bp_coffee.png") </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
If Inst5MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
|
|
@ -533,25 +579,65 @@
|
|||
Var SelectedMenu = "coffee"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000005 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 202 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000005 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 202 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
</Block>
|
||||
|
||||
; menu row 2
|
||||
<Button>
|
||||
<X> 47 </X>
|
||||
<Y> 1188 </Y>
|
||||
<Filename> Var(DirImage + "/bn_tea.png") </Filename>
|
||||
<FilenamePress> Var(DirImage + "/bp_tea.png") </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<Block>
|
||||
<Width> 296 </Width>
|
||||
<Height> 344 </Height>
|
||||
<MarginLeft> 42 </MarginLeft>
|
||||
<State> ButtonSpiralStage </State>
|
||||
; menu row 1
|
||||
<Button>
|
||||
<Filename> Var(DirImage + "/bn_vending_machine.png") </Filename>
|
||||
<FilenamePress> Var(DirImage + "/bp_vending_machine.png") </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
If LanguageShow = "THAI" Then
|
||||
Var show_eng = "false"
|
||||
Else
|
||||
Var show_eng = "true"
|
||||
EndIf
|
||||
|
||||
RootLayoutVisible 3 "hide"
|
||||
RootLayoutVisible 13 "hide"
|
||||
|
||||
; eng
|
||||
Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml"
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000004 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 202 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
</Block>
|
||||
|
||||
<Block>
|
||||
<Width> 296 </Width>
|
||||
<Height> 344 </Height>
|
||||
<MarginLeft> 42 </MarginLeft>
|
||||
<State> "Enable" </State>
|
||||
; menu row 2
|
||||
<Button>
|
||||
<Filename> Var(DirImage + "/bn_tea.png") </Filename>
|
||||
<FilenamePress> Var(DirImage + "/bp_tea.png") </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
If Inst6MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
|
|
@ -564,24 +650,28 @@
|
|||
Var SelectedMenu = "tea"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000006 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 193 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000006 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 193 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
</Block>
|
||||
|
||||
<Button>
|
||||
<X> 391 </X>
|
||||
<Y> 1188 </Y>
|
||||
<Filename> Var(DirImage + "/bn_cho_caramel.png") </Filename>
|
||||
<FilenamePress> Var(DirImage + "/bp_cho_caramel.png") </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<Block>
|
||||
<Width> 296 </Width>
|
||||
<Height> 344 </Height>
|
||||
<MarginLeft> 42 </MarginLeft>
|
||||
<State> "Enable" </State>
|
||||
<Button>
|
||||
<Filename> Var(DirImage + "/bn_cho_caramel.png") </Filename>
|
||||
<FilenamePress> Var(DirImage + "/bp_cho_caramel.png") </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
If Inst7MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
|
|
@ -604,15 +694,17 @@
|
|||
</Button>
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 392 </X>
|
||||
<Y> 1532 </Y>
|
||||
<State>MenuKidButtonState</State>
|
||||
<Filename> Var(DirImage + "/bn_kidmenu.png") </Filename>
|
||||
<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<Block>
|
||||
<Width> 296 </Width>
|
||||
<Height> 344 </Height>
|
||||
<MarginLeft> 42 </MarginLeft>
|
||||
<State> "Enable" </State>
|
||||
<Button>
|
||||
<Filename> bnSodaAndOther </Filename>
|
||||
<FilenamePress> bpSodaAndOther </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
If Inst8MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
|
|
@ -654,25 +746,31 @@
|
|||
Var SelectedMenu = "appfast"
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000012 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 211 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 72 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
</EventClick>
|
||||
<Language>
|
||||
<ID> 000025 </ID>
|
||||
<X> 28 </X>
|
||||
<Y> 202 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 82 </Height>
|
||||
</Language>
|
||||
</Button>
|
||||
</Block>
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 748 </X>
|
||||
<Y> 1188 </Y>
|
||||
<Filename> bnSodaAndOther </Filename>
|
||||
<FilenamePress> bpSodaAndOther </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
<Block>
|
||||
<Width> 296 </Width>
|
||||
<Height> 344 </Height>
|
||||
<MarginLeft> 42 </MarginLeft>
|
||||
<State>MenuKidButtonState</State>
|
||||
<Button>
|
||||
<State>MenuKidButtonState</State>
|
||||
<Filename> Var(DirImage + "/bn_kidmenu.png") </Filename>
|
||||
<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
If Inst11MenuLoaded = "done" Then
|
||||
Var MultiProcess = "Invisible"
|
||||
|
|
@ -879,25 +977,6 @@
|
|||
<Value> ShowNetworkProblemText </Value>
|
||||
</Text>
|
||||
|
||||
; Cart
|
||||
<Button>
|
||||
<X> 915 </X>
|
||||
<Y> 1769 </Y>
|
||||
<State> showCart </State>
|
||||
<Filename> cart_image_bn </Filename>
|
||||
<Filename> cart_image_bp </Filename>
|
||||
<FilenamePress> cart_image_bp </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<Interval> 400</Interval>
|
||||
<EventClick>
|
||||
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<EventWebApp>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue