Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
f0e65c461d
2 changed files with 7 additions and 1 deletions
|
|
@ -79,6 +79,12 @@ If SystemDateMonthInt = 12 Then
|
|||
Var MyMintEnable = 1
|
||||
EndIf
|
||||
|
||||
if SystemDateMonthInt = 1 Then
|
||||
if SystemDateDayInt < 15 Then
|
||||
Var MyMintEnable = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If SystemDateMonthInt = 1 Then
|
||||
If SystemDateDayInt < 15 Then
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@
|
|||
If SaveTheWorldCount < 2 Then
|
||||
|
||||
If InternationalEnable = 1 Then
|
||||
Var script_thankyou = CountryRootPath + "/video/script_thankyou.ev"
|
||||
Var script_thankyou = CountryRootPath + "video/script_thank.ev"
|
||||
TRY script_thankyou
|
||||
Else
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue