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

This commit is contained in:
wanlop run 2025-05-14 18:16:19 +07:00
commit b11e33eb57
16 changed files with 126 additions and 76 deletions

View file

@ -89,7 +89,7 @@ Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fr
;Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"

View file

@ -13,7 +13,7 @@
; On open
; helper
RootLayoutVisible 15 "hide"
RootLayoutVisible 14 "hide"
Machine WakeUp
@ -277,7 +277,7 @@
DEBUGVAR SpiralOnline
RootLayoutVisible 13 "hide"
RootLayoutVisible 15 "hide"
</EventOpen>
@ -532,6 +532,10 @@
Play PlaySoundLag
Var countDownRetrun = 120
Var ButtonLanguageCurrentXPosition = 1015
Var ButtonLanguageCurrentYPosition = 458 - 38
Var ButtonLanguageListXPosition = 982
Var ButtonLanguageListYPosition = 450 - 38
Var LanguageButtonEnable = "Enable"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
@ -717,7 +721,7 @@
EndIf
RootLayoutVisible 3 "hide"
RootLayoutVisible 13 "hide"
RootLayoutVisible 15 "hide"
; eng
Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml"
@ -1043,7 +1047,7 @@
<Button>
<X> 225 </X>
<Y> 424 </Y>
<State> ShowButtonClick2 </State>
<State> "Enable" </State>
<Filename> Var(DirImage + "/bn_main_page_member.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_main_page_member.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -1067,7 +1071,7 @@
<Button>
<X> 696 </X>
<Y> 424 </Y>
<State> ButtontoTopupMenu </State>
<State> "Enable" </State>
<Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
<FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
<FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>

View file

@ -1,6 +1,13 @@
Var InstanceTabOpenFile10 = "ROOT/taobin_project/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml"
Var ButtonLanguageCurrentXPosition = 1015
Var ButtonLanguageCurrentYPosition = 458 - 38
Var ButtonLanguageListXPosition = 990
Var ButtonLanguageListYPosition = 450 - 38
Var LanguageButtonEnable = "Enable"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
TabMenuVisibleInst 10
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"