Merge remote-tracking branch 'origin/masterpiece' into th_mmr

This commit is contained in:
Ittipat Lusuk 2025-03-03 13:25:14 +07:00
commit 24666a89d3
689 changed files with 141788 additions and 152495 deletions

View file

@ -808,7 +808,7 @@
EndIf
Var FlagForProtectXMLOpenDouble = 0
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -821,7 +821,7 @@
Var Timeout = Timeout + 1
If Timeout > 5 Then
Var FlagForProtectXMLOpenDouble = 1
; process next page
Function 2
EndIf
@ -1017,11 +1017,12 @@
<FilenameDisable2> Var( DirImage + "/disable2_get15discount.png" )</FilenameDisable2>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventOnClick>
Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
</EventClick>
If FlagForProtectXMLOpenDouble = 0 Then
Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
EndIf
</EventOnClick>
</Button>
;<Text>