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

This commit is contained in:
Kenta420 2024-01-02 10:26:19 +07:00
commit 961eb8bba6
18 changed files with 662 additions and 104 deletions

View file

@ -3,6 +3,7 @@
<Height> 1920 </Height>
<EventOpen>
Var InstanceTabOpenFile11 = "ROOT/taobin_project/xml/menutab/start_up_inst_dummy.xml"
</EventOpen>
<Timeout> 10000 </Timeout>

View file

@ -3,6 +3,7 @@
<Height> 1920 </Height>
<EventOpen>
Var InstanceTabOpenFile13 = "ROOT/taobin_project/xml/menutab/start_up_inst_dummy.xml"
</EventOpen>
<Timeout> 10000 </Timeout>

View file

@ -0,0 +1,18 @@
<Popup>
<Width> 1080</Width>
<Height> 1920 </Height>
<EventOpen>
</EventOpen>
<Timeout> 60000 </Timeout>
<EventTimeout>
TimerReset
</EventTimeout>
</Popup>

View file

@ -269,6 +269,10 @@
If LanguageShow = "ENG" Then
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
EndIf
If LanguageShow = "MALAY" Then
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
EndIf
If LanguageShow = "THAI" Then
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"

View file

@ -114,6 +114,13 @@
EndIf
Var InstanceTabOpenFile7 = "ROOT/taobin_project/xml/menutab/page_catalog_group_other.xml"
Var InstanceTabOpenFile8 = "ROOT/taobin_project/xml/menutab/start_up_inst_dummy.xml"
Var InstanceTabOpenFile9 = "ROOT/taobin_project/xml/menutab/start_up_inst_dummy.xml"
Var InstanceTabOpenFile10 = "ROOT/taobin_project/xml/menutab/start_up_inst_dummy.xml"
Var InstanceTabOpenFile11 = "ROOT/taobin_project/xml/menutab/start_up_inst_dummy.xml"
Var InstanceTabOpenFile12 = "ROOT/taobin_project/xml/menutab/start_up_inst_dummy.xml"
Var InstanceTabOpenFile13 = "ROOT/taobin_project/xml/menutab/start_up_inst_dummy.xml"
TabMenuVisibleInst 99
EndIf