pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

fix bug run.ev not run & update mys desc

Browse source
This commit is contained in:
Pakin 2024-10-21 16:48:33 +07:00
parent 28c1485e9e
commit ba9c746d3e
8 changed files with 676 additions and 660 deletions
Download patch file Download diff file Expand all files Collapse all files

14
inc/video.inc
View file

@ -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

16
inter/mys/xml/event/event_profile.ev
View file

@ -7,14 +7,14 @@ STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce
DEBUGVAR HasProYuzu250Concat
DEBUGVAR ProReducedPriceEnable
DEBUGVAR ProYuzu250Enable
DEBUGVAR IgnoreProfileFromRunEV
If ProReducedPriceEnable = 1 Then
Else
DEBUGVAR "Case pro reduce end"
; case-pro-reduce-end
If ProYuzu250Enable = 1 Then
If IgnoreProfileFromRunEV = 1 Then
DEBUGVAR "Pro yuzu ongoing"
; concat-profile
If HasProYuzu250Concat = "true" Then
@ -32,6 +32,12 @@ Else
DEBUGVAR XMLProfilePreEvent
Var XMLProfile = XMLProfilePreEvent + "-"
Var XMLProfile = XMLProfile + "PromoYuzu250"
; case-local-profile
If XMLProfile = "Discount50-PromoYuzu250" Then
DEBUGVAR "Restore Discount50 profile, also concat Yuzu"
Var XMLProfile = "NoDis50ForProYuzu25"
EndIf
EndIf
Else
@ -40,6 +46,12 @@ Else
Var XMLProfile = XMLProfile + "-"
Var XMLProfile = XMLProfile + "PromoYuzu250"
; case-local-profile
If XMLProfile = "Discount50-PromoYuzu250" Then
DEBUGVAR "No pro reduce but Discount50, concat pro yuzu"
Var XMLProfile = "NoDis50ForProYuzu25"
EndIf
EndIf
EndIf
Else

6
inter/mys/xml/event/script_common_for_open_promotion_xml.ev
View file

@ -5,12 +5,12 @@
DEBUGVAR FruityRayaEnable
DEBUGVAR ProThaiTeaEnable
DEBUGVAR ProYuzuEnable
DEBUGVAR ProYuzu250Enable
DEBUGVAR IgnoreProfileFromRunEV
If OpenFromPageBoard = 1 Then
; has-ongoing-pro
If ProYuzu250Enable = 1 Then
If IgnoreProfileFromRunEV = 1 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml"
Var OpenFromPageBoard = 0
@ -20,7 +20,7 @@ If OpenFromPageBoard = 1 Then
Else
; has-ongoing-pro
If ProYuzu250Enable = 1 Then
If IgnoreProfileFromRunEV = 1 Then
OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml"
Var OpenFromPageBoard = 0

14
inter/mys/xml/event/tricker.ev
View file

@ -21,7 +21,7 @@ Var ProYuzuEnable = 0
Var FromProYuzu = 0
; Yuzu Promo
Var ProYuzu250Enable = 0
Var IgnoreProfileFromRunEV = 0
Var FromProYuzu250 = 0
@ -63,7 +63,7 @@ If SystemDateMonthInt = 10 Then
Var ProReducedPriceEnable = 1
EndIf
Var ProYuzu250Enable = 1
Var IgnoreProfileFromRunEV = 1
EndIf
If SystemDateMonthInt = 11 Then
@ -71,11 +71,11 @@ If SystemDateMonthInt = 11 Then
Var ProReducedPriceEnable = 1
EndIf
Var ProYuzu250Enable = 1
Var IgnoreProfileFromRunEV = 1
EndIf
If SystemDateMonthInt = 12 Then
Var ProYuzu250Enable = 1
Var IgnoreProfileFromRunEV = 1
If SetProReduceByBO = 1 Then
Var ProReducedPriceEnable = 0
@ -85,9 +85,9 @@ EndIf
If SystemDateMonthInt = 1 Then
If SystemDateDayInt < 16 Then
Var ProYuzu250Enable = 1
Var IgnoreProfileFromRunEV = 1
Else
Var ProYuzu250Enable = 0
Var IgnoreProfileFromRunEV = 0
EndIf
EndIf
@ -114,7 +114,7 @@ If BoxID = 177746 Then
Var UseSlideShowVideo = 0
;Var ProReducedPriceEnable = 0
;Var ProYuzu250Enable = 1
;Var IgnoreProfileFromRunEV = 1
EndIf
If BoxID = 210037 Then

4
inter/mys/xml/page_catalog_group_forkid.lxml
View file

@ -2353,11 +2353,11 @@
Var NameLang[2][3] = "-"
Var NameLang[2][4] = "SMOOTHIE STRAWKOKO"
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Milk, Mango Syrup, and Iced"
Var DescLang[2][0] = "Milk, Cocoa, Strawberry Syrup"
Var DescLang[2][1] = "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง"
Var DescLang[2][2] = "-"
Var DescLang[2][3] = "-"
Var DescLang[2][4] = "Susu, Sirap Mangga, Ais"
Var DescLang[2][4] = "Susu, Koko, Sirap Strawberi"
Var DescLang[2][5] = ""
; end lang
Var PD_STAGE_1 = "Disable2"

4
inter/mys/xml/page_catalog_group_fruity_raya.lxml
View file

@ -2876,11 +2876,11 @@
Var NameLang[2][3] = "-"
Var NameLang[2][4] = "SMOOTHIE STRAWKOKO"
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Milk, Mango Syrup, and Iced"
Var DescLang[2][0] = "Milk, Cocoa, Strawberry Syrup"
Var DescLang[2][1] = "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง"
Var DescLang[2][2] = "-"
Var DescLang[2][3] = "-"
Var DescLang[2][4] = "Susu, Sirap Mangga, Ais"
Var DescLang[2][4] = "Susu, Koko, Sirap Strawberi"
Var DescLang[2][5] = ""
; end lang
Var PD_STAGE_1 = "Disable2"

1272
inter/mys/xml/page_catalog_group_milk.lxml
View file

File diff suppressed because it is too large Load diff

6
xml/page_board.xml
View file

@ -1195,7 +1195,11 @@
EndIf
EndIf
If ProYuzu250Enable = 0 Then
If IgnoreProfileFromRunEV = "" Then
Var IgnoreProfileFromRunEV = 0
EndIf
If IgnoreProfileFromRunEV = 0 Then
TRY "ROOT/taobin_project/xml/profile/run.ev"
EndIf