merge
This commit is contained in:
commit
a54e4ebc84
121 changed files with 76720 additions and 6158 deletions
16956
xml/event/double_promotion_apple_farm_festival_and_school_ovaltine.xml
Normal file
16956
xml/event/double_promotion_apple_farm_festival_and_school_ovaltine.xml
Normal file
File diff suppressed because it is too large
Load diff
16956
xml/event/double_promotion_taiwanese_tea_and_school_ovaltine.xml
Normal file
16956
xml/event/double_promotion_taiwanese_tea_and_school_ovaltine.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,28 @@
|
|||
[
|
||||
{
|
||||
"name": "apple_farm_festival",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_apple_farm_festival.xml"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "school_ovaltine",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
[
|
||||
{
|
||||
"name": "taiwanese_tea",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_taiwanese_tea.xml"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "school_ovaltine",
|
||||
"template": "/event/promotion_template.inc",
|
||||
"config": {
|
||||
"normal_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"normal_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"press_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"press_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"disable_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"disable_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
|
||||
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
@ -1 +1 @@
|
|||
/event/promotion_oreo_volcano.xml
|
||||
/event/promotion_taiwanese_tea.xml
|
||||
|
|
@ -1 +1 @@
|
|||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_volcano.xml"
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_taiwanese_tea.xml"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Var BigButtonEnable = "Invisible"
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
19174
xml/event/promotion_taiwanese_tea.xml
Normal file
19174
xml/event/promotion_taiwanese_tea.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -5,18 +5,9 @@
|
|||
|
||||
<State> BigButtonEnable </State>
|
||||
<Filename> ###normal_thai </Filename>
|
||||
<FilenamePress> ###normal_thai </FilenamePress>
|
||||
<FilenameDisable> ###normal_thai </FilenameDisable>
|
||||
<FilenamePress> ###press_thai </FilenamePress>
|
||||
<FilenameDisable> ###disable_thai </FilenameDisable>
|
||||
<EventOnClick>
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
|
||||
###EventOnClick
|
||||
</EventOnClick>
|
||||
|
||||
<Video>
|
||||
<X> 42 </X>
|
||||
<Y> 518 </Y>
|
||||
<Width> 484 </Width>
|
||||
<Height> 616 </Height>
|
||||
<Loop> "true" </Loop>
|
||||
<Filename> "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.mp4" </Filename>
|
||||
</Video>
|
||||
</Button>
|
||||
|
|
@ -5,9 +5,9 @@ DEBUGVAR CocktailShow
|
|||
DEBUGVAR OpenFromPageBoard
|
||||
|
||||
DEBUGVAR SchoolOvaltinePro
|
||||
DEBUGVAR OreoVolcanoPro
|
||||
DEBUGVAR AppleFarmFestivalPro
|
||||
DEBUGVAR HappyTriosPro
|
||||
DEBUGVAR TaiwaneseTeaPro
|
||||
|
||||
Var PromotionState1 = "Invisible"
|
||||
Var PromotionState2 = "Invisible"
|
||||
|
|
@ -31,26 +31,6 @@ Else
|
|||
|
||||
Else
|
||||
|
||||
If SchoolOvaltinePro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_school_ovaltine.xml"
|
||||
Var PromotionState1 = "Enable"
|
||||
|
||||
If OreoVolcanoPro = 1 Then
|
||||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_school_ovaltine_and_oreo_volcano.xml"
|
||||
EndIf
|
||||
Else
|
||||
If OreoVolcanoPro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_oreo_volcano.xml"
|
||||
Var PromotionState1 = "Enable"
|
||||
|
||||
If MatchaEveryDayPro = 1 Then
|
||||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_matcha_every_day_and_oreo_volcano.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If AppleFarmFestivalPro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_apple_farm_festival.xml"
|
||||
Var PromotionState1 = "Enable"
|
||||
|
|
@ -59,11 +39,30 @@ Else
|
|||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_apple_farm_festival_and_happy_trios.xml"
|
||||
EndIf
|
||||
|
||||
If SchoolOvaltinePro = 1 Then
|
||||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_apple_farm_festival_and_school_ovaltine.xml"
|
||||
EndIf
|
||||
Else
|
||||
If HappyTriosPro = 1 Then
|
||||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_happy_trios.xml"
|
||||
EndIf
|
||||
|
||||
If SchoolOvaltinePro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_school_ovaltine.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If TaiwaneseTeaPro = 1 Then
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_taiwanese_tea.xml"
|
||||
Var PromotionState1 = "Enable"
|
||||
|
||||
If SchoolOvaltinePro = 1 Then
|
||||
Var PromotionState2 = "Enable"
|
||||
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_taiwanese_tea_and_school_ovaltine.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
|
|
|||
|
|
@ -80,9 +80,6 @@ Var BoostEnergyPro = 0
|
|||
; Matcha every day, 1 - 18 May
|
||||
Var MatchaEveryDayPro = 0
|
||||
|
||||
; School Ovaltine, 19 - 31 May
|
||||
Var SchoolOvaltinePro = 0
|
||||
|
||||
; Oreo volcano, 1 - 31 May
|
||||
Var OreoVolcanoPro = 0
|
||||
|
||||
|
|
@ -92,6 +89,12 @@ Var AppleFarmFestivalPro = 0
|
|||
; Happy Trios, 1 - 30 June
|
||||
Var HappyTriosPro = 0
|
||||
|
||||
; School Ovaltine, 15 - 30 June
|
||||
Var SchoolOvaltinePro = 0
|
||||
|
||||
; Taiwanese Tea, 16 - 30 June
|
||||
Var TaiwaneseTeaPro = 0
|
||||
|
||||
Var NewCollectPoint = 1
|
||||
Var PaymentCodeShouldCollectPromotionPoint = 0
|
||||
|
||||
|
|
@ -156,8 +159,18 @@ If SystemDateMonthInt = 5 Then
|
|||
EndIf
|
||||
|
||||
If SystemDateMonthInt = 6 Then
|
||||
Var AppleFarmFestivalPro = 1
|
||||
Var HappyTriosPro = 1
|
||||
|
||||
If SystemDateDayInt <= 14 Then
|
||||
Var HappyTriosPro = 1
|
||||
Else
|
||||
Var SchoolOvaltinePro = 1
|
||||
EndIf
|
||||
|
||||
If SystemDateDayInt <= 15 Then
|
||||
Var AppleFarmFestivalPro = 1
|
||||
Else
|
||||
Var TaiwaneseTeaPro = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -202,7 +215,6 @@ EndIf
|
|||
|
||||
If BoxID = 123456 Then
|
||||
Var AppleFarmFestivalPro = 1
|
||||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR ConfigNumer
|
||||
|
|
@ -307,6 +319,12 @@ Else
|
|||
Var AppleFarmFestivalPro = 0
|
||||
EndIf
|
||||
|
||||
If TaiwanesePowderEnable = "true" Then
|
||||
|
||||
Else
|
||||
Var TaiwaneseTeaPro = 0
|
||||
EndIf
|
||||
|
||||
Var CurrentMainVideoTemp = 0
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -234,6 +234,7 @@
|
|||
|
||||
STRCONTAIN "1021" MaterialAvailable CaramelSyrupEnable
|
||||
STRCONTAIN "1218" MaterialAvailable AppleSyrupEnable
|
||||
STRCONTAIN "1044" MaterialAvailable TaiwanesePowderEnable
|
||||
|
||||
;Var AppFastEnable = "false"
|
||||
If AppFastEnable = "true" Then
|
||||
|
|
|
|||
36
xml/page_catalog_group_pro_taiwanese_tea.skt
Normal file
36
xml/page_catalog_group_pro_taiwanese_tea.skt
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
<?hurr
|
||||
#include=menu_head.py
|
||||
?>
|
||||
|
||||
<Popup>
|
||||
<Cache> "Enable" </Cache>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 1920 </Height>
|
||||
;<Background> "0xeae6e1" </Background>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
; On open
|
||||
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
|
||||
|
||||
|
||||
Var Timeout = 0
|
||||
|
||||
|
||||
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
|
||||
</EventOpen>
|
||||
|
||||
|
||||
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
|
||||
|
||||
|
||||
|
||||
<?hurr
|
||||
#include=menu_new_layout_gen_v2.py
|
||||
?>
|
||||
<?hurr
|
||||
#include=menu_new_layout_gen.py
|
||||
?>
|
||||
|
||||
|
||||
|
||||
</Popup>
|
||||
3626
xml/page_catalog_group_pro_taiwanese_tea.xml
Normal file
3626
xml/page_catalog_group_pro_taiwanese_tea.xml
Normal file
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue