Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

xml/event/tricker.ev

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