Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
b06c62a90e
4 changed files with 2 additions and 1 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 25 KiB |
|
|
@ -831,6 +831,7 @@
|
|||
If InternationalEnable = 1 Then
|
||||
Var LanguageObjectShow = "Enable"
|
||||
Var NoLangObjectShow = "Invisible"
|
||||
Var XMLLiveInfoEnable = 0
|
||||
|
||||
If Not#LanguageResult = "false" Then
|
||||
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/ui/lang.tsv"
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@
|
|||
EndIf
|
||||
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
|
||||
;TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
|
||||
|
||||
; zone cup on arm
|
||||
If CupOnArm = "true" Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue