From 06eec1e27d26532824a710bba2483b0c7f39c27e Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 22 十二月 2018 18:03:50 +0800
Subject: [PATCH] 5372 【后端】【1.4】聚魂副本开发(npc速度通知)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |  153 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 131 insertions(+), 22 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index e30008f..c68bebd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -68,7 +68,7 @@
 Def_BuffValue_Count = 3     # buff记录的value个数
 
 #游戏对象属性--------------------------------------------
-Def_Calc_AllAttrType_MAX = 130
+Def_Calc_AllAttrType_MAX = 131
 #基本属性BUFF计算,顺序与 ObjProperty_AttrByIndex 对应,同时也为buff效果ID同步通知策划
 TYPE_Calc_AttrList = (
 #基础属性
@@ -214,6 +214,7 @@
 TYPE_Calc_WingHPPer,                    # 翅膀生命百分比
 TYPE_Calc_SuiteBasePer,                 # 套装基础属性百分比
 TYPE_Calc_PlusBaseAtkPer,               # 强化基础攻击百分比
+TYPE_Calc_ProDef,                       # 当前防护值
 ) = range(1, Def_Calc_AllAttrType_MAX)
 
 
@@ -261,8 +262,12 @@
 Def_ItemID_RealmPoint = 24               # 直接给修行点
 Def_ItemID_BossReborn = 21               # 直接给boss复活点
 Def_ItemID_Ysog = 4306               # 直接给符印融合石
+Def_ItemID_SoulDust = 700               # 直接给魂尘
+Def_ItemID_SoulSplinters = 701               # 直接给聚魂碎片
+Def_ItemID_SoulCore = 702               # 直接给核心环
 Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, Def_ItemID_GoldPaper, 
-                           Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog]
+                           Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog,
+                           Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore]
 #---------------------------------------------------------------------
 #写死的物品类型都放这边
 Def_ItemType_All = -1             #所有类型
@@ -312,6 +317,9 @@
 Def_ItemType_FamilyBossFood = 50       #仙盟兽粮
 Def_ItemType_SuccessItem = 53     # 用于完成成就的物品,不存在背包
 Def_ItemType_ResetAttrPoint = 59       #洗点卷轴 使用后将某个属性一定值变为未分配属性
+Def_ItemType_GatherSoulExp = 61 #聚魂精华材料
+Def_ItemType_GatherSoul = 62 #普通聚魂
+Def_ItemType_GatherSoulCore = 63 #聚魂核心
 
 Def_ItemType_DogzEquipExp = 70  # 神兽装备经验
 
@@ -353,6 +361,7 @@
 #虚拟背包最大格子数 功能配置表对应的key
 Def_VPackCnt_Dict = {
                      ShareDefine.rptRune:'RunePackageNum',
+                     ShareDefine.rptGatherSoul:'GatherSoulPackCount',
                      }
 
 #虚拟背包可以放入的物品字典
@@ -360,6 +369,7 @@
 ShareDefine.rptRune:[Def_ItemType_Rune, Def_ItemType_RuneExp],
 ShareDefine.rptDogzItem:[Def_ItemType_DogzEquipExp, Def_ItemType_DogzEquipHorn, Def_ItemType_DogzEquipEye, 
                          Def_ItemType_DogzEquipTooth, Def_ItemType_DogzEquipClaw, Def_ItemType_DogzEquipScute],
+ShareDefine.rptGatherSoul:[Def_ItemType_GatherSoulExp, Def_ItemType_GatherSoul, Def_ItemType_GatherSoulCore],
                       }
 
 def GetItemPackType(itemType, defaultPack=IPY_GameWorld.rptItem):
@@ -422,6 +432,9 @@
 Def_Effect_AddMagicWeaponUpExp = 236   # 增加法宝升星经验 A值法宝ID B值X经验
 Def_Effect_ChatBubbleBox = 237   # 激活聊天气泡框,A值气泡框ID
 Def_Effect_ItemGiveRealmPoint = 238      #使用道具给予修行点
+Def_Effect_ItemGiveSoulDust = 239   # 使用道具给予魂尘
+Def_Effect_ItemGiveSoulSplinters = 240   # 使用道具给予聚魂碎片
+Def_Effect_ItemGiveSoulCore = 241      #使用道具给予核心环
 #----以下未使用或代码依然存在的---
 Def_Effect_ItemGiveGongXun = 1920        #使用道具给予功勋
 Def_Effect_ItemGiveHonorPoint = 1922       #使用道具给予荣誉积分
@@ -553,6 +566,7 @@
 #写死的技能效果ID---------------------------------------------------------------------
 Def_Skill_Effect_AddAtkByHP = 503  # 每损失XX血量增加攻击XX,最高攻击加成XX
 Def_Skill_Effect_AbsorbShield = 801  # A值记录吸收伤害值,B值记录吸收值上限为xx%血量上限值 C值为释放的爆炸技能ID 如麒麟盾
+Def_Skill_Effect_AbsorbShieldXMZJ = 802    # 须弥真界 神兵技能吸收伤害 百分比
 Def_Skill_Effect_BoomSeedHurt = 804 # BUFF种子单层伤害
 Def_Skill_Effect_AttackReplace = 1009  #攻击计算,野外小怪伤害替换1010 (2018-03-07增加精英怪)
 Def_Skill_Effect_Attack = 1010  #攻击计算
@@ -613,7 +627,7 @@
 
 
 #---------需要记录在buff管理器中的效果ID,主要用于查找用---------------------------
-Def_BuffManager_EffectsID = [Def_Skill_Effect_ProBloodPer]
+Def_BuffManager_EffectsID = [Def_Skill_Effect_ProBloodPer, Def_Skill_Effect_AbsorbShieldXMZJ]
 #-------------------------------------------------------------------------
 
 #基础属性效果ID
@@ -1359,11 +1373,11 @@
 #被动技能 Buf最大数目
 Def_Max_PassiveBuff_Count = 30
 #行为技能 buf最大数目
-Def_Max_ActionBuff_Count = 10
+Def_Max_ActionBuff_Count = 20
 #持续增益BUFF最大数目
-Def_Max_ProcessBuff_Count = 10
+Def_Max_ProcessBuff_Count = 20
 #持续减益BUFF最大数目
-Def_Max_ProcessDeBuff_Count = 10
+Def_Max_ProcessDeBuff_Count = 20
 
 #马匹速度技能ID[马匹普通速度, 马匹加速]
 Def_Skill_TypeID_Speed = [60001, 60101]
@@ -1772,6 +1786,10 @@
 Def_FBMapID_XMZZ = 31010
 #神兽副本
 Def_FBMapID_Dogz = 21110
+#聚魂副本
+Def_FBMapID_GatherSoul = 31340
+#跨服竞技场
+Def_FBMapID_CrossRealmPK = 32010
 #副本关闭时未拾取的物品邮件发放给玩家
 #这里只有需要的副本才配置,不做默认逻辑,防止某些副本实际不能给导致刷物品,如麒麟之府
 Def_SendUnPickItemMailMapIDList = [Def_FBMapID_IceLode, Def_FBMapID_PersonalBoss, Def_FBMapID_MunekadoTrial, 
@@ -1797,13 +1815,13 @@
 #                            + Def_FBMapID_ClearDevil
 
 # 刷新标识点在无玩家的情况下也需要刷新的地图
-Def_NoPlayerNeedProcessRefreshPointMap = [Def_FBMapID_SealDemon, Def_FBMapID_GodArea, Def_FBMapID_BossHome]
+Def_NoPlayerNeedProcessRefreshPointMap = [Def_FBMapID_SealDemon, Def_FBMapID_GodArea, Def_FBMapID_BossHome, Def_FBMapID_GatherSoul]
 
 # 可重复进的副本
 Def_NoLimitEnterCntMap = [Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield]
 
 # 无玩家时不自动关闭的自伸缩副本
-Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap]
+Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_GatherSoul]
 
 # 不可切换PK模式的地图
 Def_CanNotChangeAtkModelMap = []
@@ -1859,6 +1877,8 @@
                 'SealDemon':[Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx], #封魔坛
                 'XMZZ':[Def_FBMapID_XMZZ], #仙魔之争
                 'Dogz':[Def_FBMapID_Dogz], #神兽副本
+                'CrossRealmPK':[Def_FBMapID_CrossRealmPK], #跨服竞技场
+                'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
                 }
 
 #特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
@@ -1872,15 +1892,22 @@
 Def_FB_NotifyFBHelpTick = 'NotifyFBHelpTick' # 广播副本帮助信息tick
 Def_FB_NPCStrengthenAverageLV = 'NPCStrengthenAverageLV' # 当前线路成长NPC平均等级
 Def_FB_NPCStrengthenMaxLV = 'NPCStrengthenMaxLV' # 当前线路成长NPC最大等级
+Def_FB_NPCStrengthenMinLV = 'NPCStrengthenMinLV' # 当前线路成长NPC最小等级
 Def_FB_NPCStrengthenPlayerCnt = 'NPCStrengthenPlayerCnt' # 当前线路成长NPC对应玩家数
 Def_FB_TeamPlayerCount = 'TeamPlayerCount' # 组队副本参与玩家数 - 非实时人数,只是进入时的那个人数
 Def_FB_DropDoCountRate = 'DropDoCountRate' # 怪物掉落执行次数万分率
 Def_FB_DropDoCountAdd = 'DropDoCountAdd' # 怪物掉落执行次数加成固定值
 Def_FB_SingleFBPlayerID = 'SingleFBPlayerID' # 个人副本玩家ID
+Def_FB_HelpBattleFBObjID = 'HelpBattleFBObjID_%s' # 助战副本助战NPC机器人/玩家ID对应实例ID, 参数为玩家ID
+Def_FB_HelpBattleGoldCall = 'HelpBattleGoldCall_%s' # 助战机器人是否花费召唤, 参数为玩家ID
 
 FBPlayerDict_EncourageLV = 'FBPlayerDict_EncourageLV'   # 鼓舞等级
 FBPlayerDict_IsDelTicket = 'FBPlayerDict_IsDelTicket'   # 是否已扣除入场券/进入次数
 FBPlayerDict_IsHelpFight = 'FBPlayerDict_IsHelpFight' # 是否助战
+
+FBPD_HelpBattleRefreshCount = 'FBPD_HelpBattleRefreshCount' # 助战已刷新次数
+FBPD_HelpBattleFBFightPower = 'FBPD_HelpBattleFBFightPower' # 副本战力
+FBPD_HelpBattleFBBaseHurt = 'FBPD_HelpBattleFBBaseHurt' # 副本伤害
 
 #领取奖励标识
 (
@@ -2245,6 +2272,7 @@
 TYPE_Map_Tick_ProcessMinute = 10                #每分钟触发事件
 TYPE_Map_Tick_ProcessFiveMinute = 11            #五分钟触发事件
 TYPE_Map_Tick_BossAITick = 12                   #BOSSAI间隔,此处不包含召唤兽,外层控制
+TYPE_Map_Tick_PetAITick = 13                   #宠物AI间隔特殊处理
 
 TYPE_Map_Tick_Time = [
                       1000 * 60 * 3 ,           #0 回报当前地图活跃人数(3分钟一次)
@@ -2259,7 +2287,8 @@
                       1000 * 10     ,           #9 战盟战10秒刷新排行榜
                       1000 * 60     ,           #10 每分钟触发事件
                       1000 * 60 * 5 ,           #11 五分钟触发事件
-                      800,                     #12 BOSS 宠物 镖车的AI间隔
+                      800,                      #12 BOSS 镖车的AI间隔
+                      3000,                     #13 宠物AI特殊处理间隔
                       ]
 
 TYPE_Map_Tick_Count = len( TYPE_Map_Tick_Time ) 
@@ -2955,6 +2984,10 @@
 
 Def_NPC_Dict_SpeedPer = "SpeedPer" # 移动速度变更百分比
 
+# 延迟攻击时长, 毫秒
+Def_NPC_Dict_AtkDelayTick = "AtkDelayTick" # 延迟攻击时长
+Def_NPC_Dict_AtkStartTick = "AtkStartTick" # 开始攻击tick
+
 #玩家状态定义,不能超过31个,如超过,需扩展多个key支持
 Def_PlayerStateList = (
     Def_PlayerState_Normal, # 无 0
@@ -2981,6 +3014,8 @@
 
 #---SetDict 玩家字典KEY,不存于数据库---
 # key的长度不能超过29个字节
+Def_PlayerKey_LockHPSkillID = "LockHPSkillID"   # 锁血功能的技能
+Def_PlayerKey_GodWeaponBeforeProDef = "GWBPD"   # 神兵护盾被攻击前的值
 Def_PlayerKey_curHurtValue = "curHurtValue"     # 计算中的临时伤害值,技能特殊用
 Def_PlayerKey_DefenderObjID = "DefenderObjID"     # 后续触发技能需要用到的对象ID,暂用于玩家
 Def_PlayerKey_SomersaultTime = "Somersault"     # 翻滚一定时间内无敌,表现为MISS
@@ -3058,6 +3093,7 @@
 
 Def_PlayerKey_TotalExpRate = "TotalExpRate"      #总经验加成
 Def_PlayerKey_TeamExpRate = "TeamExpRate"      #组队经验加成
+Def_PlayerKey_TeamMemCount = "TeamMemCount"      #队伍在线玩家数
 Def_PlayerKey_CurState = "PlayerCurState" # 当前状态信息, 标记详见 Def_PlayerStateList
 Def_PlayerKey_AttrFaintRate = "FaintRate"        #触发击晕
 Def_PlayerKey_AttrFaintDefRate = "FaintDefRate"        #击晕抵抗
@@ -3124,6 +3160,7 @@
 Def_PlayerKey_SuperHitRateReduce = "SuperHitRateReduce"  # 抗致命一击概率
 Def_PlayerKey_IgnoreDefRateReduce = "IgnoreDefRateReduce"  # 抗无视防御概率
 Def_PlayerKey_LastHurtValue = "LastHurtValue" # 最后一次伤害值
+Def_PlayerKey_LastHurtNPCObjID = "LastHurtNPCObjID" # 最后攻击的NPCObjID
 Def_PlayerKey_ReduceSkillCDPer = "ReduceSkillCDPer" # 减技能CD万分率
 Def_PlayerKey_CommMapExpRate = "CommMapExpRate" # 常规地图经验倍率加成
 Def_PlayerKey_FinalHurtPer = "FinalHurtPer" # 最终伤害百分比
@@ -3173,6 +3210,7 @@
 
 #功能索引ShareDefine.Def_AttrFruitFuncList
 Def_PlayerKey_FruitAttr = "FruitAttr_%s_%s" # 属性果实增加的属性,参数为(功能索引, 物品效果id)
+Def_PlayerKey_FruitFightPowerEx = "FruitFightPowerEx_%s" # 属性果实增加的附加战力,参数为(功能索引)
 Def_PlayerKey_FamilyLVLeave = "FamilyLVLeave" # 离开的最后一个家族的等级
 
 Def_PlayerKey_CalcAddAttrType = "CalcAType_%s_%s_%s"   # 刷属性类型, 参数[funcIndex, attrIndex, 缓存编号]
@@ -3188,6 +3226,9 @@
 Def_PDict_EquipTotalBaseMaxAtk = "EquipTotalBaseMaxAtk"  # 装备累计基础最大攻击
 Def_PDict_EquipTotalBaseDef = "EquipTotalBaseDef"  # 装备累计基础防御
 Def_PDict_EquipTotalBaseHP = "EquipTotalBaseHP"  # 装备累计基础生命
+
+Def_PDict_TodayXianyuanCoinOnLogin = "TodayXianyuanCoinOnLogin"  # 登录时触发过天后今日还需要增加的仙缘币
+Def_PDict_LoginAddTodayXianyuanCoinTime = "LoginAddTodayXianyuanCoinTime"  # 登录时记录当天增加仙缘币的time值
 
 #---玩家字典KEY,存于数据库---
 #===========================================================================
@@ -3304,13 +3345,13 @@
 Def_Player_Dict_TeamFBMaxLV = "TeamFBMaxLV" # 请求进入的组队副本最大等级, 临时用,进入副本设置完后删除
 Def_Player_Dict_TeamFBPlayerCnt = "TeamFBPlayerCnt" # 请求进入的组队副本玩家个数, 临时用,进入副本设置完后删除
 Def_Player_Dict_ReqFBMissionID = "ReqFBMissionID" # 请求进入副本的任务ID
+Def_Player_Dict_ReqFBMissionType = "ReqFBMissionType" # 请求进入副本的任务类型
 Def_Player_Dict_PlayerFBStar_MapId = "FBStar_%s_%s"  # 副本星级星级信息, 参数为[mapID, key编号], 按位存储每个lineID对应的星级
 Def_Player_Dict_EnterFbCntDay = "EnterFbCntDay_%s"  # 今日进入副本次数, 参数为副本ID
 Def_Player_Dict_BuyFbCntDay = "BuyFbCntDay_%s" # 今日购买副本进入次数, 参数为副本ID
 Def_Player_Dict_RecoverFbCnt = "RecoverFbCnt_%s"  # 今日找回的副本次数, 参数为副本ID
 Def_Player_Dict_ItemAddFbCnt = "ItemAddFbCnt_%s"  # 使用物品增加的副本次数, 参数为副本ID
 Def_Player_Dict_EnterFbCntWeek = "EnterFbCntWeek_%s"  # 本周进入副本次数, 参数为副本ID
-Def_Player_Dict_FBHelpPointCntDay = "FBHelpPointCntDay" # 今日已增加副本助战积分
 Def_Player_Dict_FbCntRegainStartTime = "FbCntRegainStartTime_%s" # 副本次数恢复开始时间, 参数为副本ID
 Def_Player_Dict_FbCntRegainTotalTime = "FbCntRegainTotalTime_%s" # 副本次数恢复还需时间, 参数为副本ID
 Def_Player_Dict_FBHistoryMaxLine = "FBHistoryMaxLine_%s"  # 副本历史最高通关, 参数为副本ID
@@ -3401,6 +3442,7 @@
 Def_PDict_OnlineStartTick = "OnlineStartTime"        # 在线计算时间
 Def_PDict_LVAwardGetRecord = "LVAwardGetRecord"  # 等级奖励领取信息记录,按二进制位标示
 Def_PDict_LVAwardVIPGetRecord = "LVAwardVIPGetRecord"  # 等级奖励vip领取信息记录,按二进制位标示
+Def_PDict_CTGCountResetTime = "CTGCountResetTime"  # CTG次数重置时间time值
 Def_PDict_TodayCTGCount = "TodayCTGCount_%s"  # 当日充值次数,参数(CTG对应的商品记录ID)
 Def_PDict_CTGGoodsBuyCount = "CTGGoodsBuyCount_%s"  # 对应充值商品已购买次数,参数(CTG对应的商品记录ID)
 Def_PDict_GoldGiftGetRecord = "GoldGiftGetRecord"  # 充值豪礼领取信息记录,按二进制位标示
@@ -3608,7 +3650,7 @@
 #累计充值活动
 Def_PDict_TotalRechargeID = "TotalRechargeID"  # 玩家身上的累计充值活动ID,唯一标识,取活动开始日期time值
 Def_PDict_TotalRechargeTemplateID = "TotalRechargeTemplateID"  # 玩家身上的累计充值模板ID
-Def_PDict_TotalRechargeGold = "TotalRechargeGold"  # 消费返利总累计充值仙玉
+Def_PDict_TotalRechargeGold = "TotalRechargeGold"  # 消费返利总累计充值X元
 Def_PDict_TotalRechargeAwardRecord = "TotalRechargeAwardRecord"  # 累计充值领奖记录
 
 #限时特惠活动
@@ -3662,6 +3704,11 @@
 Def_PDict_IceLodeLastCheckTime = "IceLodeLastCheckTime" #上次补发星级奖励时间
 Def_PDict_IceLodeDayLV = "IceLodeDayLV" #今日等级
 Def_PDict_IceLodeIsInFBOnDay = "IceLodeIsInFBOnDay" #在副本里过天
+
+#助战
+Def_PDict_HelpBattleCheckInCount = "HelpBattleCheckInCount" #助战登记次数, 登记次数*10+今日是否登记过
+Def_PDict_HelpBattleTotalCount = "HelpBattleTotalCount" #累计助战次数
+Def_PDict_FBRealHelpCount = "FBRealHelpCount_%s" #副本真实助战次数,仅针对真实进去打的副本,参数mapID
 #-------------------------------------------------------------------------------
 #类型 Def_PDictType_OnlinePrize
 Def_PDict1_OnlinePrizeCnt = "OnlinePrizeCnt"  # 新手在线已领取奖励次数
@@ -3688,6 +3735,9 @@
 # 符印
 Def_PDict_Rune_HoleOpenState = "Rune_HoleOpenState"  # 符印解锁状态
 Def_PDict_Rune_Data = "Rune_Data_%s"  # 符印镶嵌数据, 参数(第几孔)
+
+# 聚魂
+Def_PDict_GatherSoulHoleData = "GatherSoulHoleData_%s"  # 聚魂镶嵌数据, 参数(第几孔)
 
 # 副本 Def_PDictType_FB
 Def_PDict_FamilyBossFBAwardState = "FamilyBossFBAwardState_%s"  # 家族boss副本领奖状态%s副本id
@@ -3791,6 +3841,16 @@
 Def_PDict_MergeKing_RankAward = "PD_MergePK_RankAward" # 跨服王者争霸玩家晋级排名奖励领取记录
 Def_PDict_MergeKing_SupportAward = "PD_MergePK_SupportAward" # 跨服王者争霸玩家竞猜积分奖励领取记录
 Def_PDict_MergeKing_Worship = "PD_MergePK_Worship" # 跨服王者争霸玩家每日膜拜记录
+
+# 跨服竞技场
+Def_PDict_CrossPK_TotalScore = "CrossPK_TotalScore" # 当前总积分
+Def_PDict_CrossPK_OnDayScore = "CrossPK_OnDayScore" # 今天过天时的积分
+Def_PDict_CrossPK_DanLV = "CrossPK_DanLV" # 当前段位
+Def_PDict_CrossPK_PKCount = "CrossPK_PKCount" # 当前总PK次数
+Def_PDict_CrossPK_WinCount = "CrossPK_WinCount" # 当前胜利次数
+Def_PDict_CrossPK_CWinCount = "CrossPK_CWinCount" # 跨当前连胜次数
+Def_PDict_CrossPK_TodayPKCount = "CrossPK_TodayPKCount" # 今日已PK次数
+Def_PDict_CrossPK_TodayBuyCount = "CrossPK_TodayBuyCount" # 今日已购买PK次数
 
 #自动战斗设置记录
 Def_PDict_AutoFightSetting = "AFSetting_%s_%s"
@@ -4272,7 +4332,8 @@
 Def_CalcAttrFunc_DogzBattleSkill, # 助战神兽技能36
 Def_CalcAttrFunc_DogzEquip, # 神兽装备37
 Def_CalcAttrFunc_DogzEquipPlus, # 神兽装备强化38
-) = range(39)
+Def_CalcAttrFunc_GatherSoul, # 聚魂39
+) = range(40)
 
 
 # 在此列表中的功能属性,不享受百分比加成,--属性参与战力计算
@@ -4311,6 +4372,7 @@
                             ShareDefine.Def_MFPType_MagicWeapon3:[Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_Stove, Def_CalcAttrFunc_VIP],
                             ShareDefine.Def_MFPType_StoveYao:[Def_CalcAttrFunc_StoveYao],
                             ShareDefine.Def_MFPType_MagicWeaponSoul:[Def_CalcAttrFunc_MagicWeaponSoul],
+                            ShareDefine.Def_MFPType_GatherSoul:[Def_CalcAttrFunc_GatherSoul],
                             # 神兽战力同装备模块战力一致,受评分影响,装备评分相关的战力另外算
                             ShareDefine.Def_MFPType_Dogz:[Def_CalcAttrFunc_Dogz, Def_CalcAttrFunc_DogzEquipPlus],
                             ShareDefine.Def_MFPType_Other:[Def_CalcAttrFunc_Success, Def_CalcAttrFunc_FamilyTech, Def_CalcAttrFunc_EquipDecompose],
@@ -4380,7 +4442,11 @@
 TriggerType_AttackAddFinalPer,   #增加最终伤害百分比 59
 TriggerType_SummonDie,   #自身召唤兽死亡触发技能 60
 TriggerType_GiftReduceCD, # 天赋用的减CD 61
-) = range(1, 62)
+TriggerType_ProDefValue, # 神兵护盾值下降时 62
+TriggerType_LockHP, # 锁血触发技能 63
+TriggerType_BeLuckyHit, # 被会心一击触发技能 64
+TriggerType_BeLuckyHitSubPer, # 减少受到的会心伤害 65
+) = range(1, 66)
 
 
 # NPC功能类型定义
@@ -4486,7 +4552,9 @@
 Def_VerFix_RuneSource, # 修复老号双属性符印的获取途径;
 Def_VerFix_FMTDouble, # 1.3版本VIP特权变更,记录切换版本前的VIP特权(封魔坛双倍挑战);
 Def_VerFix_SuperGift, # 超值礼包开启变更,原领取首充开启,改成等级到开启;
-) = range(5)
+Def_VerFix_Horse, # 坐骑等级上限修改,对应技能触发修改;
+Def_VerFix_Pet, # 灵宠等级上限修改,对应技能触发修改;
+) = range(7)
 
 ##==================================================================================================
 #游戏消费点类型定义
@@ -4530,6 +4598,8 @@
 Def_Cost_BindJadeWheel, # 绑玉转盘
 Def_Cost_WishingWell, # 许愿池刷新
 Def_Cost_GodWeapon, # 神兵
+Def_Cost_FBHelpBattle, # 副本助战
+Def_Cost_FBGatherSoulBoss, # 聚魂副本BOSS召唤 40
 #-----------以下为暂时没用的,先不删除,如有新增消费点则放在这些之前------------
 Def_Cost_RefreshArrestTask, # 刷新悬赏任务
 Def_Cost_OffLineExp, # 兑换离线经验
@@ -4550,7 +4620,7 @@
 Def_Cost_Trade, # 交易
 Def_Cost_Rename, # 改名
 Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 58)
+) = range(2000, 2000 + 60)
 
 Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
 
@@ -4636,6 +4706,8 @@
 Def_Cost_BindJadeWheel:"BindJadeWheel",
 Def_Cost_WishingWell:"WishingWell",
 Def_Cost_GodWeapon:"GodWeapon",
+Def_Cost_FBHelpBattle:"FBHelpBattle",
+Def_Cost_FBGatherSoulBoss:"FBGatherSoulBoss",
 }
 ## -----------------------------------------------------
 
@@ -4667,7 +4739,8 @@
 Def_GiveMoney_Truck, # 运镖
 Def_GiveMoney_FreeGoods, # 极品白拿 25
 Def_GiveMoney_BindJadeWheel, # 绑玉转盘
-) = range(1000, 1000 + 26)
+Def_GiveMoney_GatherSoulDecompose, #聚魂分解
+) = range(1000, 1000 + 27)
 
 Def_Give_Reason_SonKey = "reason_name_son" # 原因子类说明key
 
@@ -4699,6 +4772,7 @@
 Def_GiveMoney_Truck:"Truck",
 Def_GiveMoney_FreeGoods:"FreeGoods",
 Def_GiveMoney_BindJadeWheel:"BindJadeWheel",
+Def_GiveMoney_GatherSoulDecompose:"GatherSoulDecompose",
 }
 
 ##==================================================================================================
@@ -4788,7 +4862,8 @@
 ItemDel_AddKillBossCnt, # 增加BOSS可击杀次数 32
 ItemDel_DogzEquipPlus, # 神兽装备强化
 ItemDel_ChatBubbleBox, # 激活聊天气泡框
-) = range(2000, 2000 + 35)
+ItemDel_GatherSoul, # 聚魂分解
+) = range(2000, 2000 + 36)
 
 # 物品扣除类型对应信息 {类型:eventName, ...}
 ItemDelTypeDict = {
@@ -4934,7 +5009,10 @@
 VIPPrivilege_29,    #29 娲皇遗迹购买次数 - 副本总表统一处理
 VIPPrivilege_BindJadeWheel,    #30 绑玉转盘次数
 VIPPrivilege_PrayElixir,    #31 丹药祈福次数
-) = range(1, 32)
+VIPPrivilege_32,    #32 封魔坛自动挑战
+VIPPrivilege_XianyuanCoinUpperAdd,    #33 仙缘币上限加成
+VIPPrivilege_XianyuanCoinAddPer,    #34 仙缘币获得倍率加成(万分比)
+) = range(1, 35)
 
 
 (
@@ -4957,9 +5035,11 @@
 ntPet,
 ntTouchKill, #触碰后自杀类 17
 ntUndeath, #不死类型 18
-ntRobot, #上古战场机器人类型 19
+ntDestructible, #场景内可破坏的 19
+ntHelpBattleRobot, #助战机器人 20
+ntRobot, #机器人21
 ntMax
-) = range(21)
+) = range(23)
 
 
 (Def_SkillFuncType_Common, #0为通用技能
@@ -5050,8 +5130,10 @@
 tttFBAddTime, # 可挑战下一关倒计时 6
 tttDeadTime, # 死亡倒计时(古神禁地) 7
 tttPickupItem, # 拾取物品倒计时 8
+tttWaitPlayer, # 等待对手倒计时 9
+tttPlayerLeave, # 对手掉线倒计时 10
 tttMax,
-) = range(10)
+) = range(12)
 
 Def_FBPickupItemTime = 30000
 
@@ -5134,4 +5216,31 @@
 Rune_Source_Unkown,         # 老号未知 0
 Rune_Source_Default,        # 默认 1
 Item_Source_Compound,       # 符印合成 2
-) = range(3)
\ No newline at end of file
+) = range(3)
+
+(
+PowerDownType_Rune, #符印替换
+PowerDownType_LVUP, #人物升级
+PowerDownType_EquipChange, #装备替换
+PowerDownType_StoneChange, #宝石替换
+PowerDownType_Suit, #套装合成
+PowerDownType_EquipWash, #洗练
+PowerDownType_Title, #称号过期
+PowerDownType_Dogz, #神兽召回
+PowerDownType_ResetPoint, #洗点
+PowerDownType_ResetTalent, #大师天赋重置
+PowerDownType_GatherSoul, #聚魂替换
+) = range(11)
+FightPowerDownRecordDict = {
+    PowerDownType_Rune:'Rune',
+    PowerDownType_LVUP:'LVUP',
+    PowerDownType_EquipChange:'EquipChange',
+    PowerDownType_StoneChange:'StoneChange',
+    PowerDownType_Suit:'Suit',
+    PowerDownType_EquipWash:'EquipWash',
+    PowerDownType_Title:'DelTitle',
+    PowerDownType_Dogz:'DogzState',
+    PowerDownType_ResetPoint:'ResetPoint',
+    PowerDownType_ResetTalent:'ResetTalent',
+    PowerDownType_GatherSoul:'GatherSoul',
+    } 
\ No newline at end of file

--
Gitblit v1.8.0