From 54257275bdaa30fb8d38da4144050511825d0d84 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 16 五月 2019 11:01:45 +0800
Subject: [PATCH] 3583 3524 【BUG】【2.0】妖王副本没有boss（进入副本如果boss已经被击杀则弹出结算界面）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 65 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index bd109f1..9868f38 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -583,7 +583,8 @@
Def_Skill_Effect_PowerPart = 1206 # 充能能量分段，触发即算一次充能，拉进度条蓄力
Def_Skill_Effect_ProcessAttack = 1314 # 间隔性攻击，A值为攻击次数，B值为是否广播客户端
Def_Skill_Effect_BuffTick = 9999 #BUFF的时间处理间隔
-Def_Skill_Effect_ProBloodPer = 4505 #buff中中毒伤害百分比增加（给受害者的buff）
+Def_Skill_Effect_BurnToAddHP = 1091 #buff中灼烧伤害转化吸血给 放灼烧者
+
#写死的技能效果ID------------NPC专用
Def_Skill_Effect_AttackMove = 2100 # NPC位移战斗
@@ -629,7 +630,8 @@
#---------需要记录在buff管理器中的效果ID,主要用于查找用---------------------------
-Def_BuffManager_EffectsID = [Def_Skill_Effect_AbsorbShield, Def_Skill_Effect_AbsorbShieldXMZJ, Def_Skill_Effect_StoreBlood]
+Def_BuffManager_EffectsID = [Def_Skill_Effect_AbsorbShield, Def_Skill_Effect_AbsorbShieldXMZJ,
+ Def_Skill_Effect_StoreBlood, Def_Skill_Effect_BurnToAddHP, Def_Skill_Effect_BuffState]
#-------------------------------------------------------------------------
#基础属性效果ID
@@ -645,9 +647,6 @@
# 非线性增加
#1015:("NoLinePlus", [TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax]), # 提高攻击力百分比
- # 非线性减少
- #1098:("NoLineReduce", [TYPE_Calc_AttrATKMax, TYPE_Calc_AttrATKMin,
- # TYPE_Calc_AttrMATKMax, TYPE_Calc_AttrMATKMin]), # 降低攻击百分比
# 根据等级段线性增加，效果B值为等级段配置
500:("LinePlusByLV", [TYPE_Calc_HPCureEnhance]), # 提高血瓶恢复效果
@@ -1265,7 +1264,7 @@
Def_SkillType_PassivePlsBuff, #被动触发增益类buff 16
Def_SkillType_PassiveDepBuff, #被动触发减益类buff 17
Def_SkillType_PassiveActionBuff, #被动触发的控制类buff 18
- Def_SkillType_PassiveBuff, # 被动BUFF 19
+ Def_SkillType_PassiveBuff, # 被动BUFF 19 (废弃，无此定义分散为其他buff)
Def_SkillType_AttrSkill, # 属性类技能 20
Def_SkillType_PassiveLstPlsBuff, #被动触发持续增益类buff 21
Def_SkillType_PassiveLstDepBuff, #被动触发持续减益类buff 22
@@ -1280,7 +1279,7 @@
Def_SkillType_LstDepBuff : IPY_GameWorld.bfProcessDeBuff , #持续减益BUFF 4
Def_SkillType_PlsBuff : IPY_GameWorld.bfBuff , #增益BUFF 5
Def_SkillType_DepBuff : IPY_GameWorld.bfDeBuff , #减益BUFF 6
- Def_SkillType_PassiveBuff : IPY_GameWorld.btPassiveBuf, # 被动技能 7
+ Def_SkillType_PassiveBuff : IPY_GameWorld.btPassiveBuf, # 被动技能 7 (废弃，无此定义分散为其他buff)
Def_SkillType_Revive : IPY_GameWorld.bfIncBuff, #复活 8
Def_SkillType_Increment : IPY_GameWorld.bfIncBuff, #增值技能（不可清除）9
Def_SkillType_Aura : IPY_GameWorld.bfAura , #光环技能 10
@@ -1325,6 +1324,9 @@
Def_SkillType_Aura , #光环技能 10
Def_SkillType_Summon , #召唤 13
]
+
+# 玩家独有的，NPC没有这些接口
+Def_BuffType_OnlyPlayer = [IPY_GameWorld.bfIncBuff, IPY_GameWorld.btPassiveBuf, IPY_GameWorld.bfEquipBuff, IPY_GameWorld.bfMapBuff]
# Buff层级增减定义
Def_BuffLayer_Add = 0 # 每次触发层级递增
@@ -1769,8 +1771,8 @@
Def_FBMapID_SealDemonEx = 52020
#诛仙BOSS
Def_FBMapID_ZhuXianBoss = 31380
-#诛仙塔
-Def_FBMapID_ZhuXianTower = 31370
+#天星塔
+Def_FBMapID_SkyTower = 31370
#仙魔之争
Def_FBMapID_XMZZ = 31010
#神兽副本
@@ -1907,7 +1909,7 @@
'CrossGrassland':[Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian], #草园
'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
'ZhuXianBoss':[Def_FBMapID_ZhuXianBoss],#诛仙BOSS
- 'ZhuXianTower':[Def_FBMapID_ZhuXianTower],#诛仙塔
+ 'SkyTower':[Def_FBMapID_SkyTower],#天星塔
'AllFamilyBoss':[Def_FBMapID_AllFamilyBoss],#多仙盟BOSS
'HorsePetBoss':[Def_FBMapID_HorsePetBoss],#骑宠BOSS
'FairyTreasure':[Def_FBMapID_FairyTreasure],#缥缈宝藏
@@ -2406,6 +2408,8 @@
EquipPlace_Special = [ShareDefine.retNeck, ShareDefine.retFairyCan, ShareDefine.retFairyCan2, ShareDefine.retJade]
## 装备位 - 所有基础
EquipPlace_Base = EquipPlace_BaseWeapon + EquipPlace_BaseArmor
+## 装备位 - 灵器
+EquipPlace_LingQi = [ShareDefine.retWing, ShareDefine.retGuard1, ShareDefine.retPeerlessWeapon, ShareDefine.retPeerlessWeapon2]
#装备物品位置,不需要重刷属性
EquipItemNoRefreshState = [
@@ -2417,15 +2421,14 @@
# 需要广播外观的装备部位(除了境界装备3部位)
Def_SyncEquipStateByIndex = [
- ShareDefine.retWing, #11 翅膀
+ ShareDefine.retWing, #13 翅膀
ShareDefine.retGuard1, #14 守护1
ShareDefine.retHorse, #19 坐骑
]
#---------------------------------------------------------------------
#特殊物品光环，永久存在
-Def_SuperBuffList = [
- ]
+Def_SuperBuffList = []
#------------------------------------------------------------
@@ -3002,6 +3005,7 @@
Def_NPC_Dict_TimeLostHPTick = 'TimeLostHPTick' # 上次按时间掉血tick
Def_NPC_Dict_TimeLostHPPlayerCountTick = 'TimeLostHPPlayerCountTick ' # 上次刷新按时间掉血人数tick
Def_NPC_Dict_TimeLostHPPlayerCount = 'TimeLostHPPlayerCount' # 按时间掉血有效人数
+Def_NPC_Dict_TimeLostHPFightPower = 'TimeLostHPFightPower' # 按时间掉血战力
#玩家状态定义，不能超过31个，如超过，需扩展多个key支持
Def_PlayerStateList = (
@@ -3018,13 +3022,14 @@
Def_PlayerState_LimitSkill, # 禁魔状态 10
Def_PlayerState_LimitAddHP, # 禁疗状态 11
Def_PlayerState_Blind, # 致盲状态 12
- Def_PlayerState_LoseBlood1, # 灼烧 13
+ Def_PlayerState_Burn, # 灼烧 13
Def_PlayerState_LoseBlood2, # 职业2持续掉血状态 14
Def_PlayerState_LoseBlood3, # 职业3持续掉血状态 15
Def_PlayerState_MissSneerAtk, # 对嘲讽攻击免疫表现为miss 16
Def_PlayerState_BeInAir, # 浮空（做法同眩晕类） 17
Def_PlayerState_zqdlj, # 紫气东来金灵根技能状态 18
-) = range(19)
+ Def_PlayerState_Ice, # 寒冰状态（同减速） 19
+) = range(20)
#---SetDict 含NPC字典KEY，不存于数据库---
Def_GameObjKey_InheritOwner = "InheritOwner" # 类暴风雪计算时用主人属性
@@ -3042,7 +3047,6 @@
Def_PlayerKey_1314HurtCount = "1314cnt" # 类剑刃风暴技能的1314效果，伤害次数处理
Def_PlayerKey_FirstDefender = "FDID" # 第一个防守者，只用于比较
Def_PlayerKey_SelectObjID = "selectID" # 锁定模式选中，不用SetActionObj
-Def_PlayerKey_SelectObjID = "selectID" # 锁定模式选中，不用SetActionObj
Def_PlayerKey_SelectObjType = "selectType" # 锁定模式选中
Def_PlayerKey_NormalHurt = "NormalHurt" # 属性普通攻击增伤：普通攻击附加的固定值伤害
Def_PlayerKey_NormalHurtPer = "NormalHurtPer" # 属性普通攻击加成：普通攻击附加的伤害百分比
@@ -3059,6 +3063,7 @@
Def_PlayerKey_SomersaultTime = "Somersault" # 翻滚一定时间内无敌，表现为MISS
Def_PlayerKey_CopyFuncAttr = "CopyFuncAttr%s" # 玩家属性刷新中的计算属性缓存，便于buff刷新计算
Def_Player_RefreshAttrByBuff = "PlayerAttrByBuff" # 玩家属性刷新功能属性缓存，便于buff刷新计算, 间隔刷新
+Def_Player_HadRefreshAttr = "HadRefreshAttr" # 玩家在本地图是否刷新过属性
Def_PlayerKey_ClientCustomScene = "ClientCustomScene" # 客户端自定义场景状态
Def_PlayerKey_ClientCustomSceneMapID = "ClientCustomSceneMapID" # 客户端自定义场景地图ID
Def_PlayerKey_ClientCustomSceneLineID = "ClientCustomSceneLineID" # 客户端自定义场景功能线路ID
@@ -3068,13 +3073,11 @@
Def_PlayerKey_AttackFollowMaster = "FollowAtk" # 召唤兽跟随攻击
Def_PlayerKey_MoreHurtValue = "MoreHurtValue" # 额外的伤害值，一般用于不走公式
Def_PlayerKey_BloodShiledHurt = "BSHurt" # 伤害值用于血盾抵消
-Def_PlayerKey_StartEquipCnt = "StartEquipCnt" # 珍品数量
Def_PlayerKey_TJGPackFullAfterEat = "TJGFullEat" # 脱机挂吞噬后背包依然满的情况
Def_PlayerKey_TJGStartTime = "TJGStartTime" # 脱机挂结算时间起点
Def_PlayerKey_EquipTime = "EquipTime" # 时效装备
Def_PlayerKey_PowerPartTime = "PowerPartTime" # 蓄力每次消耗时间，因攻速改变
Def_PlayerKey_PowerPartCount = "PowerPartCount" # 蓄力技能能量次数
-Def_PlayerKey_ClientMaxHurtValue = "CMaxHValue" # 缓存单次技能攻击的最大伤害, 减少计算量
Def_Player_RefreshAttr = "Player_RefreshAttr" # 玩家刷新属性标志
Def_PlayerKey_LoadMapIsLogin = 'LoadMapIsLogin' # 本次进入地图是否是登录的
Def_PlayerKey_NotifyAllAttrState = 'NotifyAllAttrState' # 是否同步过所有属性，切图时第一次刷属性需要同步
@@ -3175,11 +3178,7 @@
Def_PlayerKey_ContendNPCObjID = "ContendNPCObjID" #竞争归属的NPC实例ID
Def_PlayerKey_AreaRewardMultiple = "AreaRewardMultiple" #玩家所在区域福利倍值，默认1
Def_PlayerKey_AttrActivatyNotify = "AttrActivatyNotify" # 属性激活提示类型
-Def_PlayerKey_AttrActivatyRecordStarLV = "AttrActivatyRecordStarLV" # 属性激活记录 - 强化星级
-Def_PlayerKey_AttrActivatyRecordStoneLV = "AttrActivatyRecordStoneLV" # 属性激活记录 - 宝石星级
-Def_PlayerKey_AttrActivatyRecordQualityECnt = "AttrActivatyRecordQualityECnt" # 属性激活记录 - 卓越装备件数
-Def_PlayerKey_AttrActivatyRecordSuiteCnt = "AttrActivatyRecordSuiteCnt" # 属性激活记录 - 套装件数
-Def_PlayerKey_AttrActivatyRecordQualityCnt = "AttrActivatyRecordQualityCnt" # 属性激活记录 - 卓越条数
+Def_PlayerKey_EquipOrangeCount = "EquipOrangeCount" # 装备信息 - 橙装及以上件数
Def_PlayerKey_LastHurt = "PlayerLastHurt" # 最后补刀
Def_PlayerKey_AddBackHPPer = "AddBackHPPer" #增加生命恢复效果
Def_PlayerKey_ReduceBackHPPer = "ReduceBackHPPer" #降低生命恢复效果
@@ -3564,14 +3563,18 @@
Def_PDict_RunTaskNextMissionID = "RunTaskNextMissionID_%s" # 跑环本轮结束下个任务ID 参数任务类型
#强化
+Def_PDict_TotalPlusLV = "TotalPlusLV" # 总强化等级
Def_PDict_EquipPartPlusLV = "EPPlusLV_%s_%s" # 装备部位对应公共强化星级，参数为(packType, index)
Def_PDict_EquipActiveStarLV = "EquipActiveStarLV" #装备已激活总强化等级
Def_PDict_EquipPartProficiency = "EPProf_%s_%s" # 装备部位对应公共强化熟练度，参数为(packType, index)
Def_PDict_EquipPartPlusEvolveLV = "EPPlusEvolveLV_%s_%s" # 装备部位对应公共强化进化等级，参数为(packType, index)
+Def_PDict_TotalPlusEvolveLV = "TotalPlusEvolveLV" # 装备部位对应公共强化进化总等级
# 宝石
Def_PDict_EquipPartStoneID = "StoneID_%s_%s" # 装备位_孔位存储宝石ID*10+是(1)否(0)绑定
+Def_PDict_TotalStoneLV = "TotalStoneLV" # 装备位宝石总等级
# 装备洗练, 暂不区分背包类型，如果有不同背包，策划设定不同的装备位
+Def_PDict_TotalEquipWashLV = "TotalEquipWashLV" # 装备部位洗练总等级
Def_PDict_EquipWashLV = "EquipWashLV_%s" # 装备部位洗练等级，参数为(place)
Def_PDict_EquipWashValue = "EquipWashV_%s_%s" # 装备部位洗练当前值，参数为(place, 属性编号)
Def_PDict_EquipWashValueTemp = "EquipWashVT_%s_%s" # 装备部位洗练当前临时洗练值，参数为(place, 属性编号)
@@ -3605,6 +3608,8 @@
Def_Player_Dict_ZhuXianTowerPassLV = "ZhuXianTowerPassLV" # 诛仙塔已通关层数
Def_Player_Dict_ZhuXianTowerLastFloor = "ZhuXianTowerLastFloor" # 诛仙塔上次挑战层数
Def_Player_Dict_ZhuXianTowerCostTime = "ZhuXianTowerCostTime" # 诛仙塔通关时间
+#天星塔
+Def_Player_Dict_SkyTowerFloor = "SkyTowerFloor" # 天星塔已通关层数
#古神禁地
Def_Player_Dict_GodArea_Anger = "GodArea_Anger" # 古神禁地怒气值
@@ -3912,6 +3917,7 @@
Def_PDict_DogzBuyHelpbattleCount = "DogzBuyHelpbattleCount" # 额外购买的神兽助战位
#装备部位星数
+Def_PDict_TotalEquipStar = "TotalEquipStar" #装备部位星数总数
Def_PDict_EquipPartStar = "EQPartStar_%s" #装备部位星数 参数 装备背包格子索引
#缥缈仙域
@@ -3923,7 +3929,9 @@
Def_PDict_FairyAdventuresData = "FairyAdventuresData_%s" #奇遇数值 唯一ID*100+档位 参数事件ID
Def_PDict_FairyDomainEventAppearCnt = "FDEventAppearCnt%s" #事件出现次数 参数事件ID AAABBB BBB:小时段出现次数 AAA:今日出现次数
+#五行专精
Def_PDict_SkillElementID = "SkillElementID%s" #主技能选择的专精技能 参数主技能ID
+Def_PDict_SkillElementLV = "SkillElementLV%s" #专精技能技能等级 参数技能ID
#-------------------------------------------------------------------------------
#可以从07 41封包购买的背包类型,和对应字典{背包类型:[字典key, 默认格子数]}
@@ -4356,7 +4364,8 @@
Def_CalcAttrFunc_MagicWeapon3, # 仙族法宝属性 34
Def_CalcAttrFunc_MagicWeapon4, # 王者法宝 35
Def_CalcAttrFunc_Coat, # 时装 36
-) = range(37)
+Def_CalcAttrFunc_LingQi, # 灵器 37
+) = range(38)
# 技能功能点列表 - 默认不算战力，不享受百分比加成，技能功能点暂时配置，之后优化技能属性逻辑后可去掉
CalcAttrFuncSkillList = [Def_CalcAttrFunc_HorseSkill, Def_CalcAttrFunc_PetSkill, Def_CalcAttrFunc_DogzBattleSkill]
@@ -4371,7 +4380,7 @@
ShareDefine.Def_MFPType_Star:[Def_CalcAttrFunc_Star],
ShareDefine.Def_MFPType_Plus:[Def_CalcAttrFunc_Plus],
ShareDefine.Def_MFPType_Stone:[Def_CalcAttrFunc_Stone],
- ShareDefine.Def_MFPType_Wing:[Def_CalcAttrFunc_Wing],
+ ShareDefine.Def_MFPType_Wing:[Def_CalcAttrFunc_Wing, Def_CalcAttrFunc_LingQi],
ShareDefine.Def_MFPType_Wash:[Def_CalcAttrFunc_Wash],
ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_PetSkill],
ShareDefine.Def_MFPType_PetSoul:[Def_CalcAttrFunc_PetSoul],
@@ -4397,7 +4406,7 @@
(
TriggerType_BeSuperHit, # 被暴击触发技能 1
TriggerType_BuffState, # 进入4012的某个状态触发技能
-TriggerType_AddDamagePer, # 提高增加伤害属性值，计算时
+TriggerType_AddPVPDamagePer, # 提高PVP增加伤害属性值，计算时
TriggerType_AttackOver, # 攻击（对敌技能）后被动技能被触发
TriggerType_AttackAddSkillPer, # 所有攻击伤害(SkillPer)增加，含普攻，计算时 5
TriggerType_SuperHit, # 暴击时 触发技能
@@ -4421,7 +4430,7 @@
TriggerType_AttackKill, # 斩杀
TriggerType_WillDead, # 进入濒死状态时触发技能 25
TriggerType_BuffBoom, # 中毒后爆炸
-TriggerType_Success_Buff_SkillPer, # 提高4501成功概率
+TriggerType_BeAttackAddSkillPer, # 被攻击提高技能伤害
TriggerType_HurtObjAddBuff, # 在算伤害时群攻1对1加buff，可用于一个伤害多次触发
TriggerType_BeBoomSeed, # 被动引爆视野内对象的buff种子 29
TriggerType_AttackCnt, # 增加技能攻击数量（效果ID1200） 30
@@ -4469,7 +4478,7 @@
TriggerType_IsDealy, # 是否触发致命一击 72 暂且理解为和概率是独立，有新概念产生则重定义
TriggerType_AddThumpHitRate, # 提高重击概率 73
TriggerType_ThumpHit, # 重击时 触发技能74
-TriggerType_AddThumpHitPer, # 重击时 增加重击百分比 75
+TriggerType_AddThumpHitPer, # 重击时 增加重击百分比 75 默认10000
TriggerType_SkillSuccess, # 任何技能释放成功都可触发 76
TriggerType_BounceHPPerByAttacker, # 反弹伤害百分比值, 由攻击方决定 77
TriggerType_NoControl, # 使关联技能不受控制 78
--
Gitblit v1.8.0