Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
c190c8fc62
68 changed files with 53859 additions and 18263 deletions
14958
xml/event/double_promotion_kingdom_thai_tea_and_pepsi_x_taobin.xml
Normal file
14958
xml/event/double_promotion_kingdom_thai_tea_and_pepsi_x_taobin.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,30 @@
|
|||
[
|
||||
{
|
||||
"name": "kingdom_thai_tea",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_kingdom_thai_tea.xml"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "pepsi_x_taobin",
|
||||
"template": "/event/promotion_video_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.png",
|
||||
"video_eng": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4",
|
||||
"video_thai": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_pepsi_x_taobin.xml"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
@ -1 +1 @@
|
|||
/event/promotion_cocoa77.xml
|
||||
/event/promotion_pepesi_x_taobin.xml
|
||||
|
|
|
|||
|
|
@ -1086,7 +1086,7 @@ Sugar And Ice" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Disable=Invisible,$Sum1221020090) </State>
|
||||
<State> Flag( 12-21-02-0090.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,Disable=Invisible,$Sum1221020090) </State>
|
||||
<Button>
|
||||
<State> $Sum1221020090 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Oliang.png" </Filename>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
16113
xml/event/promotion_pepesi_x_taobin.xml
Normal file
16113
xml/event/promotion_pepesi_x_taobin.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -4,79 +4,25 @@
|
|||
<Y> 518 </Y>
|
||||
|
||||
<State> BigButtonEnable </State>
|
||||
<Filename>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = ###normal_eng
|
||||
Else
|
||||
Var return = ###normal_thai
|
||||
EndIf
|
||||
)
|
||||
</Filename>
|
||||
<FilenamePress>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = ###normal_eng
|
||||
Else
|
||||
Var return = ###normal_thai
|
||||
EndIf
|
||||
)
|
||||
</FilenamePress>
|
||||
<FilenameDisable>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = ###normal_eng
|
||||
Else
|
||||
Var return = ###normal_thai
|
||||
EndIf
|
||||
)
|
||||
</FilenameDisable>
|
||||
<EventOnClick>
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_cocoa_77_ignore.xml"
|
||||
|
||||
<Filename> ###normal_thai </Filename>
|
||||
<FilenamePress> ###normal_thai </FilenamePress>
|
||||
<FilenameDisable> ###normal_thai </FilenameDisable>
|
||||
<EventOnClick>
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepsi_x_taobin.xml"
|
||||
</EventOnClick>
|
||||
|
||||
|
||||
<Video>
|
||||
<X> 42 </X>
|
||||
<Y> 518 </Y>
|
||||
<Width> 484 </Width>
|
||||
<Height> 616 </Height>
|
||||
<Loop> "true" </Loop>
|
||||
<State>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "Invisible"
|
||||
Else
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Filename> "ROOT/taobin_project/image/event/cocoa77/cocoa77.mp4" </Filename>
|
||||
<Filename> "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4" </Filename>
|
||||
</Video>
|
||||
|
||||
<Video>
|
||||
<X> 42 </X>
|
||||
<Y> 518 </Y>
|
||||
<Width> 484 </Width>
|
||||
<Height> 616 </Height>
|
||||
<State>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "Enable"
|
||||
Else
|
||||
Var return = "Invisible"
|
||||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Loop> "true" </Loop>
|
||||
<Filename> "ROOT/taobin_project/image/event/cocoa77/cocoa77.mp4" </Filename>
|
||||
</Video>
|
||||
|
||||
</Button>
|
||||
|
||||
<EventUnitTest1>
|
||||
Var BigButtonEnable = "Enable"
|
||||
Var BigButtonEnable = "Enable"
|
||||
Refresh
|
||||
</EventUnitTest1>
|
||||
<EventUnitTest2>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ DEBUGVAR RedStringOfFatePro
|
|||
DEBUGVAR CoconutMilkPro
|
||||
DEBUGVAR MatchaEveryDayPro
|
||||
DEBUGVAR KingdomThaiTeaPro
|
||||
DEBUGVAR PepsiXTaobinPro
|
||||
|
||||
Var PromotionState1 = "Invisible"
|
||||
Var PromotionState2 = "Invisible"
|
||||
|
|
@ -45,6 +46,16 @@ Else
|
|||
|
||||
If KingdomThaiTeaPro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_kingdom_thai_tea.xml"
|
||||
Var PromotionState1 = "Enable"
|
||||
|
||||
If PepsiXTaobinPro = 1 Then
|
||||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_kingdom_thai_tea_and_pepsi_x_taobin.xml"
|
||||
EndIf
|
||||
Else
|
||||
If PepsiXTaobinPro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_pepsi_x_taobin.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If CatalogLayoutV3 = 1 Then
|
||||
|
|
|
|||
|
|
@ -74,6 +74,12 @@ Var MatchaEveryDayPro = 0
|
|||
; Kingdom of Thai tea, 1 Apr - 30 Apr
|
||||
Var KingdomThaiTeaPro = 0
|
||||
|
||||
; Pepsi x Taobin, 7 - 27 Apr
|
||||
Var PepsiXTaobinPro = 0
|
||||
|
||||
; 3 dialects sound campaign, 1 Apr - 30 Apr
|
||||
Var SongkranSoundCampaign = 0
|
||||
|
||||
Var NewCollectPoint = 1
|
||||
Var PaymentCodeShouldCollectPromotionPoint = 0
|
||||
|
||||
|
|
@ -137,6 +143,15 @@ If SystemDateMonthInt = 4 Then
|
|||
If SystemDateDayInt < 7 Then
|
||||
Var AdvertisePepsiAtTheSun = 1
|
||||
EndIf
|
||||
|
||||
If SystemDateDayInt >= 7 Then
|
||||
If SystemDateDayInt <= 27 Then
|
||||
Var PepsiXTaobinPro = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var KingdomThaiTeaPro = 1
|
||||
Var SongkranSoundCampaign = 1
|
||||
EndIf
|
||||
If SystemDateMonthInt = 3 Then
|
||||
If SystemDateDayInt = 31 Then
|
||||
|
|
@ -147,6 +162,7 @@ EndIf
|
|||
|
||||
If SystemDateMonthInt = 4 Then
|
||||
Var KingdomThaiTeaPro = 1
|
||||
Var SongkranSoundCampaign = 1
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -273,6 +289,12 @@ Else
|
|||
Var RedStringOfFatePro = 0
|
||||
EndIf
|
||||
|
||||
If PepsiHighYSyrupEnable = "true" Then
|
||||
|
||||
Else
|
||||
Var PepsiXTaobinPro = 0
|
||||
EndIf
|
||||
|
||||
DEBUGVAR OvaltineSchoolPro
|
||||
DEBUGVAR RedStringOfFatePro
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue