From e0872807ff52affb0cf7dec2796481ef3fcffe40 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 28 一月 2019 21:24:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Utility/EnumHelper.cs |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Utility/EnumHelper.cs b/Utility/EnumHelper.cs
index 6e6c5bb..a6b7d01 100644
--- a/Utility/EnumHelper.cs
+++ b/Utility/EnumHelper.cs
@@ -327,7 +327,7 @@
     GatherSoulDungeon = 30,
     CrossServerPk = 31,
     JadeDynastyBoss = 32,
-    JadeDynastyTower=33,
+    JadeDynastyTower = 33,
 }
 
 public enum ActivityPrepareType
@@ -1261,9 +1261,11 @@
     Def_RewardType_IceLodeStar = 19, //鍐版櫠鐭胯剦鏄熺骇濂栧姳19
     Def_RewardType_WeekPartyAct = 20, //棰嗗彇鍛ㄧ媯娆㈡椿鍔ㄥ鍔�20
     Def_RewardType_WeekPartyPoint = 21,// 棰嗗彇鍛ㄧ媯娆㈢Н鍒嗗鍔�21
-    Def_RewardType_ActLoginAwardAct = 22, // 棰嗗彇鐧诲綍濂栧姳娲诲姩濂栧姳22
+    Def_RewardType_ActLoginAwardAct = 22,// 棰嗗彇鐧诲綍濂栧姳娲诲姩濂栧姳22
     Def_RewardType_NewFairyCRecharge = 23, // 鏂颁粰鐣岀洓鍏稿厖鍊煎ぇ绀�23
     Def_RewardType_NewFairyCParty = 24, // 鏂颁粰鐣岀洓鍏稿叏姘戞潵鍡�24
+    Def_RewardType_FeastWeekPartyAct = 25, //棰嗗彇鑺傛棩宸$ぜ娲诲姩濂栧姳25
+    Def_RewardType_FeastWeekPartyPoint = 26, //棰嗗彇鑺傛棩宸$ぜ绉垎濂栧姳26
 }
 
 public enum MapType

--
Gitblit v1.8.0