From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Utility/EnumHelper.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Utility/EnumHelper.cs b/Utility/EnumHelper.cs
index 71e73c1..cb4d9be 100644
--- a/Utility/EnumHelper.cs
+++ b/Utility/EnumHelper.cs
@@ -870,7 +870,6 @@
EquipCompose = 93,//瑁呭鍚堟垚
Guard = 94,//瀹堟姢
SkillTreasure = 95,//鎶�鑳芥硶瀹�
- AddPoint = 96,//鍔犵偣
WingCompose = 97,//缈呰唨鍚堟垚
Demon = 98,//娣蜂贡濡栧煙
HappyFindTreasure = 99,//娆箰瀵诲疂
@@ -882,6 +881,8 @@
OpenServerRedEnvelope = 122,//寮�鏈嶇孩鍖�
EquipDecompose = 123, //瑁呭鍒嗚В
TreasureFindHost = 124, //娉曞疂璁や富
+ Dogz = 138, //绁炲吔
+ AddPoint = 145,//鍔犵偣
}
//灞炴�х被鍨�
public enum AttrEnum
@@ -1163,9 +1164,9 @@
Def_RewardType_TreasureSoul = 9,//娉曞疂榄傚鍔�
Def_RewardType_ConsumeRebate = 11,//娑堣垂杩斿埄濂栧姳
Def_RewardType_BossReborn = 12,//boss澶嶆椿濂栧姳
- Def_RewardType_FCRecharge = 13,// 浠欑晫鐩涘吀鍏呭�煎ぇ绀�13
+ Def_RewardType_FCRecharge = 13,// 浠欑晫鐩涘吀鍏呭�煎ぇ绀�13W
Def_RewardType_FCParty = 14,// 浠欑晫鐩涘吀鍏ㄦ皯鏉ュ棬14
-
+ Def_RewardType_WishingWell = 16,// 璁告効姹犲鍔�16
}
public enum MapType
@@ -1547,6 +1548,7 @@
UnionWarehouseDonation, //鎹愮尞瑁呭
UnionWarehouseExchange, //鍏戞崲瑁呭
GetEquipPath, //瑁呭鑾峰彇閫斿緞
+ GetWingsPath,//缈呰唨鑾峰彇閫斿緞
}
public enum InstalledAsset
--
Gitblit v1.8.0