Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
44235333d1
19 changed files with 4561 additions and 729 deletions
|
|
@ -18,7 +18,7 @@
|
|||
Var DefaultLargeBanner = PepsiLargeBanner
|
||||
Var DefaultNormBanner = PepsiNormBanner
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If showMultiAds = "true" Then
|
||||
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
If CountDownPauseVideo2 = -1 Then
|
||||
Var CountDownPauseVideo2 = 0
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
; Default. Do not edit here.
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
If ProReducedPriceEnable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
|
||||
EndIf
|
||||
If ProYuzu250Enable = 1 Then
|
||||
If IgnoreProfileFromRunEV = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
|
||||
EndIf
|
||||
If UseSlideShowVideo = 1 Then
|
||||
|
|
@ -198,7 +198,7 @@
|
|||
If ProReducedPriceEnable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
|
||||
EndIf
|
||||
If ProYuzu250Enable = 1 Then
|
||||
If IgnoreProfileFromRunEV = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
|
||||
EndIf
|
||||
If UseSlideShowVideo = 1 Then
|
||||
|
|
@ -238,7 +238,7 @@
|
|||
DEBUGVAR a_video_menu[ads_idx]
|
||||
Var ads_idx = 0
|
||||
EndIf
|
||||
|
||||
|
||||
; Default. Do not edit here.
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
|
|
@ -297,7 +297,7 @@
|
|||
If ProReducedPriceEnable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
|
||||
EndIf
|
||||
If ProYuzu250Enable = 1 Then
|
||||
If IgnoreProfileFromRunEV = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
|
||||
EndIf
|
||||
If UseSlideShowVideo = 1 Then
|
||||
|
|
@ -355,7 +355,7 @@
|
|||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
|
||||
EndIf
|
||||
|
||||
If ProYuzu250Enable = 1 Then
|
||||
If IgnoreProfileFromRunEV = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue