Merge branch 'master' of kong:/1TBHDD/ikong/taobin_project

xml/event/script_common_for_open_promotion_xml.ev

@@ -13,12 +13,24 @@ If OpenFromPageBoard = 1 Then
 	    
 	EndIf
 Else
+	If ProPepweenEnable = 1 Then
+
+		Var BigButtonEnable = "Enable"
+		Open "ROOT/taobin_project/xml/event/promotion_pepween.xml"
+
 
-	If TamatianEnable = 1 Then
-		Var BigButtonEnable = "Enable"  
-		Open "ROOT/taobin_project/xml/event/promotion_Tamatian.xml" 
 	Else
-		Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+
+
+		If TamatianEnable = 1 Then
+			Var BigButtonEnable = "Enable"  
+			Open "ROOT/taobin_project/xml/event/promotion_Tamatian.xml" 
+		Else
+			Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+		EndIf
+
 	EndIf
+
+	
 EndIf
 Var OpenFromPageBoard = 0

xml/event/tricker.ev

@@ -41,6 +41,9 @@ Var TamatianEnable = 0
 ; September 9 - 16
 Var MayDayRunEnable = 0
 
+; Pro Pepween 16 - 31 Oct
+Var ProPepweenEnable = 0
+
 If SystemDateMonthInt = 9 Then
 	If SystemDateDayInt > 5 Then
 		If SystemDateDayInt < 17 Then 
@@ -69,10 +72,25 @@ EndIf
 
 If SystemDateMonthInt = 10 Then
 
-	Var GameEnableFromTrickerEv = 1
+
+	If SystemDateDayInt < 16 Then
+		Var GameEnableFromTrickerEv = 1
+	EndIf
+
+
+	If SystemDateDayInt > 15 Then
+		Var ProPepweenEnable = 1
+	EndIf
 
 EndIf
 
+DEBUGVAR ProPepweenEnable
+
+If SystemDateMonthInt = 11 Then
+	Var ProPepweenEnable = 0
+EndIf
+
+
 If MelonSyrupEnable = "false" Then
 	Var MayDayRunEnable = 0
 EndIf
@@ -183,6 +201,7 @@ If InternationalEnable = 1 Then
 	Var PepsiPromoteVideo = 0
 	Var PepsiProCodeEnable = 0
 	Var MysteryProEnable = 0
+	Var ProPepweenEnable = 0
 EndIf