Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
93fa5c540b
159 changed files with 43697 additions and 19671 deletions
11195
xml/event/double_promotion_matcha_every_day_and_coconut_milk.xml
Normal file
11195
xml/event/double_promotion_matcha_every_day_and_coconut_milk.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,30 @@
|
|||
[
|
||||
{
|
||||
"name": "matcha_every_day",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_matcha_every_day.xml"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "coconut_milk",
|
||||
"template": "/event/promotion_video_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png",
|
||||
"video_eng": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.mp4",
|
||||
"video_thai": "ROOT/taobin_project/image/event/coconut_milk/coconut_milk.mp4",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_coconut_milk.xml"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
@ -1 +1 @@
|
|||
/event/promotion_ovaltine_school.xml
|
||||
/event/promotion_matcha_every_day.xml
|
||||
File diff suppressed because it is too large
Load diff
15903
xml/event/promotion_matcha_every_day.xml
Normal file
15903
xml/event/promotion_matcha_every_day.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1 +1 @@
|
|||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_ovaltine_school.xml"
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_matcha_every_day.xml"
|
||||
|
|
|
|||
|
|
@ -35,43 +35,6 @@
|
|||
###EventOnClick
|
||||
|
||||
</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/ovaltine_school/ovaltine_school.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/ovaltine_school/ovaltine_school.mp4" </Filename>
|
||||
</Video>
|
||||
|
||||
</Button>
|
||||
|
||||
<EventUnitTest1>
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ DEBUGVAR StrawberrySeriesPro
|
|||
DEBUGVAR OvaltineSchoolPro
|
||||
DEBUGVAR RedStringOfFatePro
|
||||
DEBUGVAR CoconutMilkPro
|
||||
DEBUGVAR MatchaEveryDayPro
|
||||
|
||||
Var PromotionState1 = "Invisible"
|
||||
Var PromotionState2 = "Invisible"
|
||||
|
|
@ -27,23 +28,18 @@ Else
|
|||
Var CountEnablePromotion = 0
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
|
||||
; zone promote
|
||||
If OvaltineSchoolPro = 1 Then
|
||||
If RedStringOfFatePro = 1 Then
|
||||
Var PromotionState1 = "Enable"
|
||||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_ovaltine_and_red_string.xml"
|
||||
Else
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_ovaltine_school.xml"
|
||||
EndIf
|
||||
Else
|
||||
If RedStringOfFatePro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_red_string_of_fate.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If CoconutMilkPro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_coconut_milk.xml"
|
||||
Var PromotionState2 = "Enable"
|
||||
|
||||
If MatchaEveryDayPro = 1 Then
|
||||
Var PromotionState1 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_matcha_every_day_and_coconut_milk.xml"
|
||||
EndIf
|
||||
Else
|
||||
If MatchaEveryDayPro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_matcha_every_day.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -68,6 +68,9 @@ Var SwensenPro = 0
|
|||
; Coconut Milk, 1 Mar - 31 Mar
|
||||
Var CoconutMilkPro = 0
|
||||
|
||||
; Matcha every day, 10 Mar - 31 Mar
|
||||
Var MatchaEveryDayPro = 0
|
||||
|
||||
Var NewCollectPoint = 1
|
||||
Var PaymentCodeShouldCollectPromotionPoint = 0
|
||||
|
||||
|
|
@ -119,6 +122,7 @@ EndIf
|
|||
If SystemDateMonthInt = 3 Then
|
||||
If SystemDateDayInt >= 10 Then
|
||||
Var SwensenPro = 1
|
||||
Var MatchaEveryDayPro = 1
|
||||
EndIf
|
||||
|
||||
Var CoconutMilkPro = 1
|
||||
|
|
@ -170,8 +174,9 @@ If BoxID = 173149 Then
|
|||
|
||||
EndIf
|
||||
|
||||
Var ToppingMilkAndAllVolcanoEnable = 0
|
||||
If BoxID = 172644 Then
|
||||
|
||||
Var ToppingMilkAndAllVolcanoEnable = 1
|
||||
EndIf
|
||||
|
||||
Var XMLLiveInfoEnable = 1
|
||||
|
|
@ -217,6 +222,7 @@ If taobin_nopro = "true" Then
|
|||
Var OvaltineSchoolPro = 0
|
||||
Var RedStringOfFatePro = 0
|
||||
Var CoconutMilkPro = 0
|
||||
Var MatchaEveryDayPro = 0
|
||||
Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
|
||||
|
||||
EndIf
|
||||
|
|
@ -229,6 +235,12 @@ Else
|
|||
Var CoconutMilkPro = 0
|
||||
EndIf
|
||||
|
||||
If MatchaPowderEnable = "true" Then
|
||||
|
||||
Else
|
||||
Var MatchaEveryDayPro = 0
|
||||
EndIf
|
||||
|
||||
DEBUGVAR HaveIngredientOvaltine
|
||||
If HaveIngredientOvaltine = "true" Then
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue