From 81c77baff51bac57b516acb192e36842c8d27646 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 13 十二月 2018 15:27:18 +0800
Subject: [PATCH] 2620 【BUG】【1.3】【1.3.100】生命增长,神兵护盾值表现出现错

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |  121 ++++++++++++++++++++++++++++++++++------
 1 files changed, 102 insertions(+), 19 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index f4d4676..25a277e 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)
 
 
@@ -553,6 +554,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  #攻击计算
@@ -573,7 +575,7 @@
 Def_Skill_Effect_AttackMove = 2100    # NPC位移战斗
 Def_Skill_Effect_RandSkill = 2101    # 从效果值获取随机技能
 Def_Skill_Effect_HPPerLimit = 2102    # 血量限制
-
+Def_Skill_Effect_AppointNPC = 2103    # 指定释放的NPCID 和 Def_UseSkillTag_AppointNPC 搭配使用
 #-----------
 #变身技能(召唤)效果ID
 Def_Skill_Effect_SummonMapNPC = 1162
@@ -613,7 +615,7 @@
 
 
 #---------需要记录在buff管理器中的效果ID,主要用于查找用---------------------------
-Def_BuffManager_EffectsID = [Def_Skill_Effect_ProBloodPer]
+Def_BuffManager_EffectsID = [Def_Skill_Effect_ProBloodPer, Def_Skill_Effect_AbsorbShieldXMZJ]
 #-------------------------------------------------------------------------
 
 #基础属性效果ID
@@ -1164,7 +1166,7 @@
 ) = range(Def_UseSkillAim_Type)
 
 #技能施法目标类型, 修改此处应在Def_Dict_UseSkillTag_ObjType 相应更改
-Def_UseSkillTag_Type = 15
+Def_UseSkillTag_Type = 16
 (
     Def_UseSkillTag_None      ,        #无需选择对象 0
     Def_UseSkillTag_Self      ,        #自己 1 
@@ -1181,6 +1183,7 @@
     Def_UseSkillTag_SummonMaster,      #召唤兽主人 12
     Def_UseSkillTag_CanAttackBaseNPC,      #可攻击的野外小怪(含精英)怪物 13
     Def_UseSkillTag_FriendNPC,         #友好NPC 14
+    Def_UseSkillTag_AppointNPC,         #指定NPC 15 必须和效果值配合 Def_Skill_Effect_AppointNPC
     
 ) = range( 0, Def_UseSkillTag_Type )
 
@@ -1202,6 +1205,7 @@
     Def_UseSkillTag_SummonMaster : [IPY_GameWorld.gotPlayer, IPY_GameWorld.gotNPC],
     Def_UseSkillTag_CanAttackBaseNPC : [IPY_GameWorld.gotNPC],
     Def_UseSkillTag_FriendNPC : [IPY_GameWorld.gotNPC],
+    Def_UseSkillTag_AppointNPC : [IPY_GameWorld.gotNPC],
 }
 
 
@@ -1357,11 +1361,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]
@@ -1870,15 +1874,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' # 副本伤害
 
 #领取奖励标识
 (
@@ -2243,6 +2254,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分钟一次)
@@ -2257,7 +2269,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 ) 
@@ -2953,6 +2966,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
@@ -2979,6 +2996,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
@@ -3056,6 +3075,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"        #击晕抵抗
@@ -3122,6 +3142,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" # 最终伤害百分比
@@ -3171,6 +3192,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, 缓存编号]
@@ -3186,6 +3208,9 @@
 Def_PDict_EquipTotalBaseMaxAtk = "EquipTotalBaseMaxAtk"  # 装备累计基础最大攻击
 Def_PDict_EquipTotalBaseDef = "EquipTotalBaseDef"  # 装备累计基础防御
 Def_PDict_EquipTotalBaseHP = "EquipTotalBaseHP"  # 装备累计基础生命
+
+Def_PDict_TodayXianyuanCoinOnLogin = "TodayXianyuanCoinOnLogin"  # 登录时触发过天后今日还需要增加的仙缘币
+Def_PDict_LoginAddTodayXianyuanCoinTime = "LoginAddTodayXianyuanCoinTime"  # 登录时记录当天增加仙缘币的time值
 
 #---玩家字典KEY,存于数据库---
 #===========================================================================
@@ -3302,16 +3327,17 @@
 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
+Def_Player_Dict_IceLoadLineID = "IceLoadLineID_%s"  # 副本星级星级信息, 参数为[key编号], 按位存储每个lineID是否选中
 Def_Player_Dict_RefurbishGoodBookPlayerLv = "RefurbishGoodBookPlayerLv_97"  # 刷新天书任务时的玩家等级
 Def_Player_Dict_GameFuncFirstTouch = "GameFuncFirstTouch_%s"  # 服务端功能首次触发开启状态; 参数, key编号
 Def_Player_Dict_GameFuncAwardState = "GameFuncAwardState_%s"  # 服务端功能开启领奖状态; 参数, key编号
@@ -3398,6 +3424,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"  # 充值豪礼领取信息记录,按二进制位标示
@@ -3409,6 +3436,7 @@
 Def_PDict_DailyGoldChargeState = "DailyGoldChargeState"  # 天天首充活动状态,0-未开启;1-已开启
 Def_PDict_DailyChargeState = "DailyChargeState"  # 当日是否已充值
 Def_PDict_SuperGiftStartTime = "SuperGiftStartTime"  # 超值礼包开始时间
+Def_PDict_SuperGiftHasOpen = "SuperGiftHasOpen"  # 超值礼包是否开过
 Def_PDict_DailyGoldChargePrizeRecord = "DailyGoldChargePrizeRecord"  # 天天首充领奖记录,0-不可领;1-可领;2-已领
 Def_PDict_DailyGoldChargeCnt = "DailyGoldChargeCnt"  # 当日已充值数
 Def_PDict_SingleGoldGiftIndex = "SingleGoldGiftIndex"  # 单日充值多选一礼包领取状态, 0-未领取,>0已领取索引
@@ -3430,6 +3458,7 @@
 Def_PDict_CollNpcBuyTime = "CollNpcBuyTime_%s"   # 采集NPC功能号对应每日购买采集次数,%sNPC功能号
 Def_PDict_CollNpcIDCollTime = "CollNpcIDCollTime_%s"   # 采集NPCID对应每日对应采集次数,%sNPCID
 Def_PDict_ShopItemDayBuyCnt = "ShopItemDayBuyCnt_%s"   # 商店NPC商品已购买次数,itemIndex
+Def_PDict_ShopItemStartTime = "ShopItemStartTime_%s"   # 神秘限购商品开卖时间,itemIndex
 Def_PDict_ShopItemBuyCnt = "ShopItemBuyCnt_%s_%s"   # 自定义商品已购买次数,(shopID, itemIndex)
 Def_PDict_ShopItemOpenState = "ShopItemOpenState_%s_%s"   # 自定义神秘商店物品开启状态,(shopID, keyNum)
 Def_PDict_TimeShopRefreshCnt = "TimeShopRefreshCnt_%s"   # 自定义神秘商店已手动刷新次数,(shopID)
@@ -3588,6 +3617,7 @@
 
 #封魔坛
 Def_Player_Dict_FMTDouble = "FMTDouble" # 封魔坛是否双倍
+Def_Player_Dict_FMTOldDouble = "FMTOldDouble" # 封魔坛是否曾经可以双倍
 
 #极品白拿
 Def_PDict_FreeGoodsOpenTime = "FreeGoodsOpenTime" #极品白拿开启时间
@@ -3602,7 +3632,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"  # 累计充值领奖记录
 
 #限时特惠活动
@@ -3650,6 +3680,17 @@
 #聊天气泡
 Def_PDict_ChatBubbleBoxState = "ChatBubbleBoxState_%s"  # 聊天气泡状态, 参数(key编号)
 
+#冰晶矿脉
+Def_PDict_IceLodeStarAwardRecord = "IceLodeStarAwardRecord" #星级奖励领奖记录
+Def_PDict_IceLodeHasSweep = "IceLodeHasSweep" #今日是否已扫荡过
+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"  # 新手在线已领取奖励次数
@@ -3718,6 +3759,7 @@
 Def_PDict_ActivityAwardRecord = "ActivityAwardRecord"  # 活跃度奖励领取记录,按二进制位标识
 Def_PDict_Activity_AwardStage = "Activity_AwardStage"  # 当前活跃奖励阶段
 Def_PDict_Activity_RealmPoint = "Activity_RealmPoint"  # 当前可领修行点
+Def_PDict_Activity_ExtraRealmPoint = "Activity_ExtraRealmPoint"  # 多倍活动额外获得的修行点
 # 每日活动
 Def_PDict_DailyActionDayTimes = "DailyActionDayTimes_%s"  # 每日活动今日完成次数 参数每日活动ID
 Def_PDict_DailyActionWeekTimes = "DailyActionWeekTimes_%s"  # 每日活动本周完成次数 参数每日活动ID
@@ -4367,7 +4409,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功能类型定义
@@ -4471,7 +4517,9 @@
 Def_VerFix_ChatBubbleBox, # 1.2版本购买VIP礼包可获得激活气泡框道具,针对已购买过VIP礼包的老号处理;
 Def_VerFix_CTGDoublePrize, # 1.2版本开放首充双倍,重置老号充值ID对应累计充值次数;
 Def_VerFix_RuneSource, # 修复老号双属性符印的获取途径;
-) = range(3)
+Def_VerFix_FMTDouble, # 1.3版本VIP特权变更,记录切换版本前的VIP特权(封魔坛双倍挑战);
+Def_VerFix_SuperGift, # 超值礼包开启变更,原领取首充开启,改成等级到开启;
+) = range(5)
 
 ##==================================================================================================
 #游戏消费点类型定义
@@ -4511,9 +4559,11 @@
 Def_Cost_DogzEquipPlus, # 神兽装备强化
 Def_Cost_RuneHole, # 符印孔解锁
 Def_Cost_AlchemyPray, # 丹药祈福
-Def_Cost_ResetGreatMasterSkill, # 重置天赋技能
+Def_Cost_ResetGreatMasterSkill, # 重置天赋技能 35
 Def_Cost_BindJadeWheel, # 绑玉转盘
 Def_Cost_WishingWell, # 许愿池刷新
+Def_Cost_GodWeapon, # 神兵
+Def_Cost_FBHelpBattle, # 副本助战
 #-----------以下为暂时没用的,先不删除,如有新增消费点则放在这些之前------------
 Def_Cost_RefreshArrestTask, # 刷新悬赏任务
 Def_Cost_OffLineExp, # 兑换离线经验
@@ -4534,7 +4584,7 @@
 Def_Cost_Trade, # 交易
 Def_Cost_Rename, # 改名
 Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 57)
+) = range(2000, 2000 + 59)
 
 Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
 
@@ -4619,6 +4669,8 @@
 Def_Cost_AlchemyPray:"AlchemyPray",
 Def_Cost_BindJadeWheel:"BindJadeWheel",
 Def_Cost_WishingWell:"WishingWell",
+Def_Cost_GodWeapon:"GodWeapon",
+Def_Cost_FBHelpBattle:"FBHelpBattle",
 }
 ## -----------------------------------------------------
 
@@ -4917,7 +4969,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)
 
 
 (
@@ -4940,9 +4995,11 @@
 ntPet,
 ntTouchKill, #触碰后自杀类 17
 ntUndeath, #不死类型 18
-ntRobot, #上古战场机器人类型 19
+ntDestructible, #场景内可破坏的 19
+ntHelpBattleRobot, #助战机器人 20
+ntRobot, #机器人21
 ntMax
-) = range(21)
+) = range(23)
 
 
 (Def_SkillFuncType_Common, #0为通用技能
@@ -5066,7 +5123,8 @@
 Def_RewardType_WishingWell, # 许愿池奖励16
 Def_RewardType_OpenFunc, # 功能开启奖励17
 Def_RewardType_TotalRecharge, # 累计充值奖励18
-)= range(19)
+Def_RewardType_IceLodeStar, # 冰晶矿脉星级奖励19
+)= range(20)
 
 
 #boss复活相关活动定义
@@ -5116,4 +5174,29 @@
 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, #大师天赋重置
+) = range(10)
+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',
+    } 
\ No newline at end of file

--
Gitblit v1.8.0