From a56b87458cd32bcea06e3fcc8a2d25e295745f10 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 21 一月 2019 21:34:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Utility/EnumHelper.cs |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/Utility/EnumHelper.cs b/Utility/EnumHelper.cs
index c0af2e8..050f4b9 100644
--- a/Utility/EnumHelper.cs
+++ b/Utility/EnumHelper.cs
@@ -326,6 +326,7 @@
     DungeonAssist = 29,
     GatherSoulDungeon = 30,
     CrossServerPk = 31,
+    JadeDynastyBoss = 32,
 }
 
 public enum ActivityPrepareType
@@ -377,6 +378,18 @@
     retFashionWeapon = 20,//鏃惰姝﹀櫒
     retFashionClothes = 21,//鏃惰琛f湇
     retFashionWeapon2 = 22,//鏃惰鍓墜
+    JadeDynasty_Cloak = 121, //璇涗粰鎶
+    JadeDynasty_FaceMask = 122, //璇涗粰闈㈢僵
+    JadeDynasty_Glove1 = 123, //璇涗粰鎵嬪
+    JadeDynasty_Glove2 = 124, //璇涗粰鎵嬪
+    JadeDynasty_Ruyi = 125, //璇涗粰濡傛剰
+    JadeDynasty_Pendant = 126, //璇涗粰鍚婂潬
+    JadeDynasty_Ring1 = 127, //璇涗粰鎴掓寚
+    JadeDynasty_Ring2 = 128, //璇涗粰鎴掓寚
+    JadeDynasty_Sword1 = 129, //璇涗粰鍓�
+    JadeDynasty_Sword2 = 130, //鎴粰鍓�
+    JadeDynasty_Sword3 = 131, //闄蜂粰鍓�
+    JadeDynasty_Sword4 = 132, //缁濅粰鍓�
     retMax,
 };
 
@@ -652,6 +665,8 @@
     rptPetPack = 31, //瀹犵墿鑳屽寘
     rptDogzItem = 32, //绁炲吔鐗╁搧鑳屽寘
     rptDogzEquip = 33, //绁炲吔瑁呭鑳屽寘锛堢鍏界┛鎴达級
+    rptJadeDynastyItem = 34, //璇涗粰鐗╁搧鑳屽寘
+    rptJadeDynastyEquip = 35,//璇涗粰瑁呭鑳屽寘锛堣瘺浠欑┛鎴达級
     rptBlastFrunacePack = 253, //鐐间腹鑳屽寘
     rptGatherSoul = 254,//鑱氶瓊
     rptRunePack = 255,//绗﹀嵃鑳屽寘
@@ -681,6 +696,16 @@
     Accessories4,// 閰嶉グ4
     Accessories5,// 閰嶉グ5
     Accessories6,// 閰嶉グ6
+    JadeDynasty_Cloak = 128, //璇涗粰鎶
+    JadeDynasty_FaceMask = 129, //璇涗粰闈㈢僵
+    JadeDynasty_Glove = 130, //璇涗粰鎵嬪
+    JadeDynasty_Ruyi = 131, //璇涗粰濡傛剰
+    JadeDynasty_Pendant = 132, //璇涗粰鍚婂潬
+    JadeDynasty_Ring = 133, //璇涗粰鎴掓寚
+    JadeDynasty_Sword1 = 134, //璇涗粰鍓�
+    JadeDynasty_Sword2 = 135, //鎴粰鍓�
+    JadeDynasty_Sword3 = 136, //闄蜂粰鍓�
+    JadeDynasty_Sword4 = 137, //缁濅粰鍓�
 }
 
 /** 鐗╁搧绫诲瀷 */
@@ -1145,6 +1170,7 @@
     DemonJarAuto = 32,
     AssistXianYuanCoinsAdd = 33,//鍔╂垬浠欑紭甯佷笂闄愬姞鎴�
     AssistXianYuanCoinsRatioAdd = 34,//鍔╂垬浠欑紭甯佽幏寰楀�嶇巼鍔犳垚锛堜竾鍒嗘瘮锛�
+    JadeDynastyBoss = 35,
 }
 
 
@@ -1178,7 +1204,8 @@
     ElderGodArea = 3,
     DemonJar = 4,
     DogzDungeon = 5,
-    CrossServerBoss=6,
+    CrossServerBoss = 6,
+    JadeDynastyBoss = 7,
     None = 99,
 }
 

--
Gitblit v1.8.0