From 2b3d5e31bafd7a9cd4b4738e38186ffed4cee5f6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 12 十一月 2019 16:58:20 +0800
Subject: [PATCH] 1111 装备评分公式增加参数(FinalHurt、FinalHurtReduce)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   78 +++++++++++++++++++++++++++++++++-----
 1 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index bb724e6..1c964a5 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -167,8 +167,10 @@
 Def_Notify_WorldKey_FamilyBossOpenCount = "FamilyBossOpenCount"  # 仙盟boss开启次数
 
 Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo"  # 仙盟宴会数据
+Def_Notify_WorldKey_FamilyPartyAddFamilyActivity = "FamilyPartyAddFamilyActivity"  # 仙盟宴会地图成员增加仙盟活跃令
 
 Def_Notify_WorldKey_AddFamilyAuctionItem = "AddFamilyAuctionItem"  # 添加仙盟拍品
+Def_Notify_WorldKey_AddSystemAuctionItem = "AddSystemAuctionItem"  # 添加系统拍品
 
 Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState"  # 跨服服务器链接状态
 Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen"  # 跨服服务器是否开启中
@@ -325,9 +327,9 @@
 #增加%d体魄
 Def_Effect_CON = 4 
 #增加HP
-Def_Effect_MaxHP = 6 
+Def_Effect_MaxHP = 6
 #增加%d伤害值(物理和魔法的最大/小),只用到a值
-Def_Effect_Atk = 7 
+Def_Effect_Atk = 7
 #增加%d防御值
 Def_Effect_Def = 8 
 #命中(A值为具体值)
@@ -365,9 +367,9 @@
 #宠物伤害比例提升(A值万分率)
 Def_Effect_PetDamPer = 25
 #冰攻(A值为具体值) 真实伤害元素攻击, 无视防御, 只有元素防御可以减免伤害, 此项目用冰元素代替
-Def_Effect_IceAtk = 26 
+Def_Effect_IceAtk = 26
 #冰防(A值为具体值) 真实抵抗元素抵抗, 减免元素攻击造成的伤害, 此项目用冰元素代替
-Def_Effect_IceDef = 27 
+Def_Effect_IceDef = 27
 #无视防御几率提升
 Def_Effect_IgnoreDefRate = 28 
 #无视防御抗性, 受击时减少对方的无视防御属性
@@ -507,6 +509,29 @@
 Def_Effect_JobBAtkReducePer = 94 # 法师攻击伤害减免
 Def_Effect_JobCAtkReducePer = 95 # 弓箭攻击伤害减免
 
+Def_Effect_SkillAddPer1 = 102 # 技能伤害增强1
+Def_Effect_SkillAddPer2 = 103 # 技能伤害增强2
+Def_Effect_SkillAddPer3 = 104 # 技能伤害增强3
+Def_Effect_SkillAddPer4 = 105 # 技能伤害增强4
+Def_Effect_SkillAddPer5 = 106 # 技能伤害增强5
+Def_Effect_SkillAddPer6 = 107 # 技能伤害增强6
+Def_Effect_SkillAddPer7 = 108 # 技能伤害增强7
+
+Def_Effect_SkillReducePer1 = 109 # 受到技能伤害减少1
+Def_Effect_SkillReducePer2 = 110 # 受到技能伤害减少2
+Def_Effect_SkillReducePer3 = 111 # 受到技能伤害减少3
+Def_Effect_SkillReducePer4 = 112 # 受到技能伤害减少4
+Def_Effect_SkillReducePer5 = 113 # 受到技能伤害减少5
+Def_Effect_SkillReducePer6 = 114 # 受到技能伤害减少6
+Def_Effect_SkillReducePer7 = 115 # 受到技能伤害减少7
+
+## 技能伤害百分比增加的 属性ID 列表
+SkillAddPerAttrIDList = [Def_Effect_SkillAddPer1, Def_Effect_SkillAddPer2, Def_Effect_SkillAddPer3, Def_Effect_SkillAddPer4, 
+                         Def_Effect_SkillAddPer5, Def_Effect_SkillAddPer6, Def_Effect_SkillAddPer7]
+## 技能伤害百分比减少的 属性ID 列表
+SkillReducePerAttrIDList = [Def_Effect_SkillReducePer1, Def_Effect_SkillReducePer2, Def_Effect_SkillReducePer3, Def_Effect_SkillReducePer4, 
+                            Def_Effect_SkillReducePer5, Def_Effect_SkillReducePer6, Def_Effect_SkillReducePer7]
+    
 Def_Effect_Luck = 120 # 气运
 Def_Effect_LuckPer = 133 # 气运百分率
 
@@ -526,6 +551,8 @@
 Def_Effect_BurnValue = 146    # 灼烧固定伤害
 Def_Effect_BurnTimePer = 147    # 延长灼烧时间百分比
 Def_Effect_SubSpeedPer = 148    # 减移动速度百分比
+
+Def_Effect_ReduceSkillCDPer = 149   # 减少技能CD, a值为万分率
 
 #增加%d物理伤害值,其中a值为伤害值
 Def_Effect_AddAtk = 1005
@@ -619,9 +646,10 @@
     
     Def_BT_NewFCCostGold,                     #消费排行榜(新仙界盛典)
     Def_BT_Campaign_LingGen,                  #灵根总点(开服活动榜)
+    Def_BT_Campaign_StarLV,                   #升星等级(开服活动榜) 25
     
     Def_BT_Max,                               #排行榜最大类型
-) = range(0, 24 + 2) 
+) = range(0, 25 + 2) 
     
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -836,7 +864,22 @@
 CDBPlayerRefresh_FinalHurtReducePer,   # 最终伤害减少百分比 
 CDBPlayerRefresh_YinjiTime,   # 每X秒减少印记时间,毫秒
 CDBPlayerRefresh_YinjiCnt,   # 当前印记数 214
-) = range(146, 215)
+CDBPlayerRefresh_SkillAddPer1,   # 技能伤害增强1 215
+CDBPlayerRefresh_SkillAddPer2,   # 技能伤害增强2
+CDBPlayerRefresh_SkillAddPer3,   # 技能伤害增强3
+CDBPlayerRefresh_SkillAddPer4,   # 技能伤害增强4
+CDBPlayerRefresh_SkillAddPer5,   # 技能伤害增强5
+CDBPlayerRefresh_SkillAddPer6,   # 技能伤害增强6 220
+CDBPlayerRefresh_SkillAddPer7,   # 技能伤害增强7
+CDBPlayerRefresh_SkillReducePer1,   # 受到技能伤害减少1
+CDBPlayerRefresh_SkillReducePer2,   # 受到技能伤害减少2
+CDBPlayerRefresh_SkillReducePer3,   # 受到技能伤害减少3
+CDBPlayerRefresh_SkillReducePer4,   # 受到技能伤害减少4 225
+CDBPlayerRefresh_SkillReducePer5,   # 受到技能伤害减少5
+CDBPlayerRefresh_SkillReducePer6,   # 受到技能伤害减少6
+CDBPlayerRefresh_SkillReducePer7,   # 受到技能伤害减少7
+CDBPlayerRefresh_ExAttr17,          # ExAttr17 
+) = range(146, 230)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -904,6 +947,7 @@
 GameFuncID_Friend = 73          # 好友
 GameFuncID_SignDay = 81         # 签到
 GameFuncID_RefineStove = 87     # 炼丹炉
+GameFuncID_EquipWash = 91       # 洗练
 GameFuncID_Treasure = 99        # 寻宝
 GameFuncID_FirstGoldTip = 128      # 首充优势提示
 GameFuncID_EquipDecompose = 123 # 装备分解
@@ -1019,8 +1063,8 @@
                                 Def_UniversalGameRecType_27,
                                 Def_UniversalGameRecType_28,
                                 Def_UniversalGameRecType_BossInfo,  # boss信息29
-                                Def_UniversalGameRecType_CrossBossInfo,  # 跨服boss信息
-                                Def_UniversalGameRecType_31,
+                                Def_UniversalGameRecType_CrossBossInfo,  # 跨服boss信息 30
+                                Def_UniversalGameRecType_BossFirstKill, # boss首杀 31
                                 Def_UniversalGameRecType_32,              
                                 Def_UniversalGameRecType_33,
                                 Def_UniversalGameRecType_34,
@@ -1144,7 +1188,8 @@
 Def_Campaign_Type_Recharge,         # 累计充值排行 9
 Def_Campaign_Type_PetLV,            # 灵宠等级排行 10
 Def_Campaign_Type_LingGen,          # 灵根点数排行 11
-) = range(1, 1 + 11)
+Def_Campaign_Type_StarLV,           # 升星等级排行 12
+) = range(1, 1 + 12)
 
 # 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
 Def_Campaign_Billboard_Dict = {
@@ -1159,6 +1204,7 @@
                                Def_Campaign_Type_Recharge:Def_BT_Campaign_Recharge,
                                Def_Campaign_Type_PetLV:Def_BT_Campaign_PetLV,
                                Def_Campaign_Type_LingGen:Def_BT_Campaign_LingGen,
+                               Def_Campaign_Type_StarLV:Def_BT_Campaign_StarLV,
                                }
 
 #队伍最大人数
@@ -1207,7 +1253,7 @@
 ClientServerMsg_GMCMD = "GMCMD"                         # GM命令
 ClientServerMsg_ViewPlayerCache = "ViewPlayerCache"     # 查看跨服玩家信息
 ClientServerMsg_PKMatch = "PKMatch"                     # 跨服PK匹配
-ClientServerMsg_PKScore = "PKScore"                     # 跨服PK同步积分到跨服服务器(某些情况会在本服加积分,如与机器人PK)
+ClientServerMsg_PKRobotOver = "PKRobotOver"             # 跨服PK机器人结算
 ClientServerMsg_PKCancel = "PKCancel"                   # 跨服PK取消匹配
 ClientServerMsg_PKPrepareOK = "PKPrepareOK"             # 跨服PK准备完毕
 ClientServerMsg_PKBillboard = "PKBillboard"             # 跨服PK排行榜
@@ -1255,6 +1301,14 @@
 Def_IudetWingMaterialItemCount = 29  # 翅膀精炼材料个数列表
 Def_IudetDogzEquipPlus = 31  # 神兽装备强化信息列表 [强化等级, 累计总熟练度]
 Def_IudetItemDecompound = 33  # 拆解返还物品列表 [装备ID,材料1ID,个数,是否绑定,材料2ID,个数,是否绑定,...]
+Def_IudetLiantaiItemID = 35  # 合成该莲台的所有莲台ID [itemID, itemID, ...]
+Def_IudetAddSkillID = 37  # 可添加的技能ID列表  [skillID, skillID, ...]
+Def_IudetLegendAttrIDShen = 51  # 物品传奇属性ID列表 - 神
+Def_IudetLegendAttrValueShen = 61  # 物品传奇属性值列表 - 神
+Def_IudetLegendAttrIDXian = 53  # 物品传奇属性ID列表 - 仙
+Def_IudetLegendAttrValueXian = 63  # 物品传奇属性值列表 - 仙
+Def_IudetLegendAttrIDJi = 55  # 物品传奇属性ID列表 - 极
+Def_IudetLegendAttrValueJi = 65  # 物品传奇属性值列表 - 极
 
 Def_IudetItemColor = 16  # 物品颜色,如果该值没有就取物品
 Def_IudetItemCount = 18  # 物品个数,支持20亿,目前仅特殊转化物品会用到
@@ -1441,7 +1495,9 @@
 DailyActionID_AuctionItem, # 拍卖行上架/竞拍  26
 DailyActionID_LeiFaBoss, # 雷罚boss 27
 DailyActionID_CrossPenglai, # 跨服蓬莱仙境Boss 28
-) = range(1, 28 + 1)
+DailyActionID_FamilyChuanGong, # 仙盟传功 29
+DailyActionID_FamilyParty, # 仙盟宴会 30
+) = range(1, 30 + 1)
 
 
 

--
Gitblit v1.8.0