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 |  612 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 315 insertions(+), 297 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 7dbdb73..1c964a5 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -132,6 +132,7 @@
 Def_Notify_WorldKey_IsMixServer = 'IsMixServer'           # 是否合服服务器
 Def_Notify_WorldKey_MixServerDay = 'MixServerDay'         # 合服天数
 Def_Notify_WorldKey_LastMixServerDay = 'LastMixServerDay' # 上次合服时的开服天数
+Def_Notify_WorldKey_LastMixServerWorldLV = 'LastMixServerWorldLV' # 上次合服时的世界等级
 Def_Notify_WorldKey_OnDayEx = 'OnDayEx'                   # 特殊时间点凌晨X点过天
 Def_Notify_WorldKey_OnWeekEx = 'OnWeekEx'                 # 特殊时间点凌晨X点过周
 Def_Notify_WorldKey_OnMonthEx = 'OnMonthEx'               # 特殊时间点凌晨X点过月
@@ -166,16 +167,18 @@
 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"  # 跨服服务器是否开启中
+Def_Notify_WorldKey_CrossZoneName = "CrossZoneName"  # 跨服分区名
 
 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_GameWorldBossRebornCross = 'BossRebornCross_%s_%s'   # 跨服世界boss重生, 参数为(zoneID, bossID)
 Def_Notify_WorldKey_GameWorldBossReborn = 'BossReborn_%s'   # 世界boss重生, 参数为(bossID)
@@ -189,35 +192,9 @@
 
 Def_Notify_WorldKey_FamilyActivityDayState = "FamilyActivityDayState"  #战盟相关活动今日开启状态, 按位存储代表今日是否开启过
 
-Def_Notify_WorldKey_ManorWar = 'ManorWar'               # 领地争夺活动状态
-Def_Notify_WorldKey_ManorWarWinFamilyID = 'ManorWarWinFamilyID_%s'  # 领地争夺获胜战盟id,%s地图id
-Def_Notify_WorldKey_ManorWarFamilyLeaderID = 'ManorWarFamilyLeaderID_%s'  # 领地争夺占领的战盟盟主id,%s地图id
-Def_Notify_WorldKey_ManorWarTempFamilyID = 'ManorWarTempFamilyID_%s'  # 领地争夺活动中临时占领的战盟id,%s地图id
-Def_Notify_WorldKey_ManorWarLastFamilyID = 'ManorWarLastFamilyID_%s'  # 领地争夺上次占领的战盟id,%s地图id
-Def_Notify_WorldKey_ManorWarServerDay = 'ManorWarServerDay' # 领地战活动时的开服天数
-
-Def_Notify_WorldKey_DayAction_ID = "%s_ID" # 按天开启的活动唯一id,参数为活动标识key
-Def_Notify_WorldKey_DayAction_BeginTime = "%s_BT" # 按天开启的活动开始时间,参数为活动标识key
-Def_Notify_WorldKey_DayAction_EndTime = "%s_ET" # 按天开启的活动结束时间,参数为活动标识key
-Def_Notify_WorldKey_DayAction_ClassUPNum = "DA_ClassUPNum" # 按天开启的活动标识key - 升阶特惠活动编号
-Def_Notify_WorldKey_DayAction_Recharge = "DA_Recharge" # 按天开启的活动标识key - 充值特惠
-Def_Notify_WorldKey_DayAction_DiscountShop = "DA_DiscountShop" # 按天开启的活动标识key - 折扣店
-Def_Notify_WorldKey_DayAction_RechargeRank = "DA_RechargeRank" # 按天开启的活动标识key - 充值排行榜特惠
-Def_Notify_WorldKey_DayAction_MixDiscountShop = "DA_MixDiscountShop" # 按天开启的活动标识key - 合服折扣店
-Def_Notify_WorldKey_DayAction_CostProfit = "DA_CostProfit" # 按天开启的活动标识key - 消费返利
-Def_Notify_WorldKey_DayAction_CostRank = "DA_CostRank" # 按天开启的活动标识key - 消费特惠排行榜
-
-Def_Notify_WorldKey_ShopState = 'ShopState_%s'               # 自定义商店开启状态, 参数为ShopID
-Def_Notify_WorldKey_TimeShopRefreshTime = 'TimeShopRefreshTime_%s'  # 定时商店上次全服刷新时间
-Def_Notify_WorldKey_ActionBuffState = 'ActionBuffState_%s'   # 活动玩家buff状态, 1-可加,0-不可添加; 参数为buffID
-
-Def_Notify_WorldKey_LoginAwardStartDate = 'LoginAwardStartDate_%s'   # 登录领取奖励开始时间,参数为活动类型
-Def_Notify_WorldKey_LoginAwardEndDate = 'LoginAwardEndDate_%s'   # 登录领取奖励结束时间,参数为活动类型
-
-Def_Notify_WorldKey_ClearBillboardSign = 'ClearBillboardSign'  # 清除排行榜标记
-
 Def_Notify_WorldKey_RedPacketOutput = 'RedPacketOutput'  # 红包产出信息
-
+Def_Notify_WorldKey_HurtLog = 'HurtLog'  # 战斗伤害日志
+Def_Notify_WorldKey_FairyDomainLimit = "FairyDomainLimit"  # 缥缈仙域限制事件
 #运营活动表名定义
 OperationActionName_ExpRate = "ActExpRate" # 多倍经验活动
 OperationActionName_CostRebate = "ActCostRebate" # 消费返利活动
@@ -225,19 +202,34 @@
 OperationActionName_BossReborn = "ActBossReborn" # BOSS复活活动
 OperationActionName_FlashGiftbag = "ActFlashGiftbag" # 限时礼包活动
 OperationActionName_FairyCeremony = "ActFairyCeremony" # 仙界盛典活动
+OperationActionName_NewFairyCeremony = "ActNewFairyCeremony" # 仙界盛典活动
 OperationActionName_RealmPoint = "ActRealmPoint" # 多倍修行点活动
 OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动
 OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动
 OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
 OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动
+OperationActionName_LoginAward = "ActLoginAward" # 登录奖励活动
+OperationActionName_FeastWeekParty = "ActFeastWeekParty" # 节日巡礼狂欢活动
+OperationActionName_FeastRedPacket = "ActFeastRedPacket" # 节日红包活动
+OperationActionName_FeastCollectWords = "ActFeastCollectWords" # 节日集字活动
+OperationActionName_LuckyTreasure = "ActLuckyTreasure" # 幸运鉴宝活动
+#节日活动类型列表 - 该类型无视开服天,日期到了就开启
+FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket, OperationActionName_FeastCollectWords]
+#所有的运营活动列表,含节日活动
 OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate, 
                            OperationActionName_BossReborn,OperationActionName_SpringSale, 
                            OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
                            OperationActionName_RealmPoint, OperationActionName_FlashSale,
                            OperationActionName_WishingWell, OperationActionName_TotalRecharge, 
-                           OperationActionName_WeekParty, ]
+                           OperationActionName_WeekParty, OperationActionName_LoginAward, 
+                           OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure] \
+                           + FeastOperationActionNameList
 #需要记录开启活动时的世界等级的运营活动
-NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell]
+NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell, 
+                                   OperationActionName_NewFairyCeremony, OperationActionName_FlashSale,
+                                   OperationActionName_BossReborn, OperationActionName_TotalRecharge,
+                                   OperationActionName_CostRebate, OperationActionName_FlashGiftbag,
+                                   OperationActionName_SpringSale, OperationActionName_LuckyTreasure]
 
 #活动信息字典key定义
 ActKey_ID = "ID" # 活动ID,唯一标识的ID,一般是活动开启的time值
@@ -245,6 +237,7 @@
 ActKey_CfgID = "CfgID" # 活动表配置ID
 ActKey_DayIndex = "DayIndex" # 活动表配置ID
 ActKey_WorldLV = "WorldLV" # 活动开启时世界等级
+ActKey_WorldLVList = "WorldLVList" # 活动每天的世界等级列表
 
 #答题类型枚举
 Def_Game_ExamTypeList = range(1, 4 + 1)
@@ -281,7 +274,10 @@
     Def_ViewExpType_Sit        ,            #打坐获取经验 3
     Def_ViewExpType_KillNPCSuper,           #杀怪获得经验暴击 4
     Def_ViewExpType_Sys        ,            #系统给经验-需要展示倍率,实际不享受 5
-) = range(0, 6)
+    Def_ViewExpType_RealmBuff,              #境界全服福利经验(玄女天花) 6
+    Def_ViewExpType_SysEx,                  #系统给经验-不需要展示倍率 用来区别于类型0 7
+    Def_ViewExpType_LYZS,                   #烈焰战神 特殊特效
+) = range(0, 9)
 
 
 #物品相关操作类型
@@ -293,7 +289,7 @@
     Def_mitProduceResult,     # 生产采集结果回应
     Def_mitPetEquipMerge,     # 宠物装备合成回应
     Def_mitEquipInherit,      # 装备继承
-    Def_mitEquipPlus,         # 装备加强
+    Def_mitEquipStarUp,       # 装备升星
     Def_mitEquipMayaPlus,     # 装备玛雅加强
     Def_mitEquipAddAttr,      # 装备追加
     Def_mitEquipSlotting,     # 装备打孔
@@ -316,48 +312,54 @@
 Def_SkillID_AutoTruck = 62220   # 自动运镖buff
 
 #---写死的物品属性效果ID---
+Def_Effect_FreePoint = 200 # 自由灵根,注意此属性ID不能在刷属性中加,只能在某个功能中一次性处理
+Def_Effect_Metal = 201 # 金
+Def_Effect_Wood = 202 # 木
+Def_Effect_Water = 203 # 水
+Def_Effect_Fire = 204 # 火
+Def_Effect_Earth = 205 # 土
 #增加%d力量
-Def_Effect_STR = 2 #1006 
+Def_Effect_STR = 2 
 #增加%d真元
-Def_Effect_PNE = 5 #1009
+Def_Effect_PNE = 5 
 #增加%d筋骨
-Def_Effect_PHY = 3 #1007
+Def_Effect_PHY = 3 
 #增加%d体魄
-Def_Effect_CON = 4 #1008
+Def_Effect_CON = 4 
 #增加HP
-Def_Effect_MaxHP = 6 #20000
+Def_Effect_MaxHP = 6
 #增加%d伤害值(物理和魔法的最大/小),只用到a值
-Def_Effect_Atk = 7 #1087
+Def_Effect_Atk = 7
 #增加%d防御值
-Def_Effect_Def = 8 #1004
+Def_Effect_Def = 8 
 #命中(A值为具体值)
-Def_Effect_Hit = 9 #20012
+Def_Effect_Hit = 9 
 #闪避(A值为具体值)
-Def_Effect_Miss = 10 #20014
+Def_Effect_Miss = 10 
 #攻击速度(A值为具体值)
-Def_Effect_AtkSpeed = 11 #20019
+Def_Effect_AtkSpeed = 11
 #暴击伤害(a值为固定值,直接加上)
-Def_Effect_SuperHit = 13 #20022
-#暴击伤害减免(暴击伤害抗性) A值为万分率
+Def_Effect_SuperHit = 13 
+#暴击伤害减少固定值
 Def_Effect_SuperHitReduce = 14
 #暴击率(A值为万分率, 永恒为具体数值)
-Def_Effect_SuperHitRate = 12 #20013
-# 幸运一击几率, a值为万分率
+Def_Effect_SuperHitRate = 12 
+# 会心一击概率
 Def_Effect_LuckyHitRate = 15
-# 幸运一击倍数(a值为万分率,直接加上)
-Def_Effect_LuckyHit = 16 #20028
+# 会心一击固定伤害
+Def_Effect_LuckyHit = 16
 # 会心一击抗性(抗概率), a值为万分率
 Def_Effect_LuckyHitRateReduce = 17
 # 技能伤害加成 (用作伤害加成)其中a值为增加的万分率
-Def_Effect_SkillAtkRate = 18 #20032
-# 伤害加成, 技能百分比外层
-Def_Effect_DamagePer = 19
-# 伤害吸收(A值为具体值)
-Def_Effect_DamReducePer = 20
+Def_Effect_SkillAtkRate = 18 
+# PVP固定伤害
+Def_Effect_DamagePVP = 19
+# PVP固定减伤
+Def_Effect_DamagePVPReduce = 20
 #生命回复固定值(A值固定值)
 Def_Effect_HPRestore = 21
 #反伤百分比(A值固定值)
-Def_Effect_DamBackPer = 22 #2840
+Def_Effect_DamBackPer = 22 
 #移动速度(A值固定值)
 Def_Effect_Speed = 23
 #宠物攻击(A值固定值)
@@ -365,11 +367,11 @@
 #宠物伤害比例提升(A值万分率)
 Def_Effect_PetDamPer = 25
 #冰攻(A值为具体值) 真实伤害元素攻击, 无视防御, 只有元素防御可以减免伤害, 此项目用冰元素代替
-Def_Effect_IceAtk = 26 #20005
+Def_Effect_IceAtk = 26
 #冰防(A值为具体值) 真实抵抗元素抵抗, 减免元素攻击造成的伤害, 此项目用冰元素代替
-Def_Effect_IceDef = 27 #20010
+Def_Effect_IceDef = 27
 #无视防御几率提升
-Def_Effect_IgnoreDefRate = 28 #20021
+Def_Effect_IgnoreDefRate = 28 
 #无视防御抗性, 受击时减少对方的无视防御属性
 Def_Effect_IgnoreDefRateReduce = 29
 #玩家每次被攻击有20%的几率减少伤害比率
@@ -382,13 +384,13 @@
 Def_Effect_FaintRate = 33
 #有几率使即将受到的眩晕效果不生效
 Def_Effect_FaintDefRate = 34
-# 输出伤害, 对目标攻击造成最终伤害后,再加成一定伤害值
+# 附加伤害
 Def_Effect_FinalHurt = 35
-# 减少承受伤害, 减少被攻击受到的最终伤害的部分伤害值
+# 附加减伤
 Def_Effect_FinalHurtReduce = 36
-# 伤害加成 - PVP, 技能百分比外层
+# PVP技能加成 百分比
 Def_Effect_DamagePerPVP = 37
-# 伤害减少 - PVP
+# PVP技能减免 百分比
 Def_Effect_DamagePerPVPReduce = 38
 # 连击几率(默认100%技能伤害)
 Def_Effect_ComboRate = 39
@@ -406,8 +408,6 @@
 Def_Effect_MissRate = 45 #20026
 #杀怪经验百分比, 百分比增加基础杀怪经验(a值为万分率,直接加上)
 Def_Effect_FightExpRate = 46
-#魂器基础属性百分比
-Def_Effect_HorcruxBasePer = 48
 Def_Effect_SkillAtkRateReduce = 49 #20032
 #增加HP(A值填万分率)
 Def_Effect_MaxHPPer = 50 #20023
@@ -429,25 +429,50 @@
 Def_Effect_StoneMaxHPPer = 58
 #宝石攻击百分比
 Def_Effect_StoneAtkPer = 59
-#装备基础百分比
+#装备基础百分比 - 含特殊装备位
 Def_Effect_EquipBaseAddPer = 60
+#基础装备百分比
+Def_Effect_BaseEquipAddPer = 64
 #冰攻百分比(A值为万分率)
 Def_Effect_IceAtkPer = 61
 #冰防百分比(A值为万分率)
 Def_Effect_IceDefPer = 62
-#防具生命百分比
-Def_Effect_ArmorMaxHPAddPer = 63
-#圣器攻击百分比
-Def_Effect_RelicsAtkAddPer = 64
-#武器攻击百分比
-Def_Effect_WeaponAtkAddPer = 65
-#防具防御百分比
+#基础装备生命百分比
+Def_Effect_BaseEquipMaxHPAddPer = 63
+#基础装备攻击百分比
+Def_Effect_BaseEquipAtkAddPer = 65
+#防具防御百分比 - 废弃
 Def_Effect_ArmorDefAddPer = 66
+#主手基础属性值 百分比
+Def_Effect_WeaponAddPer = 121
+#副手基础属性值 百分比
+Def_Effect_Weapon2AddPer = 122
+#腰带基础属性值 百分比
+Def_Effect_BeltAddPer = 123
+#手套基础属性值 百分比
+Def_Effect_GloveAddPer = 124
+#衣袍基础属性值 百分比
+Def_Effect_ClothesAddPer = 125
+#帽子基础属性值 百分比
+Def_Effect_HatAddPer = 126
+#下装基础属性值 百分比
+Def_Effect_TrousersAddPer = 127
+#鞋履基础属性值 百分比
+Def_Effect_ShoesAddPer = 128
+#仙器A基础属性值 百分比
+Def_Effect_FairyCanAddPer = 129
+#仙器B基础属性值 百分比
+Def_Effect_FairyCan2AddPer = 130
+#仙绳基础属性值 百分比
+Def_Effect_NeckAddPer = 131
+#莲台基础属性值 百分比
+Def_Effect_JadeAddPer = 132
+
 Def_Effect_MinAtk = 67 # 最小攻击
 Def_Effect_MaxAtk = 68 # 最大攻击
 
 #增加%d防御值(A值填万分率)
-Def_Effect_DefPer = 69 #20024
+Def_Effect_DefPer = 69 
 #暴击伤害倍率(a值为万分率,直接加上)
 Def_Effect_SuperHitPer = 70
 #移动速度百分比(A值万分率)
@@ -477,14 +502,64 @@
 
 Def_Effect_NPCHurtAddPer = 89 # 对怪物伤害加成
 
+Def_Effect_JobAHurtAddPer = 90 # 对目标战士伤害加成
+Def_Effect_JobBHurtAddPer = 91 # 对目标法师伤害加成
+Def_Effect_JobCHurtAddPer = 92 # 对目标弓箭伤害加成
+Def_Effect_JobAAtkReducePer = 93 # 战士攻击伤害减免
+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 # 气运百分率
+
+Def_Effect_NormalHurt = 134 # 普通攻击增伤 
+Def_Effect_NormalHurtPer = 135 # 普通攻击加成 
+Def_Effect_FabaoHurt = 136 # 法宝技能增伤 
+Def_Effect_FabaoHurtPer = 137 # 法宝技能加成 
+
+Def_Effect_SuperHitRateReduce = 138 # 暴击概率抗性
+Def_Effect_LuckyHitReduce = 139 # 会心一击伤害固定减伤
+Def_Effect_LuckyHitPer = 140 # 会心一击伤害百分比
+Def_Effect_DamagePVE = 141  # PVE固定伤害
+Def_Effect_FinalHurtPer = 142   # 最终伤害万分率
+Def_Effect_FinalHurtReducePer = 143    # 最终伤害减少万分
+Def_Effect_YinjiTime = 144    # 每X毫秒自动消失一个印记
+Def_Effect_TheFBSkillsCD = 145    # 减少指定技能组CD XX%
+Def_Effect_BurnValue = 146    # 灼烧固定伤害
+Def_Effect_BurnTimePer = 147    # 延长灼烧时间百分比
+Def_Effect_SubSpeedPer = 148    # 减移动速度百分比
+
+Def_Effect_ReduceSkillCDPer = 149   # 减少技能CD, a值为万分率
+
 #增加%d物理伤害值,其中a值为伤害值
 Def_Effect_AddAtk = 1005
 #增加%d魔法伤害值,其中a值为伤害值
 Def_Effect_AddMAtk = 20020
 #增加内防
 Def_Effect_MagicDef = 20001
-#暴击率抗性(A值为万分率, 永恒为具体数值)
-Def_Effect_SuperHitRateReduce = 20030
 #减技能CD(A值固定值)
 Def_Effect_ReduceSkillCD = 20031
 # 卓越一击倍数(a值为万分率,直接加上)
@@ -569,21 +644,12 @@
     Def_BT_Campaign_Recharge,                 #累计充值(开服活动榜)
     Def_BT_Campaign_PetLV,                    #灵宠等级(开服活动榜)
     
-    Def_BT_HighLadder,                        #天梯竞技场排行
-    Def_BT_HighLadder_Yester,                 #天梯竞技场昨日排行
-    Def_BT_RechargeTeHuiLast,                 #充值特惠活动排行榜-上一期记录
-    Def_BT_RechargeTeHui,                     #充值特惠活动排行榜-当前期记录
-    
-    Def_BT_MixCampaign_PlayerBattle,          #总战斗力(合服活动)
-    Def_BT_MixCampaign_Recharge,              #累计充值(合服活动)
-    Def_BT_MixCampaign_WinFamilyMember,       #获胜战盟成员,按职位排(合服活动)
-    Def_BT_MixCampaign_FamilyKillBoss,        #战盟击杀boss(合服活动)
-    
-    Def_BT_CostTeHui,                         #消费特惠排行榜
-    Def_BT_CostTeHuiLast,                     #消费特惠排行榜上一期
+    Def_BT_NewFCCostGold,                     #消费排行榜(新仙界盛典)
+    Def_BT_Campaign_LingGen,                  #灵根总点(开服活动榜)
+    Def_BT_Campaign_StarLV,                   #升星等级(开服活动榜) 25
     
     Def_BT_Max,                               #排行榜最大类型
-) = range(0, 32 + 2) 
+) = range(0, 25 + 2) 
     
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -712,9 +778,6 @@
 Def_Cheater_CharArg = 200    #字符参数
 #---------------------------------------------------------------------
 
-#玩家回归开关 1开
-Def_Player_Recall_Open = 1
-
 #---竞技场---
 #竞技场房间状态
 Def_VsRoom_State = range(0,3)
@@ -732,12 +795,12 @@
 
 # 属性刷新类型定义, BYTE, 从146开始, C++定义到 IPY_PlayerDefine.CDBPlayerRefresh_OperateInfo
 (
-CDBPlayerRefresh_SuperHitReduce,        # 暴击抗性 146
-CDBPlayerRefresh_LuckyHitRateReduce,    # 幸运一击抗概率
+CDBPlayerRefresh_SuperHitReduce,        # 暴击固定值减少 146
+CDBPlayerRefresh_LuckyHitRateReduce,    # 会心一击抗概率
 CDBPlayerRefresh_SkillAtkRateReduce,    # 技能减伤
-CDBPlayerRefresh_DamagePer,             # 增加伤害
+CDBPlayerRefresh_DamagePVP,             # PVP固定伤害
 CDBPlayerRefresh_SpeedValue,            # 移动速度值 150
-CDBPlayerRefresh_151,                   # 
+CDBPlayerRefresh_DamagePVE,             # 对NPC的伤害固定值
 CDBPlayerRefresh_PetDamPer,             # 灵宠增加伤害
 CDBPlayerRefresh_IgnoreDefRateReduce,   # 无视防御抗性
 CDBPlayerRefresh_DamChanceDef,          # 概率抵御, 玩家每次被攻击有20%的几率减少伤害比率
@@ -777,7 +840,7 @@
 CDBPlayerRefresh_NPCHurtAddPer,         # 对怪物伤害加成
 CDBPlayerRefresh_FinalHurtPer,          # 最终输出伤害百分比
 CDBPlayerRefresh_TalentPoint,           # 天赋点数 190
-CDBPlayerRefresh_191,                   # 废弃 191
+CDBPlayerRefresh_DamagePVPReduce,       # PVP固定伤害减少
 CDBPlayerRefresh_GodWeaponLV_1,         # 神兵等级 - 类型1 192
 CDBPlayerRefresh_GodWeaponLV_2,         # 神兵等级 - 类型2 193
 CDBPlayerRefresh_GodWeaponLV_3,         # 神兵等级 - 类型3 194
@@ -786,7 +849,37 @@
 CDBPlayerRefresh_SoulSplinters,         # 聚魂碎片 197
 CDBPlayerRefresh_SoulCore,              # 核心环 198
 CDBPlayerRefresh_Honor,                 # 荣誉 199
-) = range(146, 200)
+CDBPlayerRefresh_200,                   # 200
+CDBPlayerRefresh_Mater,                 # 金
+CDBPlayerRefresh_Wood,                  # 木
+CDBPlayerRefresh_Water,                 # 水
+CDBPlayerRefresh_Fire,                  # 火
+CDBPlayerRefresh_Earth,                 # 土 205
+CDBPlayerRefresh_NormalHurt,            # 属性普通攻击增伤:普通攻击附加的固定值伤害 206
+CDBPlayerRefresh_NormalHurtPer,         # 属性普通攻击加成:普通攻击附加的伤害百分比 207
+CDBPlayerRefresh_FabaoHurt,             # 属性法宝技能增伤:法宝技能攻击附加的固定值伤害 208
+CDBPlayerRefresh_FabaoHurtPer,          # 属性法宝技能加成:法宝技能攻击附加的伤害百分比 209
+CDBPlayerRefresh_SuperHitRateReduce,   # 暴击概率抗性 210
+CDBPlayerRefresh_LuckyHitReduce,        # 会心伤害减免固定值 
+CDBPlayerRefresh_FinalHurtReducePer,   # 最终伤害减少百分比 
+CDBPlayerRefresh_YinjiTime,   # 每X秒减少印记时间,毫秒
+CDBPlayerRefresh_YinjiCnt,   # 当前印记数 214
+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 # 战盟贡献度(活跃度转换得来)
@@ -809,14 +902,8 @@
 
 #以下是旧的金钱类型
 TYPE_Price_Magic_Integral = 101      # 魔方寻宝积分
-TYPE_Price_HighLadder_Currency = 102     # 天梯竞技场积分
-TYPE_Price_HighLadder_Signet = 103    # 物品兑换(圣光晶石)
 TYPE_Price_GongXun = 105    # 功勋点
 TYPE_Price_ArrestPoint = 110    # 悬赏积分
-
-# 物品兑换
-TYPE_Price_ItemExchangeList = [TYPE_Price_HighLadder_Signet,
-                               ]
 
 # 自定义积分及通知字典 {货币类型:通知客户端刷新类型, ...} , 如果不通知的话刷新类型则配置 None
 TYPE_Price_CurrencyDict = {
@@ -844,12 +931,6 @@
     Def_Battle_Query     # 查询
 ) = range(1, 4)
 
-
-#区域类型定义, 从5开始, C++定义到 IPY_GameWorld.gatMax 4
-(
-gatManor, # 领地区域, 领地战期间可PK, 反之为普通区域
-) = range(5, 6)  
-
 # 游戏功能ID定义,需确保唯一,与PyGameFuncControl.txt中FuncId一致
 GameFuncID_Wing = 3             # 翅膀
 GameFuncID_Pet = 6              # 宠物,灵宠
@@ -866,6 +947,7 @@
 GameFuncID_Friend = 73          # 好友
 GameFuncID_SignDay = 81         # 签到
 GameFuncID_RefineStove = 87     # 炼丹炉
+GameFuncID_EquipWash = 91       # 洗练
 GameFuncID_Treasure = 99        # 寻宝
 GameFuncID_FirstGoldTip = 128      # 首充优势提示
 GameFuncID_EquipDecompose = 123 # 装备分解
@@ -873,10 +955,11 @@
 GameFuncID_FreeGoods = 130      # 极品白拿
 GameFuncID_OSSail = 132         # 开服特惠
 GameFuncID_HorsePetRobBoss = 139# 骑宠争夺
-GameFuncID_AddPoint = 145       # 加点功能
+GameFuncID_AddPoint = 145       # 加点功能/灵根功能
 GameFuncID_LittleHelper = 146   # 小助手
 GameFuncID_TJG = 147            # 脱机挂
 GameFuncID_SuperGift = 150      # 超值礼包
+GameFuncID_ZhuXianBoss = 163    # 诛仙BOSS
 # 以下为暂时无用的
 GameFuncID_Truck = 33           # 运镖
 GameFuncID_RunDaily = 34        # 日常跑环
@@ -900,7 +983,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)
 
 #聊天信息附加值中某信息数据所占位置
 #{聊天信息附加值类型:[起始位置(从左往右), 结束位置(不包含)]}
@@ -909,6 +994,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],  # 等级
      }
 
 # 聊天频道 暂用语音
@@ -957,9 +1044,9 @@
                                 Def_UniversalGameRecType_StoreServerCntRecord,  #商店全服购买记录 8,
                                 Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9
                                 Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10
-                                Def_UniversalGameRecType_11,
-                                Def_UniversalGameRecType_12,
-                                Def_UniversalGameRecType_13,
+                                Def_UniversalGameRecType_ZhuXianBossRecord, #诛仙BOSS结算记录11
+                                Def_UniversalGameRecType_LuckyTreasure, #幸运鉴宝大奖记录12
+                                Def_UniversalGameRecType_FairyDomain, #缥缈仙域事件次数记录13
                                 Def_UniversalGameRecType_Reward,    # 通用奖励表(TopBar)14
                                 Def_UniversalGameRecType_15,
                                 Def_UniversalGameRecType_16,
@@ -976,12 +1063,12 @@
                                 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_ManorWarInfo,  # 领地争夺战占领结果33
+                                Def_UniversalGameRecType_33,
                                 Def_UniversalGameRecType_34,
-                                Def_UniversalGameRecType_ShopItem,  # 自定义商店全服限购数据35
+                                Def_UniversalGameRecType_35,
                                 Def_UniversalGameRecType_36,
                                 Def_UniversalGameRecType_37,
                                 Def_UniversalGameRecType_38,
@@ -1080,23 +1167,13 @@
 #家族相关活动类型定义
 Def_FamActivityList = (
 Def_FamActivity_War, # 战盟争霸
-Def_FamActivity_Manor, # 领地争夺
-) = range(2)
-
-#副本通关类型
-(
-Def_PassType_Individual,  # 单人
-Def_PassType_Team,        # 组队
-) = range(0, 2)
+) = range(1)
 
 #运骠
 (
 Def_Out_Truck, # 离开骠车
 Def_Enter_Truck,  #进入骠车
 ) = range(1, 3)
-
-Def_OSC_ValidDay = 6 # 开服活动有效活动天
-Def_MSC_ValidDay = 5 # 合服活动有效活动天
 
 # 开服活动类型标识, 不可超过32
 Def_Campaign_Type_List = (
@@ -1110,7 +1187,9 @@
 Def_Campaign_Type_GodWeaponLV,      # 神兵等级排行 8
 Def_Campaign_Type_Recharge,         # 累计充值排行 9
 Def_Campaign_Type_PetLV,            # 灵宠等级排行 10
-) = range(1, 1 + 10)
+Def_Campaign_Type_LingGen,          # 灵根点数排行 11
+Def_Campaign_Type_StarLV,           # 升星等级排行 12
+) = range(1, 1 + 12)
 
 # 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
 Def_Campaign_Billboard_Dict = {
@@ -1124,55 +1203,9 @@
                                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,
+                               Def_Campaign_Type_StarLV:Def_BT_Campaign_StarLV,
                                }
-
-# 活动数据状态
-(
-Def_CampaignDataState_None, # 无
-Def_CampaignDataState_Save, # 数据可更新
-Def_CampaignDataState_Over, # 数据结束更新
-) = range(3)
-
-# 活动领奖状态
-(
-Def_CampaignAwardState_None, # 无
-Def_CampaignAwardState_Allow, # 允许领奖
-Def_CampaignAwardState_Over, # 领奖结束
-) = range(3)
-
-#合服活动类型标识
-Def_MixCampaign_Type_List = (
-    Def_MixCampaign_Type_PlayerBattle,     # 总战斗力0
-    Def_MixCampaign_Type_RechargeFirst,    # 首充奖励1
-    Def_MixCampaign_Type_RechargeRank,     # 累计充值排行奖励2
-    Def_MixCampaign_Type_RechargeCnt,      # 累计充值保底奖励3
-    Def_MixCampaign_Type_FamilyWar,        # 冰封王座家族战获胜家族成员奖励4
-    Def_MixCampaign_Type_FamilyWarEnter,   # 冰封王座参与奖5
-    Def_MixCampaign_Type_FamilyKillBoss,   # 战盟击杀boss排行
-    Def_MixCampaign_Type_PlayerKillBoss,   # 个人击杀boss
-) = range(8)
-
-#合服活动类型对应的奖励排行榜
-Def_MixCampaign_Billboard_Dict = {
-    Def_MixCampaign_Type_PlayerBattle:Def_BT_MixCampaign_PlayerBattle,  # 总战斗力
-    Def_MixCampaign_Type_RechargeRank:Def_BT_MixCampaign_Recharge,      # 累计充值排行 
-    Def_MixCampaign_Type_FamilyWar:Def_BT_MixCampaign_WinFamilyMember,  # 获胜战盟成员 
-    Def_MixCampaign_Type_FamilyKillBoss:Def_BT_MixCampaign_FamilyKillBoss,  # 战盟击杀boss排行 
-    }
-
-# 直接在MapServer中处理的合服活动类型
-DoOnMapServerMixCampaignTypeList = [
-                                 Def_MixCampaign_Type_RechargeFirst,
-                                 Def_MixCampaign_Type_RechargeCnt,
-                                 Def_MixCampaign_Type_FamilyWarEnter,
-                                 Def_MixCampaign_Type_PlayerKillBoss,
-                                 ]
-# 合服活动请求GameServer操作类型定义
-(
-Def_MSCGameServerQuery_QueryAward, # 查询
-Def_MSCGameServerQuery_GetAward, # 领奖
-Def_MSCGameServerQuery_MailAward, # 邮件发送奖励
-) = range(3)
 
 #队伍最大人数
 Def_Team_MaxPlayerCount = 4
@@ -1191,6 +1224,7 @@
 CrossServerMsg_CrossServerState = "CrossServerState"    # 跨服服务器状态变更
 CrossServerMsg_ExitCrossServer = "ExitCrossServer"      # 退出跨服服务器
 CrossServerMsg_Notify = "Notify"                        # 提示信息
+CrossServerMsg_ChatCrossWorld = "ChatCrossWorld"        # 跨服世界聊天
 CrossServerMsg_ViewPlayerCacheRet = "ViewPlayerCacheRet"# 查看跨服玩家信息结果
 CrossServerMsg_PKMatchReqRet = "PKMatchReqRet"          # 跨服PK匹配请求结果
 CrossServerMsg_PKMatchResult = "PKMatchResult"          # 跨服PK匹配结果
@@ -1205,16 +1239,35 @@
 CrossServerMsg_GiveMoney = "GiveMoney"                  # 获得货币
 CrossServerMsg_DropGoodItem = "DropGoodItem"            # 掉落好物品
 CrossServerMsg_RebornRet = "RebornRet"                  # 复活结果
+CrossServerMsg_NPCInfoRet = "NPCInfoRet"                # 跨服地图NPC信息
+CrossServerMsg_CollectNPCOK = "CollectNPCOK"            # 采集NPC完成
+CrossServerMsg_EnterFBRet = "EnterFBRet"                # 请求进入跨服副本返回信息
+CrossServerMsg_FBEnd = "FBEnd"                          # 完成跨服副本
+CrossServerMsg_NPCAttackCount = "NPCAttackCount"        # 攻击NPC次数记录
+CrossServerMsg_SendMail = "SendMail"                    # 发送邮件
+CrossServerMsg_FBPlayerCount = "FBPlayerCount"          # 副本功能线路人数同步
 
 # 子服发送跨服信息定义
 ClientServerMsg_ServerInitOK = "ServerInitOK"           # 子服启动成功
+ClientServerMsg_ChatCrossWorld = "ChatCrossWorld"       # 跨服世界聊天
 ClientServerMsg_GMCMD = "GMCMD"                         # GM命令
 ClientServerMsg_ViewPlayerCache = "ViewPlayerCache"     # 查看跨服玩家信息
 ClientServerMsg_PKMatch = "PKMatch"                     # 跨服PK匹配
+ClientServerMsg_PKRobotOver = "PKRobotOver"             # 跨服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
+ClientServerMsg_EnterFB = "EnterFB"                     # 请求进入跨服副本
+ClientServerMsg_AddBuff = "AddBuff"                     # 添加BUFF
+
+#跨服广播类型定义
+CrossNotify_World = "World"
+CrossNotify_Family = "Family"
+CrossNotify_Player = "Player"
 
 #角色改名结果
 (
@@ -1243,13 +1296,19 @@
 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  # 翅膀精炼材料个数列表
 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亿,目前仅特殊转化物品会用到
@@ -1265,6 +1324,8 @@
 Def_IudetCreateTime = 44 # 时效物品的创建时间
 Def_IudetGatherSoulLV = 46  # 聚魂等级
 Def_IudetExpireTime = 48 # 时效物品指定有效时间,时间单位由时效类型决定
+Def_IudetAuctionItemCreateTime = 50 # 拍品创建时间
+
 # 200~300 宠物数据用
 Def_IudetPet_NPCID = 200  # npcID
 Def_IudetPet_ClassLV = 202  # 阶级
@@ -1272,6 +1333,8 @@
 Def_IudetPet_QualityLV = 206  # 品质
 Def_IudetPet_Exp = 208  # 经验
 Def_IudetPet_Skill = 201  # 技能列表
+
+Def_IudetHorsePetSkinIndex = 210  # 骑宠觉醒外观索引
 # ----------------------------------------------------
 
 # 宠物物品数据状态
@@ -1289,32 +1352,9 @@
 Item_Source_VirtualItemDrop,# 虚拟掉落 4
 ) = range(5)
 
-# 玩家在线奖励类型
-(
-Def_OnlinePrizeType_NewGuy,
-Def_OnlinePrizeType_ByDay,
-Def_OnlinePrizeType_Max,
-) = range(3)
-
 #---------------------------------------------------------------------
 # 玩家字典按数位存储数据个数
 Def_PDictDigitCnt = 9  
-
-# 副本评分类型
-(
-ScoreType_TimeConsume,  # 耗时结算类型
-ScoreType_KillStat,     # 击杀怪物统计
-ScoreType_NewGuySuperShow,  # 击杀怪物统计
-ScoreType_GetItem,  # 获得物品奖励统计
-ScoreType_RedFortReward,  # 打开客户端frmRedFortReward
-)=range(5)
-
-ScoreTypeName = "TScore"
-
-Def_QQPlatVIPTypeList = (
-Def_QQPlatVIP_Yellow, #黄钻
-Def_QQPlatVIP_Blue, #蓝钻
-) = range(1, 3)
 
 # VIP类型定义
 (
@@ -1326,14 +1366,14 @@
 )=range(5)
 
 # 战斗力模块类型
-Def_MFPType_Max = 28
+Def_MFPType_Max = 26
 ModuleFightPowerTypeList = (
 Def_MFPType_Role, # 角色 0
-Def_MFPType_Equip, # 装备(基本装备位) 1
+Def_MFPType_Equip, # 装备(装备本身) 1
 Def_MFPType_Plus, # 强化 2
 Def_MFPType_Stone, # 宝石 3
-Def_MFPType_Suit, # 套装 4
-Def_MFPType_Wing, # 翅膀 5
+Def_MFPType_LingGen, # 灵根 4
+Def_MFPType_LingQi, # 灵器 5
 Def_MFPType_Wash, # 洗练 6
 Def_MFPType_Pet, # 灵宠 7
 Def_MFPType_Horse, # 坐骑 8
@@ -1341,23 +1381,19 @@
 Def_MFPType_GodWeapon, # 神兵 10
 Def_MFPType_Dienstgrad, #称号 11
 Def_MFPType_Rune, # 符印 12
-Def_MFPType_Horcrux, # 魂器 13
+Def_MFPType_Star, # 升星 13
 Def_MFPType_MagicWeapon1, # 人族法宝 14
 Def_MFPType_StoveYao, # 炼丹炉丹药 15
 Def_MFPType_MagicWeapon2, # 魔族法宝 16
 Def_MFPType_MagicWeapon3, # 仙族法宝 17
 Def_MFPType_PetSoul, # 灵宠魂石 18
 Def_MFPType_HorseSoul, # 坐骑魂石 19
-Def_MFPType_MagicWeaponSoul, # 法宝之魂 20
+Def_MFPType_20,
 Def_MFPType_Dogz, # 神兽 21
 Def_MFPType_GatherSoul, # 聚魂 22
 Def_MFPType_MagicWeapon4, # 王者法宝 23
 Def_MFPType_Coat, # 时装 24
 Def_MFPType_Other, # 其他
-
-#以下暂时没用到,改时再处理
-Def_MFPType_Passive, #被动技能
-Def_MFPType_ClothesCoat, #衣服时装
 ) = range(Def_MFPType_Max)
 
 #事件汇报用户行为-----------------------------------------------------------
@@ -1429,59 +1465,6 @@
 Difficulty_Hero, # 英雄 
 ) = range(3)
 
-# 称号类型定义,需与\PySysDB\tagDienstgrad.txt表中的类型Type一致,从1开始
-(
-Def_DienstgradType_Flower, # 鲜花称号
-) = range(1, 2)
-
-# 特惠活动类型
-TeHuiActivityList = (
-TeHuiActivity_Recharge, # 0充值特惠
-TeHuiActivity_ClassUP, # 功能升阶特惠
-TeHuiActivity_DiscountShop, # 折扣店特惠
-TeHuiActivity_RechargeRank, # 充值排行特惠/合服每日充值排行榜
-TeHuiActivity_MixDiscountShop, # 合服折扣店特惠
-TeHuiActivity_CostProfit, # 5消费返利
-TeHuiActivity_CostRank, # 消费排行榜
-) = range(1, 7 + 1)
-
-
-# 特惠活动类型对应的Key
-TeHuiTypeKeyDict = {
-TeHuiActivity_Recharge:Def_Notify_WorldKey_DayAction_Recharge,
-TeHuiActivity_ClassUP:Def_Notify_WorldKey_DayAction_ClassUPNum,
-TeHuiActivity_DiscountShop:Def_Notify_WorldKey_DayAction_DiscountShop,
-TeHuiActivity_RechargeRank:Def_Notify_WorldKey_DayAction_RechargeRank,
-TeHuiActivity_MixDiscountShop:Def_Notify_WorldKey_DayAction_MixDiscountShop,
-TeHuiActivity_CostProfit:Def_Notify_WorldKey_DayAction_CostProfit,
-TeHuiActivity_CostRank:Def_Notify_WorldKey_DayAction_CostRank,
-}
-
-# 功能升阶日类型
-ClassUPDayList = (
-ClassUPDay_Horse, # 坐骑
-ClassUPDay_Wing, # 翅膀
-ClassUPDay_Office # 官爵
-) = range(1, 3 + 1)
-
-# 总动员类型
-Def_ZDY_List = (
-Def_ZDY_Horse, # 坐骑
-Def_ZDY_Wing, # 翅膀
-Def_ZDY_Office, # 官爵
-Def_ZDY_Pet, # 宠物
-Def_ZDY_FightPower, # 战力
-) = range(1, 5 + 1)
-
-# 自定义商店查询定义
-(
-Def_ShopItem_QueryServerBuyCnt, # 查询全部全服限购数据
-Def_ShopItem_BuyItem, # 购买物品
-Def_ShopItem_ClearBuyCnt, # 重置全服限购数据
-Def_ShopItem_SyncServerBuyCnt, # 同步单品全服限购数据
-) = range(4)
-
-
 # 每日活动编号定义
 DailyActionIDList = (
 DailyActionID_DailyRunMission, # 赏金跑环任务
@@ -1489,7 +1472,7 @@
 DailyActionID_EquipPlus, # 强化
 DailyActionID_FieldFight, # 野外挂机
 DailyActionID_OfflineFight, # 脱机挂机
-DailyActionID_RefineStove, # 炼丹材料消耗 6
+DailyActionID_RefineStove, # 炼丹材料消耗 6(废弃)
 DailyActionID_Dice, # 我要太极
 DailyActionID_Pray, # 祈愿
 DailyActionID_WorldBOSS, # 世界BOSS
@@ -1505,7 +1488,16 @@
 DailyActionID_IceLode, # 冰晶矿脉
 DailyActionID_HelpBattleCheckIn, # 助战登记  20
 DailyActionID_CrossReamPK, # 跨服PK  21
-) = range(1, 21 + 1)
+DailyActionID_FamilyBoss1, # 仙盟BOSS  22
+DailyActionID_SkyTower, # 天星塔  23
+DailyActionID_HorsePetBoss, # 骑宠BOSS  24
+DailyActionID_FairyDomain, # 缥缈仙域  25
+DailyActionID_AuctionItem, # 拍卖行上架/竞拍  26
+DailyActionID_LeiFaBoss, # 雷罚boss 27
+DailyActionID_CrossPenglai, # 跨服蓬莱仙境Boss 28
+DailyActionID_FamilyChuanGong, # 仙盟传功 29
+DailyActionID_FamilyParty, # 仙盟宴会 30
+) = range(1, 30 + 1)
 
 
 
@@ -1645,10 +1637,19 @@
 SuccType_Collect, #采集X物品X次131
 SuccType_InlayGatherSoul, #镶嵌X枚X品质聚魂(不包含核心)132
 SuccType_GatherSoulLvUp, #累计聚魂总等级XX(不包含核心)133
-) = range(1, 134)
+SuccType_FeastRedPack_TalkWorld, #节日红包 - 世界频道发言 x次 134
+SuccType_FeastRedPack_Pray, # 节日红包 - 祈祷x次 135
+SuccType_FeastRedPack_KillSpecificNPC, # 节日红包 - 击杀特定NPC x次 136
+SuccType_FeastRedPack_KillBoss, # 节日红包 - 指定类型boss x次 137
+SuccType_FeastRedPack_EnterMap, # 节日红包 - 进入指定地图 x次  138
+SuccType_FeastRedPack_TaskCRun, # 节日红包 - 完成x次日常环任务成就 139
+SuccType_FeastRedPack_Dice, # 节日红包 - 天机摇骰子x次  140
+SuccType_FeastRedPack_CrossPK, # 节日红包 - 跨服PK x次  141
+SuccType_FeastRedPack_FBSweep, # 节日红包 - 副本扫荡 x次  142
+) = range(1, 143)
 
-
-
+# 节日红包成就类型
+FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
 
 # 连续天规则的成就类型
 ContinueSuccessTypeList = []
@@ -1663,6 +1664,8 @@
                               SuccType_EquipSuit,SuccType_Collect,SuccType_DogzBattle,
                               SuccType_UseItem,SuccType_FamilyTechLV,
                               SuccType_GetSpecialItem,SuccType_GetMagicWeapon,SuccType_FBEncourage,SuccType_XBXZ,
+                              SuccType_FeastRedPack_KillSpecificNPC,SuccType_FeastRedPack_KillBoss,
+                              SuccType_FeastRedPack_EnterMap, SuccType_FeastRedPack_FBSweep,
                               ]
 #传进来的条件满足配置的条件列表中的一个就行的成就类型
 ContainSuccessTypeList = [SuccType_CompoundItemEx, SuccType_PickUpItem, SuccType_MWSkillUp]
@@ -1690,30 +1693,32 @@
 # 手游不使用C++定义 enum            RoleEquipType
 # 装备位定义
 RoleEquipType = (
-    retWeapon,      #1 主手
-    retWeapon2,     #2 副手
-    retHat,         #3 帽子
-    retClothes,     #4 衣服
-    retBelt,        #5 腰带
-    retTrousers,    #6 裤子
-    retShoes,       #7 鞋子
-    retNeck,        #8 项链
-    retFairyCan,       #9 仙器
-    retFairyCan2,       #10 仙器
-    retWing,        #11 翅膀
-    retGuard,    #12 守护
-    retBaldric1,     #13 佩饰
-    retBaldric2,     #14 佩饰
-    retBaldric3,     #15 佩饰
-    retBaldric4,     #16 佩饰
-    retBaldric5,     #17 佩饰
-    retBaldric6,     #18 佩饰
-    retHorse,        #19 坐骑
-    retWeaponSkin,   #20 时装武器
-    retClothesSkin,  #21 时装衣服
-    retWeapon2Skin,  #22 时装副手
+    retWeapon,          #1 主手
+    retWeapon2,         #2 副手
+    retHat,             #3 帽子
+    retClothes,         #4 衣服
+    retBelt,            #5 腰带
+    retTrousers,        #6 裤子
+    retShoes,           #7 鞋子
+    retGlove,           #8 手套
+    retNeck,            #9 项链
+    retFairyCan,        #10 仙器1
+    retFairyCan2,       #11 仙器2
+    retJade,            #12 玉佩
+    retWing,            #13 翅膀
+    retGuard1,          #14 守护1
+    retGuard2,          #15 守护2
+    retPeerlessWeapon,  #16 绝世武器
+    retPeerlessWeapon2, #17 绝世副手
+    retXXX18,           #18 暂无
+    retHorse,           #19 坐骑
+    retWeaponSkin,      #20 时装武器
+    retClothesSkin,     #21 时装衣服
+    retWeapon2Skin,     #22 时装副手
     retMax,
 ) = range(1, 24)
+
+
 
 
 # 神兽装备位定义
@@ -1724,7 +1729,6 @@
     dogzetClaw,     # 神兽兽爪
     dogzetScute,    # 神兽鳞甲
 ) = range(101, 101 + 5)
-
 
 # 请求进入副本通用检查结果,优先提示的放前面(即索引越大,提示优先级越低)
 EnterFBAskResult = (
@@ -1743,9 +1747,10 @@
     EntFBAskRet_TJG,            # 12 脱机挂中
     EntFBAskRet_Sit,            # 13 打坐中
     EntFBAskRet_CrossPKMatching,# 14 跨服匹配中
+    EntFBAskRet_InCrossMap,     # 15 跨服地图中
     EntFBAskRet_Other,          # xx 其他限制
     EntFBAskRet_Max,
-) = range(17)
+) = range(18)
 
 
 #增加仙盟活跃的活动类型
@@ -1766,3 +1771,16 @@
 Def_Boss_Func_Dogz, # 神兽功能BOSS
 ) = range(3)
 
+# 红包类型定义
+RedPackType_GoldPacket = 0 # 主动发钻石红包
+RedPackType_OpenServer = 5 # 开服红包
+RedPackType_FeastSysBig = 31 # 节日系统大红包
+RedPackType_FeastSysSmall = 32 # 节日系统小红包
+RedPackType_FeastSucc = 33 # 节日成就红包
+# 节日红包类型
+FeastRedPackType = [RedPackType_FeastSysBig, RedPackType_FeastSysSmall, RedPackType_FeastSucc]
+# 需要限制服务器最大红包数的红包类型 {统计个数编号:[红包类型, ...], ...}
+RedPackMaxCountDict = {1:[RedPackType_OpenServer],
+                       2:[RedPackType_FeastSucc],
+                       }
+

--
Gitblit v1.8.0