5931 【后端】【1.5.100】诛仙装备开发（诛仙物品背包34、诛仙装备背包35、诛仙装备传奇属性生成规则支持）

hxp

2019-01-21 a4609786df8768c1c138dc261d1b924860c9f07b

 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py

@@ -146,6 +146,7 @@
Def_Notify_WorldKey_InitGameWorldTime = "InitGameWorldTime"  #启动服务器时间

Def_Notify_WorldKey_OperationActionInfo = "OperationActionInfo_%s" # 运营活动信息，参数为运营活动名

Def_Notify_WorldKey_DailyActionState = "DailyActionState_%s" # 日常活动状态，参数为日常活动ID

Def_Notify_WorldKey_CrossDailyActionState = "CrossDailyActionState_%s" # 跨服日常活动状态，参数为日常活动ID

Def_Notify_WorldKey_FBEnterTimeLimiitMapID = "FBEnterTimeLimiitMapID" # 进入副本有时间限制的地图ID列表

Def_Notify_WorldKey_FBCanEnter = "FBCanEnter_%s" # 副本是否可进入，参数为副本DataMapID

Def_Notify_WorldKey_FBFuncState = "FBFuncState_%s" # 副本状态，参数为副本DataMapID

@@ -166,25 +167,18 @@


Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo"  # 仙盟宴会数据



Def_Notify_WorldKey_MergeBoss = "Merge_Boss"  # 跨服boss

Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState"  # 跨服服务器链接状态

Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen"  # 跨服服务器是否开启中



Def_Notify_WorldKey_Merge_PK = "Merge_PK"  # 跨服PK, 仅跨服服务器有用，做为触发PKState用

Def_Notify_WorldKey_MergePKState = "MergePK_State"  # 由跨服服务器控制的跨服PK活动状态

Def_Notify_WorldKey_MergePKDayID = "MergePK_DayID"  # 跨服PK活动日ID

Def_Notify_WorldKey_MergePKWeekID = "MergePK_WeekID"  # 跨服PK活动周ID

Def_Notify_WorldKey_MergePKSeasonID = "MergePK_SeasonID"  # 跨服PK活动赛季ID

Def_Notify_WorldKey_MergePKSeasonStartTime = "MergePK_SeasonStartTime"  # 跨服PK活动当前赛季开始时间

Def_Notify_WorldKey_IsSeasonEnd = "MergePK_IsSeasonEnd"  # 跨服PK活动当前赛季是否结束



Def_Notify_WorldKey_Merge_King = "Merge_King"  # 由跨服服务器控制的跨服王者争霸活动状态

Def_Notify_WorldKey_Merge_KingStartID = "Merge_KingStartID"  # 王者争霸开始活动ID, 用于奖励状态重置

Def_Notify_WorldKey_Merge_KingOverID = "Merge_KingOverID"  # 王者争霸结束活动ID, 用于奖励状态重置

Def_Notify_WorldKey_Merge_KingServerHonour = "Merge_KingServerHonour"  # 王者争霸本服荣耀排位

Def_Notify_WorldKey_CrossPKZoneID = "CrossPKZoneID"  # 本服跨服PK所属赛区

Def_Notify_WorldKey_CrossPKSeasonID = "CrossPKSeasonID"  # 本服跨服PK当前赛季

Def_Notify_WorldKey_CrossPKSeasonState = "CrossPKSeasonState"  # 本服跨服PK赛季状态 0-关闭，1-开启中



Def_Notify_WorldKey_MixServerCampaignSaveData = "MixServerCampaignSaveData_%s"  # 合服活动记录数据时机0-否 1-是

Def_Notify_WorldKey_MixServerCampaignGetAward = "MixServerCampaignGetAward_%s"  # 合服活动可领奖时机0-否 1-是



Def_Notify_WorldKey_GameWorldBossReborn = 'GameWorldBossReborn_%s'   # 世界boss重生, %s为标识点28,29

Def_Notify_WorldKey_GameWorldBossRebornCross = 'BossRebornCross_%s_%s'   # 跨服世界boss重生, 参数为（zoneID, bossID）

Def_Notify_WorldKey_GameWorldBossReborn = 'BossReborn_%s'   # 世界boss重生, 参数为（bossID）

Def_Notify_WorldKey_BossKilledCnt = 'BossKilledCnt_%s'  # boss击杀次数, 参数为NPCID

Def_Notify_WorldKey_GameWorldBossOnlineCnt = "GameWorldBossOnlineCnt_%s"  #世界boss重生时间计算 在线人数统计 %s为bossid

Def_Notify_WorldKey_BossShuntPlayer = 'BossShuntPlayer'   # boss分流玩家信息

@@ -235,11 +229,14 @@
OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动

OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动

OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动

OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动

OperationActionName_LoginAward = "ActLoginAward" # 登录奖励活动

OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate, 

                           OperationActionName_BossReborn,OperationActionName_SpringSale, 

                           OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,

                           OperationActionName_RealmPoint, OperationActionName_FlashSale,

                           OperationActionName_WishingWell, OperationActionName_TotalRecharge]

                           OperationActionName_WishingWell, OperationActionName_TotalRecharge, 
                           OperationActionName_WeekParty, OperationActionName_LoginAward, ]

#需要记录开启活动时的世界等级的运营活动

NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell]



@@ -312,7 +309,9 @@
    Def_mitRecycleAttrFruit,  # 回收魂石

    Def_mitDogzEquipPlus,     # 神兽装备强化

    Def_mitRuneCompound,      # 符印合成

) = range(1, 23)

    Def_mitGatherSoulCompound,# 聚魂合成

    Def_mitGatherSoulDecompose,# 聚魂分解

) = range(1, 25)



#---写死的技能ID---

Def_SkillID_AutoTruck = 62220   # 自动运镖buff

@@ -569,6 +568,7 @@
    Def_BT_FBHelpBattle,                      #助战次数排行榜

    Def_BT_Campaign_GodWeaponLV,              #神兵等级(开服活动榜) 20

    Def_BT_Campaign_Recharge,                 #累计充值(开服活动榜)

    Def_BT_Campaign_PetLV,                    #灵宠等级(开服活动榜)

    

    Def_BT_HighLadder,                        #天梯竞技场排行

    Def_BT_HighLadder_Yester,                 #天梯竞技场昨日排行

@@ -582,11 +582,9 @@
    

    Def_BT_CostTeHui,                         #消费特惠排行榜

    Def_BT_CostTeHuiLast,                     #消费特惠排行榜上一期

    Def_BT_MergePKDay,                        #跨服PK日积分榜

    Def_BT_MergePKWeek,                       #跨服PK周积分榜

    

    Def_BT_Max,                               #排行榜最大类型

) = range(0, 33 + 2) 
) = range(0, 32 + 2) 
    

#职业对应战力排行榜类型

JobFightPowerBillboardDict = {

@@ -598,6 +596,7 @@
#排行榜Value1存储境界信息的榜单列表

BTValue1_OfficialRankList = [Def_BT_FightPower, Def_BT_FightPower_Warrior, Def_BT_FightPower_Wizard, Def_BT_FightPower_Assassin, 

                             Def_BT_LV, Def_BT_FightPower_Horse, Def_BT_FightPower_Pet, Def_BT_TrialTower, Def_BT_OffLineEfficient,

                             Def_BT_FBHelpBattle,

                             ]



##---比率---

@@ -784,7 +783,13 @@
CDBPlayerRefresh_GodWeaponLV_2,         # 神兵等级 - 类型2 193

CDBPlayerRefresh_GodWeaponLV_3,         # 神兵等级 - 类型3 194

CDBPlayerRefresh_GodWeaponLV_4,         # 神兵等级 - 类型4 195

) = range(146, 196)

CDBPlayerRefresh_SoulDust,              # 魂尘 196

CDBPlayerRefresh_SoulSplinters,         # 聚魂碎片 197

CDBPlayerRefresh_SoulCore,              # 核心环 198

CDBPlayerRefresh_Honor,                 # 荣誉 199

CDBPlayerRefresh_ZhuxianRate,           # 诛仙一击概率 200

CDBPlayerRefresh_ZhuxianHurtPer,        # 诛仙一击伤害百分比 201

) = range(146, 202)



TYPE_Price_Gold_Paper_Money = 5    # 金钱类型，（先用礼券，再用金子）

TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）

@@ -794,11 +799,15 @@
TYPE_Price_FamilyActivity = 15    # 仙盟活跃令

TYPE_Price_FBHelpPoint = 16    # 副本助战积分, 废弃

TYPE_Price_XianyuanCoin = 17    # 仙缘币

TYPE_Price_Honor = 18    # 荣誉

TYPE_Price_Rune = 23    # 符印精华点

TYPE_Price_RuneSplinters = 24    # 符印碎片

TYPE_Price_TreasureScore = 25    # 寻宝积分

TYPE_Price_BourseMoney = 26    # 交易所可购买额度

TYPE_Price_Danjing = 27    # 丹精（丹药回收）

TYPE_Price_SoulDust = 28    # 魂尘

TYPE_Price_SoulSplinters = 29    # 聚魂碎片

TYPE_Price_SoulCore = 30    # 核心环





#以下是旧的金钱类型

@@ -806,7 +815,6 @@
TYPE_Price_HighLadder_Currency = 102     # 天梯竞技场积分

TYPE_Price_HighLadder_Signet = 103    # 物品兑换(圣光晶石)

TYPE_Price_GongXun = 105    # 功勋点

TYPE_Price_Honor = 108    # 荣誉商店积分

TYPE_Price_ArrestPoint = 110    # 悬赏积分



# 物品兑换

@@ -826,6 +834,10 @@
                           TYPE_Price_FamilyActivity:CDBPlayerRefresh_FamilyActivity,

                           TYPE_Price_XianyuanCoin:CDBPlayerRefresh_Xianyuancoin,

                           TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,

                           TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,

                           TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,

                           TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,

                           TYPE_Price_Honor:CDBPlayerRefresh_Honor,

                           }



# 高效战斗状态

@@ -868,6 +880,7 @@
GameFuncID_LittleHelper = 146   # 小助手

GameFuncID_TJG = 147            # 脱机挂

GameFuncID_SuperGift = 150      # 超值礼包

GameFuncID_ZhuXianBoss = 163    # 诛仙BOSS

# 以下为暂时无用的

GameFuncID_Truck = 33           # 运镖

GameFuncID_RunDaily = 34        # 日常跑环

@@ -891,7 +904,9 @@
Def_TalkExtraValue_Bit_GM,            #GM

Def_TalkExtraValue_Bit_JOB, #job

Def_TalkExtraValue_Bit_BubbleBox, #气泡框

) = range(0, 4)

Def_TalkExtraValue_Bit_ServerGroupID, #服务器组ID

Def_TalkExtraValue_Bit_LV, #等级

) = range(0, 6)



#聊天信息附加值中某信息数据所占位置

#{聊天信息附加值类型:[起始位置(从左往右), 结束位置(不包含)]}

@@ -900,6 +915,8 @@
     Def_TalkExtraValue_Bit_GM:[2, 3],  # GM

     Def_TalkExtraValue_Bit_JOB:[3, 4],  # job

     Def_TalkExtraValue_Bit_BubbleBox:[4, 6],  # 气泡框

     Def_TalkExtraValue_Bit_ServerGroupID:[6, 13],  # 服务器组ID

     Def_TalkExtraValue_Bit_LV:[13, 17],  # 等级

     }



# 聊天频道 暂用语音

@@ -918,13 +935,16 @@
rptPet,             # 宠物背包(用物品存储宠物的数据) 31

rptDogzItem,        # 神兽物品背包 32

rptDogzEquip,       # 神兽装备背包 33

rptZhuXianItem,     # 诛仙物品背包 34

rptZhuXianEquip,    # 诛仙装备背包 35

rptMax,             # 最大背包类型数量，放在最后一个

) = range(28, 28 + 7)  #C++定义的枚举到２７

) = range(28, 28 + 9)  #C++定义的枚举到２７



#虚拟背包类型, 从255递减

Def_VPack_TypeList = (

rptGatherSoul,      # 聚魂背包 254

rptRune,            # 符印背包 255

) = range(256 - 1, 256)

) = range(256 - 2, 256)





#武器的手持形式

@@ -947,8 +967,8 @@
                                Def_UniversalGameRecType_StoreServerCntRecord,  #商店全服购买记录 8,

                                Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9

                                Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10

                                Def_UniversalGameRecType_11,

                                Def_UniversalGameRecType_MergeRegister, # 上传数据报名信息12

                                Def_UniversalGameRecType_ZhuXianBossRecord, #诛仙BOSS结算记录11

                                Def_UniversalGameRecType_12,

                                Def_UniversalGameRecType_13,

                                Def_UniversalGameRecType_Reward,    # 通用奖励表(TopBar)14

                                Def_UniversalGameRecType_15,

@@ -966,7 +986,7 @@
                                Def_UniversalGameRecType_27,

                                Def_UniversalGameRecType_28,

                                Def_UniversalGameRecType_BossInfo,  # boss信息29

                                Def_UniversalGameRecType_30,

                                Def_UniversalGameRecType_CrossBossInfo,  # 跨服boss信息

                                Def_UniversalGameRecType_31,

                                Def_UniversalGameRecType_32,              

                                Def_UniversalGameRecType_ManorWarInfo,  # 领地争夺战占领结果33

@@ -979,15 +999,15 @@
                                Def_UniversalGameRecType_40,

                                Def_UniversalGameRecType_RedPacketRecord,   # 红包产出结果记录41

                                Def_UniversalGameRecType_42,

                                Def_UniversalGameRecType_MergeEvent, # 跨服玩家数据变更事件信息43

                                Def_UniversalGameRecType_MergePKAwardRecord, # 跨服PK奖励领取记录44

                                Def_UniversalGameRecType_MergePKTopPlayerEquip, # 跨服PK赛高手玩家装备预览信息45

                                Def_UniversalGameRecType_MergePKScoreAward, # 跨服PK积分领奖记录46

                                Def_UniversalGameRecType_MergeKingBattleRecord, # 跨服王者争霸对战信息47

                                Def_UniversalGameRecType_MergeKingBattleRecordLast, # 跨服王者争霸上一期对战信息48

                                Def_UniversalGameRecType_MergeKingSupportRecord, # 跨服王者争霸支持押注信息49

                                Def_UniversalGameRecType_MergeKingTopPlayerEquip, # 跨服王者争霸高手玩家装备预览信息50

                                Def_UniversalGameRecType_MergePKUnNotifyOver, # 跨服PK未同步的PK结果51

                                Def_UniversalGameRecType_43,

                                Def_UniversalGameRecType_44,

                                Def_UniversalGameRecType_45,

                                Def_UniversalGameRecType_46,

                                Def_UniversalGameRecType_47,

                                Def_UniversalGameRecType_48,

                                Def_UniversalGameRecType_49,

                                Def_UniversalGameRecType_50,

                                Def_UniversalGameRecType_51,

                                Def_UniversalGameRecType_52,

                                Def_UniversalGameRecType_53,

                                Def_UniversalGameRecType_54,

@@ -1014,13 +1034,10 @@


# 客户端不可查看的自定义表类型                               

Def_Confidential_UniversalRecList = (

                                     Def_UniversalGameRecType_MergeRegister, # 上传数据报名信息12

                                     Def_UniversalGameRecType_FamilyWarMember, # 盟联赛参赛人员记录70

                                     )                               

# 只同步自身数据的类型 {类型:自身数据最大条数, ...} , 自身数据最大条数-1时代表自身全部数据; 这里的数据Value1固定为playerID

Def_Sync_UniversalRecSelfDict = {

                                 Def_UniversalGameRecType_MergePKAwardRecord:1,

                                 Def_UniversalGameRecType_MergeKingSupportRecord:-1,

                                 }



#家族行为类型 在GameServer.ChConfig.ActionTypeSaveCnt 中配置最高存储条数

@@ -1102,7 +1119,8 @@
Def_Campaign_Type_RuneLV,           # 符印等级排行 7

Def_Campaign_Type_GodWeaponLV,      # 神兵等级排行 8

Def_Campaign_Type_Recharge,         # 累计充值排行 9

) = range(1, 1 + 9)

Def_Campaign_Type_PetLV,            # 灵宠等级排行 10

) = range(1, 1 + 10)



# 活动类型对应的奖励排行榜{活动类型:排行榜, ...}

Def_Campaign_Billboard_Dict = {

@@ -1115,6 +1133,7 @@
                               Def_Campaign_Type_RuneLV:Def_BT_Campaign_RuneLV,

                               Def_Campaign_Type_GodWeaponLV:Def_BT_Campaign_GodWeaponLV,

                               Def_Campaign_Type_Recharge:Def_BT_Campaign_Recharge,

                               Def_Campaign_Type_PetLV:Def_BT_Campaign_PetLV,

                               }



# 活动数据状态

@@ -1178,42 +1197,45 @@
CampType_Evil,       #邪恶(与 Def_ID2Win 一致)

] = range(3)



#跨服匹配PK奖励类型

Def_MergePKAwardTypeList = (

Def_MergePKAward_DayPKCnt, # 0 每日挑战次数奖励

Def_MergePKAward_DayWinCnt, # 1 每日胜利次数奖励

Def_MergePKAward_SeasonGrade, # 2 赛季晋级奖励

Def_MergePKAward_SeasonRank, # 3 赛季排名奖励

Def_MergePKAward_FirstWinCnt, # 4 首次胜利次数奖励

) = range(5)

# 跨服服务器发送子服信息定义

CrossServerMsg_CrossServerState = "CrossServerState"    # 跨服服务器状态变更

CrossServerMsg_ExitCrossServer = "ExitCrossServer"      # 退出跨服服务器

CrossServerMsg_Notify = "Notify"                        # 提示信息

CrossServerMsg_ChatCrossWorld = "ChatCrossWorld"        # 跨服世界聊天

CrossServerMsg_ViewPlayerCacheRet = "ViewPlayerCacheRet"# 查看跨服玩家信息结果

CrossServerMsg_PKMatchReqRet = "PKMatchReqRet"          # 跨服PK匹配请求结果

CrossServerMsg_PKMatchResult = "PKMatchResult"          # 跨服PK匹配结果

CrossServerMsg_PKReadyOKRoomList = "PKReadyOKRoomList"  # 跨服PK已准备好的房间列表

CrossServerMsg_PKTimeoutRoomList = "PKTimeoutRoomList"  # 跨服PK已超时的房间列表

CrossServerMsg_PKOverInfo = "PKOverInfo"                # 跨服PK结果

CrossServerMsg_PKSeasonInfo = "PKSeasonInfo"            # 跨服PK赛季信息

CrossServerMsg_PKSyncBillboard = "PKSyncBillboard"      # 跨服PK同步排行榜 
CrossServerMsg_CrossBossInfo = "CrossBossInfo"          # 跨服Boss信息

CrossServerMsg_CrossBossState = "CrossBossState"        # 跨服Boss状态

CrossServerMsg_PutInItem = "PutInItem"                  # 获得物品

CrossServerMsg_GiveMoney = "GiveMoney"                  # 获得货币

CrossServerMsg_DropGoodItem = "DropGoodItem"            # 掉落好物品

CrossServerMsg_RebornRet = "RebornRet"                  # 复活结果

CrossServerMsg_NPCInfoRet = "NPCInfoRet"                # 跨服地图NPC信息

CrossServerMsg_CollectNPCOK = "CollectNPCOK"            # 采集NPC完成



#跨服战战斗状态

(

Def_NotBegin, #还没开始 
Def_ID1Win, #第一个玩家胜利(与CampType_Justice一致)

Def_ID2Win, #第二个玩家胜利(与CampType_Evil一致)

Def_Battling, #正在战斗中

Def_BattleReady, #押注中

) = range(5)

# 子服发送跨服信息定义

ClientServerMsg_ServerInitOK = "ServerInitOK"           # 子服启动成功

ClientServerMsg_ChatCrossWorld = "ChatCrossWorld"       # 跨服世界聊天

ClientServerMsg_GMCMD = "GMCMD"                         # GM命令

ClientServerMsg_ViewPlayerCache = "ViewPlayerCache"     # 查看跨服玩家信息

ClientServerMsg_PKMatch = "PKMatch"                     # 跨服PK匹配

ClientServerMsg_PKCancel = "PKCancel"                   # 跨服PK取消匹配

ClientServerMsg_PKPrepareOK = "PKPrepareOK"             # 跨服PK准备完毕

ClientServerMsg_PKBillboard = "PKBillboard"             # 跨服PK排行榜

ClientServerMsg_Reborn = "Reborn"                       # 复活

ClientServerMsg_QueryNPCInfo = "QueryNPCInfo"           # 查询跨服地图NPC信息

ClientServerMsg_SetPlayerAttrValue = "SetPlayerAttrValue" # 玩家属性数值更新

ClientServerMsg_CollectNPC = "CollectNPC"               # 采集NPC



# 跨服赛(跨服服务器)上传数据状态

(

Def_MergeRegisterState_None,  #空闲

Def_MergeRegisterState_Start,  #开始上传

Def_MergeRegisterState_Err,  # 上传出错

Def_MergeRegisterState_Success,  #上传成功

Def_MergeRegisterState_Request,  #请求跨服, 比开始上传还早的一步，先通过请求，才开始上传

) = range(5)



# 跨服活动类型

(

Def_MergeAction_MergeWar,  # 万国战

Def_MergeAction_WarOfHonour,  # 荣耀之战(跨服混战)

Def_MergeAction_Boss,  # 跨服boss

Def_MergeAction_MergePK,  # 跨服匹配PK

Def_MergeAction_MergeKing,  # 跨服王者争霸

Def_MergeAction_TypeMax,  # 类型数

) = range(6)

#跨服广播类型定义

CrossNotify_World = "World"

CrossNotify_Family = "Family"



#角色改名结果

(

@@ -1262,7 +1284,8 @@
Def_IudetRuneSource = 40  # 符印来源 老号0,默认1，合成2(主要用来区分是否合成获得)

Def_IudetWingProgressValue = 42 #羽翼精炼值

Def_IudetCreateTime = 44 # 时效物品的创建时间



Def_IudetGatherSoulLV = 46  # 聚魂等级

Def_IudetExpireTime = 48 # 时效物品指定有效时间，时间单位由时效类型决定

# 200~300 宠物数据用

Def_IudetPet_NPCID = 200  # npcID

Def_IudetPet_ClassLV = 202  # 阶级

@@ -1305,9 +1328,7 @@
ScoreType_NewGuySuperShow,  # 击杀怪物统计

ScoreType_GetItem,  # 获得物品奖励统计

ScoreType_RedFortReward,  # 打开客户端frmRedFortReward

ScoreType_MergeBoss,  # 跨服boss界面

ScoreType_MergePK,  # 跨服匹配PK结算

)=range(7)

)=range(5)



ScoreTypeName = "TScore"



@@ -1326,7 +1347,7 @@
)=range(5)



# 战斗力模块类型

Def_MFPType_Max = 25

Def_MFPType_Max = 28

ModuleFightPowerTypeList = (

Def_MFPType_Role, # 角色 0

Def_MFPType_Equip, # 装备(基本装备位) 1

@@ -1350,6 +1371,9 @@
Def_MFPType_HorseSoul, # 坐骑魂石 19

Def_MFPType_MagicWeaponSoul, # 法宝之魂 20

Def_MFPType_Dogz, # 神兽 21

Def_MFPType_GatherSoul, # 聚魂 22

Def_MFPType_MagicWeapon4, # 王者法宝 23

Def_MFPType_Coat, # ʱװ 24

Def_MFPType_Other, # 其他



#以下暂时没用到，改时再处理

@@ -1501,7 +1525,9 @@
DailyActionID_KillNPC, # 野外怪物

DailyActionID_IceLode, # 冰晶矿脉

DailyActionID_HelpBattleCheckIn, # 助战登记  20

) = range(1, 20 + 1)

DailyActionID_CrossReamPK, # 跨服PK  21

DailyActionID_ZhuXianBoss, # 诛仙BOSS  22

) = range(1, 22 + 1)







@@ -1639,7 +1665,9 @@
SuccType_DogzBattle, #x神兽出战129

SuccType_DogzEquipPlus, #出战神兽装备总强化X级130

SuccType_Collect, #采集X物品X次131

) = range(1, 132)

SuccType_InlayGatherSoul, #镶嵌X枚X品质聚魂（不包含核心）132

SuccType_GatherSoulLvUp, #累计聚魂总等级XX（不包含核心）133

) = range(1, 134)







@@ -1668,7 +1696,7 @@
NeedResetSuccessTypeList = [

                            SuccType_InlayStone1,SuccType_InlayStone2,SuccType_EquipSuit,SuccType_InlayRune,

                            SuccType_EquipColorItem,SuccType_EquipArmor,SuccType_EquipWeapon,SuccType_DogzEquipPlus,

                            SuccType_HorseAllLV, SuccType_EquipPlusLV,SuccType_PetClassLV,

                            SuccType_HorseAllLV, SuccType_EquipPlusLV,SuccType_PetClassLV,SuccType_InlayGatherSoul,

                            ]



# 聊天类型, 从100开始, 前100个给c++用

@@ -1703,8 +1731,11 @@
    retBaldric5,     #17 佩饰

    retBaldric6,     #18 佩饰

    retHorse,        #19 坐骑

    retWeaponSkin,   #20 时装武器

    retClothesSkin,  #21 时装衣服

    retWeapon2Skin,  #22 时装副手

    retMax,

) = range(1, 21)

) = range(1, 24)





# 神兽装备位定义

@@ -1715,6 +1746,22 @@
    dogzetClaw,     # 神兽兽爪

    dogzetScute,    # 神兽鳞甲

) = range(101, 101 + 5)



# 诛仙装备位定义

ZhuXianEquipPlace = (

    zxetCloak,      # 诛仙披风 121

    zxetMask,       # 诛仙面具 122

    zxetGlove,      # 诛仙手套 123

    zxetGlove2,     # 诛仙手套 124

    zxetRuyi,       # 诛仙如意 125

    zxetPendant,    # 诛仙吊坠 126

    zxetRing,       # 诛仙戒指 127

    zxetRing2,      # 诛仙戒指 128

    zxetWeapon1,    # 诛仙剑1 129

    zxetWeapon2,    # 诛仙剑2 130

    zxetWeapon3,    # 诛仙剑3 131

    zxetWeapon4,    # 诛仙剑4 132

) = range(121, 121 + 12)





# 请求进入副本通用检查结果，优先提示的放前面(即索引越大，提示优先级越低)

@@ -1733,9 +1780,11 @@
    EntFBAskRet_InFB,           # 11 副本中

    EntFBAskRet_TJG,            # 12 脱机挂中

    EntFBAskRet_Sit,            # 13 打坐中

    EntFBAskRet_CrossPKMatching,# 14 跨服匹配中

    EntFBAskRet_InCrossMap,     # 15 跨服地图中

    EntFBAskRet_Other,          # xx 其他限制

    EntFBAskRet_Max,

) = range(16)

) = range(18)





#增加仙盟活跃的活动类型