From a55e88f46a8eea3e95f732b3dd4ddcc34435bcc5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 13 十月 2018 10:25:37 +0800
Subject: [PATCH] 1 修复个推获取玩家appID调用报错;

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 39b2be2..dc883cc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -834,6 +834,7 @@
 GameFuncID_Official = 12        # 官爵,境界
 GameFuncID_Family = 15          # 战盟,仙盟
 GameFuncID_GodWeapon = 20       # 神器
+GameFuncID_Talent = 28     # 天赋
 GameFuncID_RefineExp = 60       # 经验炼制,祈愿
 GameFuncID_RefineMoney = 61     # 金币炼制,祈愿
 GameFuncID_WorldLV = 71         # 世界等级
@@ -849,7 +850,6 @@
 GameFuncID_OSSail = 132         # 开服特惠
 GameFuncID_HorsePetRobBoss = 139# 骑宠争夺
 # 以下为暂时无用的
-GameFuncID_GreatMaster = 28     # 大师
 GameFuncID_Truck = 33           # 运镖
 GameFuncID_RunDaily = 34        # 日常跑环
 GameFuncID_RunFamily = 53       # 战盟跑环
@@ -1221,6 +1221,7 @@
 Def_IudetWingMaterialItemID = 27  # 翅膀精炼材料ID列表
 Def_IudetWingMaterialItemCount = 29  # 翅膀精炼材料个数列表
 Def_IudetDogzEquipPlus = 31  # 神兽装备强化信息列表 [强化等级, 累计总熟练度]
+Def_IudetItemDecompound = 33  # 拆解返还物品列表 [装备ID,材料1ID,个数,是否绑定,材料2ID,个数,是否绑定,...]
 
 Def_IudetItemColor = 16  # 物品颜色,如果该值没有就取物品
 Def_IudetItemCount = 18  # 物品个数,支持20亿,目前仅特殊转化物品会用到
@@ -1606,7 +1607,10 @@
 SuccType_RefineStoveColor, #炼制X品质丹药X枚126
 SuccType_UseStoveBylv, #使用X品丹药X枚127
 SuccType_QueenRelicsEx, #通关娲皇遗迹128
-) = range(1, 129)
+SuccType_DogzBattle, #x神兽出战129
+SuccType_DogzEquipPlus, #出战神兽装备总强化X级130
+SuccType_Collect, #采集X物品X次131
+) = range(1, 132)
 
 
 
@@ -1621,7 +1625,7 @@
                               SuccType_KillSpecificNPC, SuccType_UseStoveBylv,
                               SuccType_Pray,SuccType_PetClassLV,
                               SuccType_HorseAllLV, SuccType_QueenRelics,SuccType_XMZZConWin,
-                              SuccType_EquipSuit,
+                              SuccType_EquipSuit,SuccType_Collect,SuccType_DogzBattle,
                               SuccType_UseItem,SuccType_FamilyTechLV,
                               SuccType_GetSpecialItem,SuccType_GetMagicWeapon,SuccType_FBEncourage,SuccType_XBXZ,
                               ]
@@ -1634,7 +1638,7 @@
 #增加进度前需要重置的成就类型
 NeedResetSuccessTypeList = [
                             SuccType_InlayStone1,SuccType_InlayStone2,SuccType_EquipSuit,SuccType_InlayRune,
-                            SuccType_EquipColorItem,SuccType_EquipArmor,SuccType_EquipWeapon,
+                            SuccType_EquipColorItem,SuccType_EquipArmor,SuccType_EquipWeapon,SuccType_DogzEquipPlus,
                             ]
 
 # 聊天类型, 从100开始, 前100个给c++用

--
Gitblit v1.8.0