From 2f282f72a55d7d327b3da040823d39a0239ecfa6 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 27 十一月 2018 22:19:26 +0800
Subject: [PATCH] 5107 子 【优化】【1.3】神兵系统修改 / 【后端】【1.3】神兵新增解锁条件——人物等级

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   44 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 5d2c27b..4bd73c9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -553,6 +553,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 +574,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 +614,7 @@
 
 
 #---------需要记录在buff管理器中的效果ID,主要用于查找用---------------------------
-Def_BuffManager_EffectsID = [Def_Skill_Effect_ProBloodPer]
+Def_BuffManager_EffectsID = [Def_Skill_Effect_ProBloodPer, Def_Skill_Effect_AbsorbShieldXMZJ]
 #-------------------------------------------------------------------------
 
 #基础属性效果ID
@@ -1164,7 +1165,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 +1182,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 +1204,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 +1360,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]
@@ -1875,10 +1878,16 @@
 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' # 副本伤害
 
 #领取奖励标识
 (
@@ -2979,6 +2988,7 @@
 
 #---SetDict 玩家字典KEY,不存于数据库---
 # key的长度不能超过29个字节
+Def_PlayerKey_GodWeaponBeforeProDef = "GWBPD"   # 神兵护盾被攻击前的值
 Def_PlayerKey_curHurtValue = "curHurtValue"     # 计算中的临时伤害值,技能特殊用
 Def_PlayerKey_DefenderObjID = "DefenderObjID"     # 后续触发技能需要用到的对象ID,暂用于玩家
 Def_PlayerKey_SomersaultTime = "Somersault"     # 翻滚一定时间内无敌,表现为MISS
@@ -3122,6 +3132,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" # 最终伤害百分比
@@ -3308,7 +3319,6 @@
 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
@@ -3660,6 +3670,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"  # 新手在线已领取奖励次数
@@ -4378,7 +4393,8 @@
 TriggerType_AttackAddFinalPer,   #增加最终伤害百分比 59
 TriggerType_SummonDie,   #自身召唤兽死亡触发技能 60
 TriggerType_GiftReduceCD, # 天赋用的减CD 61
-) = range(1, 62)
+TriggerType_ProDefValue, # 神兵护盾值下降时 62
+) = range(1, 63)
 
 
 # NPC功能类型定义
@@ -4528,6 +4544,7 @@
 Def_Cost_BindJadeWheel, # 绑玉转盘
 Def_Cost_WishingWell, # 许愿池刷新
 Def_Cost_GodWeapon, # 神兵
+Def_Cost_FBHelpBattle, # 副本助战
 #-----------以下为暂时没用的,先不删除,如有新增消费点则放在这些之前------------
 Def_Cost_RefreshArrestTask, # 刷新悬赏任务
 Def_Cost_OffLineExp, # 兑换离线经验
@@ -4548,7 +4565,7 @@
 Def_Cost_Trade, # 交易
 Def_Cost_Rename, # 改名
 Def_Cost_SkillLvUp, # 技能升级
-) = range(2000, 2000 + 58)
+) = range(2000, 2000 + 59)
 
 Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key
 
@@ -4634,6 +4651,7 @@
 Def_Cost_BindJadeWheel:"BindJadeWheel",
 Def_Cost_WishingWell:"WishingWell",
 Def_Cost_GodWeapon:"GodWeapon",
+Def_Cost_FBHelpBattle:"FBHelpBattle",
 }
 ## -----------------------------------------------------
 
@@ -4932,7 +4950,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)
 
 
 (
@@ -4956,8 +4977,9 @@
 ntTouchKill, #触碰后自杀类 17
 ntUndeath, #不死类型 18
 ntRobot, #上古战场机器人类型 19
+ntHelpBattleRobot, #助战机器人 20
 ntMax
-) = range(21)
+) = range(22)
 
 
 (Def_SkillFuncType_Common, #0为通用技能

--
Gitblit v1.8.0