From ccde2a158d4081738aa3d1c131b92627fac2673b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 21 六月 2019 10:53:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 92ffc4b..78e8124 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -168,6 +168,8 @@
Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo" # 仙盟宴会数据
+Def_Notify_WorldKey_AddFamilyAuctionItem = "AddFamilyAuctionItem" # 添加仙盟拍品
+
Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState" # 跨服服务器链接状态
Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen" # 跨服服务器是否开启中
Def_Notify_WorldKey_CrossZoneName = "CrossZoneName" # 跨服分区名
@@ -272,7 +274,8 @@
Def_ViewExpType_Sys , #系统给经验-需要展示倍率，实际不享受 5
Def_ViewExpType_RealmBuff, #境界全服福利经验(玄女天花) 6
Def_ViewExpType_SysEx, #系统给经验-不需要展示倍率 用来区别于类型0 7
-) = range(0, 8)
+ Def_ViewExpType_LYZS, #烈焰战神 特殊特效
+) = range(0, 9)
#物品相关操作类型
@@ -558,8 +561,6 @@
Def_Effect_AddMAtk = 20020
#增加内防
Def_Effect_MagicDef = 20001
-#暴击率抗性(A值为万分率, 永恒为具体数值)
-Def_Effect_SuperHitRateReduce = 20030
#减技能CD（A值固定值）
Def_Effect_ReduceSkillCD = 20031
# 卓越一击倍数(a值为万分率，直接加上)
@@ -645,9 +646,10 @@
Def_BT_Campaign_PetLV, #灵宠等级(开服活动榜)
Def_BT_NewFCCostGold, #消费排行榜(新仙界盛典)
+ Def_BT_Campaign_LingGen, #灵根总点(开服活动榜)
Def_BT_Max, #排行榜最大类型
-) = range(0, 23 + 2)
+) = range(0, 24 + 2)
#职业对应战力排行榜类型
JobFightPowerBillboardDict = {
@@ -1171,7 +1173,8 @@
Def_Campaign_Type_GodWeaponLV, # 神兵等级排行 8
Def_Campaign_Type_Recharge, # 累计充值排行 9
Def_Campaign_Type_PetLV, # 灵宠等级排行 10
-) = range(1, 1 + 10)
+Def_Campaign_Type_LingGen, # 灵根点数排行 11
+) = range(1, 1 + 11)
# 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
Def_Campaign_Billboard_Dict = {
@@ -1185,6 +1188,7 @@
Def_Campaign_Type_GodWeaponLV:Def_BT_Campaign_GodWeaponLV,
Def_Campaign_Type_Recharge:Def_BT_Campaign_Recharge,
Def_Campaign_Type_PetLV:Def_BT_Campaign_PetLV,
+ Def_Campaign_Type_LingGen:Def_BT_Campaign_LingGen,
}
#队伍最大人数
@@ -1275,8 +1279,6 @@
Def_IudetMapLoaction = 15 # 物品记录地图坐标[mapid, posx, posy]
Def_IudetLegendAttrID = 17 # 物品传奇属性ID列表
Def_IudetLegendAttrValue = 19 # 物品传奇属性值列表
-Def_IudetOutOfPrintAttrID = 21 # 物品绝版属性ID列表
-Def_IudetOutOfPrintAttrValue = 23 # 物品绝版属性值列表
Def_IudetPartSuiteLV = 25 # 部位套装等级 [套装类型1等级, 套装类型2等级, ...]
Def_IudetWingMaterialItemID = 27 # 翅膀精炼材料ID列表
Def_IudetWingMaterialItemCount = 29 # 翅膀精炼材料个数列表
@@ -1344,7 +1346,7 @@
Def_MFPType_Plus, # 强化 2
Def_MFPType_Stone, # 宝石 3
Def_MFPType_LingGen, # 灵根 4
-Def_MFPType_Wing, # 翅膀 5
+Def_MFPType_LingQi, # 灵器 5
Def_MFPType_Wash, # 洗练 6
Def_MFPType_Pet, # 灵宠 7
Def_MFPType_Horse, # 坐骑 8
@@ -1463,7 +1465,9 @@
DailyActionID_SkyTower, # 天星塔 23
DailyActionID_HorsePetBoss, # 骑宠BOSS 24
DailyActionID_FairyDomain, # 缥缈仙域 25
-) = range(1, 25 + 1)
+DailyActionID_AuctionItem, # 拍卖行上架/竞拍 26
+DailyActionID_LeiFaBoss, # 雷罚boss 27
+) = range(1, 27 + 1)
--
Gitblit v1.8.0