From 09aed73ffcc4cab69fb81198f93b4baca891d467 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 22 六月 2019 17:53:47 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 有专精的被动
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 174 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 95 insertions(+), 79 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 19bf715..babd797 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -258,11 +258,12 @@
Def_ItemID_VIPExperience = 985 # VIP体验卡
# 直接转换为对应数值的物品ID列表
+Def_ItemID_GoldMoney = 20 # 直接给仙玉
Def_ItemID_SilverMoney = 22 # 直接给铜钱
Def_ItemID_FamilyContribution = 26 # 直接给战盟贡献点
Def_ItemID_FamilyActive = 28 # 直接给战盟活跃点
Def_ItemID_SP = 29 # 直接给sp
-Def_ItemID_GoldPaper = 30 # 直接给绑玉
+#Def_ItemID_GoldPaper = 30 # 直接给绑玉
Def_ItemID_RealmPoint = 24 # 直接给修行点
Def_ItemID_BossReborn = 21 # 直接给boss复活点
Def_ItemID_Ysog = 4306 # 直接给符印融合石
@@ -270,9 +271,9 @@
Def_ItemID_SoulSplinters = 701 # 直接给聚魂碎片
Def_ItemID_SoulCore = 702 # 直接给核心环
Def_ItemID_Honor = 2141 # 直接给荣誉
-Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, Def_ItemID_GoldPaper,
+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_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor]
+ Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor, Def_ItemID_GoldMoney]
#---------------------------------------------------------------------
#写死的物品类型都放这边
Def_ItemType_All = -1 #所有类型
@@ -360,20 +361,7 @@
Def_ItemType_DogzEquipScute = 123 # 神兽鳞甲
Def_ItemType_AddCrossRealmPKCnt = 127 #增加跨服PK次数
-Def_ItemType_ZXCloak = 128 # 诛仙披风
-Def_ItemType_ZXMask = 129 # 诛仙面具
-Def_ItemType_ZXGlove = 130 # 诛仙手套
-Def_ItemType_ZXRuyi = 131 # 诛仙如意
-Def_ItemType_ZXPendant = 132 # 诛仙吊坠
-Def_ItemType_ZXRing = 133 # 诛仙戒指
-Def_ItemType_ZXWeapon1 = 134 # 诛仙剑1
-Def_ItemType_ZXWeapon2 = 135 # 诛仙剑2
-Def_ItemType_ZXWeapon3 = 136 # 诛仙剑3
-Def_ItemType_ZXWeapon4 = 137 # 诛仙剑4
-Def_ItemType_ZhuXianStuff = 138 # 诛仙材料
-
Def_ItemType_DogzStuff = 139 # 神兽材料
-Def_ItemType_ZhuXianStone = 140 # 诛仙宝石
#以下定义物品类型下次删除
Def_Item_Type_Horse = 1000036 #坐骑
@@ -450,6 +438,7 @@
Def_Effect_ItemGiveWeekPartyPoint = 245 #使用道具给予七日巡礼积分
Def_Effect_ItemGiveWeekPartyPoint1 = 246 #使用道具给予节日巡礼积分
Def_Effect_AddRealmExpRate = 251 #增加聚灵效率
+Def_Effect_TouchMission = 252 #触发任务
#----以下未使用或代码依然存在的---
Def_Effect_ItemGiveGongXun = 1920 #使用道具给予功勋
Def_Effect_ItemGiveRuneJH = 1925 #使用道具给予符印精华
@@ -584,7 +573,8 @@
Def_Skill_Effect_ProcessAttack = 1314 # 间隔性攻击，A值为攻击次数，B值为是否广播客户端
Def_Skill_Effect_BuffTick = 9999 #BUFF的时间处理间隔
Def_Skill_Effect_BurnToAddHP = 1091 #buff中灼烧伤害转化吸血给 放灼烧者
-Def_Skill_Effect_ProBloodPer = 4505 #buff中中毒伤害百分比增加（给受害者的buff）
+Def_Skill_Effect_ChangeSkillTypeID = 1305 # 改变释放的技能ID
+Def_Skill_Effect_AddExpRate = 1306 # 被技能杀死的 额外加经验
#写死的技能效果ID------------NPC专用
Def_Skill_Effect_AttackMove = 2100 # NPC位移战斗
@@ -729,6 +719,7 @@
Def_SkillID_FamilyWar_RandBuffAttr = 22203 # 仙盟联赛 - 随机buff属性加成，根据采集次数，成长buff等级
Def_SkillID_FamilyWar_OwnerlessBuff = 22213 # 仙盟联赛 - 无主buff，随机N个敌方水晶变为无主
+Def_SkillID_LXHY_AddExpRate = 47113 # 流星火雨杀死的怪增加经验
# 切地图需清除的buff
ClearBuffOnMapChangeList = [Def_SkillID_DropOwnerBuff, Def_SkillID_FamilyWar_CWinBuff,
@@ -764,7 +755,9 @@
Def_HurtType_ZhognjiZhansha, # 终极斩杀 14
Def_HurtType_DeadlyHit, # 致命一击 15
Def_HurtType_ThumpHit, # 重击 16
-) = range(1, 17)
+Def_HurtType_Yinji, # 印记 17
+Def_HurtType_Burn, # 灼烧 18
+) = range(1, 19)
#Def_HurtType_SuckBlood, # 吸血
(
@@ -776,36 +769,30 @@
Def_EquipItemType_TJGAutoEat = xrange(Def_ItemType_retWeapon, Def_ItemType_retShoes + 1)
#装备类型
-Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1) + range(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)
+Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1)
#神兽装备类型
Def_DogzEquiipType = xrange(Def_ItemType_DogzEquipHorn, Def_ItemType_DogzEquipScute + 1)
-#诛仙装备类型
-Def_ZhuXianEquiipType = xrange(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)
-
# 技能造成实质性伤害的类型
-Def_RealAttack_Type = [Def_HurtType_Normal, # 普通伤害 1
- Def_HurtType_Parry, # 格挡 5
- Def_HurtType_DoubleHit, # 连击 6
- Def_HurtType_SuperHit, # 暴击 7
- Def_HurtType_LuckyHit, # 会心一击伤害 8
- Def_HurtType_RealmSupress, # 境界压制 11
-
+Def_RealAttack_Type = [
+ Def_HurtType_Normal, # 普通伤害 1
+ Def_HurtType_Parry, # 格挡 5
+ Def_HurtType_DoubleHit, # 连击 6
+ Def_HurtType_SuperHit, # 暴击 7
+ Def_HurtType_LuckyHit, # 会心一击伤害 8
+ Def_HurtType_RealmSupress, # 境界压制 11
Def_HurtType_Zhuxian, # 诛仙一击 13
Def_HurtType_DeadlyHit, # 致命一击 15
Def_HurtType_ThumpHit, # 重击 16
+ Def_HurtType_Yinji,
+ Def_HurtType_Burn,
]
#---------------------------------------------------------------------
#内网GM等级
Def_GM_LV_God = 90
#---------------------------------------------------------------------
-#游戏中所有的金钱类型
-Def_MoneyType_All = [IPY_GameWorld.TYPE_Price_Gold_Money, # 元宝
- IPY_GameWorld.TYPE_Price_Gold_Paper, # 礼券
- IPY_GameWorld.TYPE_Price_Silver_Money, # 银子
- ]
#客户端心跳响应封包间隔(毫秒)
Def_PlayerOnLineReply_ClientReply = 30000 #30000
@@ -846,10 +833,6 @@
Def_PackCnt_DogzItem = 100
#初始化神兽装备格子数
Def_PackCnt_DogzEquip = 100
-#初始化诛仙背包格子数
-Def_PackCnt_ZhuXianItem = 100
-#初始化诛仙装备格子数
-Def_PackCnt_ZhuXianEquip = 12
#初始化装备栏2
Def_PackCnt_Equip2 = 0
#初始化回收站
@@ -1093,8 +1076,6 @@
ShareDefine.rptPet,
ShareDefine.rptDogzItem,
ShareDefine.rptDogzEquip,
- ShareDefine.rptZhuXianItem,
- ShareDefine.rptZhuXianEquip,
]
#装备可强化背包列表
@@ -1324,6 +1305,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 # 每次触发层级递增
@@ -1447,7 +1431,7 @@
#自动恢复计算间隔
Def_HPRestoreInterval = 5000
#允许重置的背包索引
-Def_CanItemResetPack = [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure, ShareDefine.rptZhuXianItem]
+Def_CanItemResetPack = [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure]
#仓库分页个数
Def_ItemReset_WarehousePageCnt = 56
#玩家捡起物品的距离 8
@@ -1766,9 +1750,9 @@
Def_FBMapID_SealDemon = 52010
#单人封魔坛
Def_FBMapID_SealDemonEx = 52020
-#诛仙BOSS
+#诛仙BOSS/雷罚BOSS
Def_FBMapID_ZhuXianBoss = 31380
-#天星塔
+#天星塔/丹塔
Def_FBMapID_SkyTower = 31370
#仙魔之争
Def_FBMapID_XMZZ = 31010
@@ -1847,6 +1831,8 @@
# 无玩家时不自动关闭的自伸缩副本
Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_GatherSoul]
+# 无玩家时自动关闭的非自伸缩副本
+Def_NoPlayerCloseNotAutoSizeMap = [Def_FBMapID_ZhuXianBoss]
# 不可切换PK模式的地图
Def_CanNotChangeAtkModelMap = []
@@ -2967,6 +2953,7 @@
Def_NPC_Dict_FromRefreshValue = 'FromRefreshValue'
#召唤地图NPC的玩家ID
Def_NPC_Dict_SummonMapNPCPlayerID = 'SummonMapNPCPlayerID'
+Def_NPC_Dict_PriWoodPilePlayerID = 'PriWoodPilePlayerID'
#NPC技能已使用次数
Def_NPC_Dict_SkillUseCnt = 'NPCSkillUseCnt_%s' # 参数skillTypeID
#不死的boss
@@ -3002,6 +2989,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 = (
@@ -3059,9 +3047,8 @@
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
Def_PlayerKey_ChangeMapID = "ChangeMapID" # 请求切换的地图ID
Def_PlayerKey_ResetFBLinePosX = "ResetFBLinePosX" # 请求切换副本多合一地图功能线路ID
Def_PlayerKey_ResetFBLinePosY = "ResetFBLinePosY" # 请求切换副本多合一地图功能线路ID
@@ -3368,6 +3355,7 @@
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_CustomMapStep = "CustomMapStep_%s_%s" # 前端自定义场景阶段, 参数(mapID, lineID)，对应 CustomMapStep_Fight ...
Def_Player_Dict_EnterFbCntDay = "EnterFbCntDay_%s" # 今日进入副本次数, 参数为副本ID
Def_Player_Dict_BuyFbCntDay = "BuyFbCntDay_%s" # 今日购买副本进入次数, 参数为副本ID
Def_Player_Dict_RecoverFbCnt = "RecoverFbCnt_%s" # 今日找回的副本次数, 参数为副本ID
@@ -3375,6 +3363,7 @@
Def_Player_Dict_EnterFbCntWeek = "EnterFbCntWeek_%s" # 本周进入副本次数, 参数为副本ID
Def_Player_Dict_FbCntRegainStartTime = "FbCntRegainStartTime_%s" # 副本次数恢复开始时间, 参数为副本ID
Def_Player_Dict_FbCntRegainTotalTime = "FbCntRegainTotalTime_%s" # 副本次数恢复还需时间, 参数为副本ID
+Def_Player_Dict_FbCntRegainOverTime = "FbCntRegainOverTime_%s" # 副本次数恢复超出的次数, 参数为副本ID
Def_Player_Dict_FBHistoryMaxLine = "FBHistoryMaxLine_%s" # 副本历史最高通关, 参数为副本ID
Def_Player_Dict_IceLoadLineID = "IceLoadLineID_%s" # 副本星级星级信息, 参数为[key编号], 按位存储每个lineID是否选中
Def_Player_Dict_RefurbishGoodBookPlayerLv = "RefurbishGoodBookPlayerLv_97" # 刷新天书任务时的玩家等级
@@ -3501,8 +3490,8 @@
Def_PDict_AddPointValue = "AddPointValue_%s" # 已加属性点数, 参数(属性ID)
Def_PDict_AttrFruitEatCnt = "AttrFruitEatCnt_%s" # 已吃属性果实个数，参数为物品id
Def_PDict_AttrFruitAddValue = "AttrFruitAddValue_%s" # 已吃属性果实增加的属性，参数为物品id
-Def_PDict_AttrFruitAddItemCnt = "FruitAddItemCnt_%s" # 已吃增幅丹个数，参数为果实物品id
-
+Def_PDict_AttrFruitAddItemCnt = "FruitAddItemCnt_%s" # 增幅丹增加上限数，参数为果实物品id
+Def_PDict_AttrFruitItemBreakCnt = "FruitItemBreakCnt_%s" # 增幅丹突破次数，参数为果实物品id
Def_PDict_NobleLV = "NobleLV" # 贵族等级, 0位为不同贵族模式版本切换标记位, 从1位开始表示每种等级贵族开通情况， 1-已开通过；9-永久
Def_PDict_NobleEndTime = "NobleEndTime_%s" # 贵族到期结束时间<单位s>, 参数为贵族等级, 从1开始
@@ -3599,10 +3588,6 @@
#试炼之塔
Def_Player_Dict_TrialTower_PassLV = "TrialTower_PassLV" # 试炼之塔通关层数
Def_Player_Dict_TrialTower_LastDayPassLV = "Tower_LastDayPassLV" # 试炼之塔昨日通关层数
-#诛仙塔
-Def_Player_Dict_ZhuXianTowerPassLV = "ZhuXianTowerPassLV" # 诛仙塔已通关层数
-Def_Player_Dict_ZhuXianTowerLastFloor = "ZhuXianTowerLastFloor" # 诛仙塔上次挑战层数
-Def_Player_Dict_ZhuXianTowerCostTime = "ZhuXianTowerCostTime" # 诛仙塔通关时间
#天星塔
Def_Player_Dict_SkyTowerFloor = "SkyTowerFloor" # 天星塔已通关层数
@@ -3780,11 +3765,14 @@
# 每日活跃度
Def_PDict_Activity_FinishCnt = "Activity_FinishCnt_%s" # 活跃度类型对应完成次数
-Def_PDict_Activity_TotalPoint = "Activity_TotalPoint" # 当前总活跃值
+Def_PDict_Activity_TotalPoint = "Activity_TotalPoint" # 当前总活跃值（不可消耗）
+Def_PDict_ActivityCanCostTotalPoint = "ActivityCanCostTotalPoint" # 当前总活跃值（可消耗）
+Def_PDict_ActivityHistoryPoint = "ActivityHistoryPoint" # 累积获得活跃值
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_DailyActionDayBuyTimes = "DADayBuyTimes_%s" # 每日活动今日购买次数 参数每日活动ID
@@ -3877,7 +3865,8 @@
Def_PDict_AlchemyLearnState = "AlchemyLearnState%s" #丹方是否已学习
Def_PDict_AlchemyItemID = "AlchemyItemID_%s" #炼丹中的丹药ID 参数丹药类型
Def_PDict_AlchemyStartTime = "AlchemyStartTime_%s" #炼丹开始时间 参数丹药ID
-
+Def_PDict_AlchemyTimes = "AlchemyTimes_%s" #本次炼丹几次 参数丹药ID
+Def_PDict_AlchemyCnt = "AlchemyCnt%s" #丹药炼丹次数
Def_PDict_AlchemyPrayCnt = "AlchemyPrayCnt" #炼丹祈福次数
@@ -3923,6 +3912,10 @@
Def_PDict_FairyDomainVisitCnt = "FairyDomainVisitCnt" #寻访总次数
Def_PDict_FairyAdventuresData = "FairyAdventuresData_%s" #奇遇数值 唯一ID*100+档位 参数事件ID
Def_PDict_FairyDomainEventAppearCnt = "FDEventAppearCnt%s" #事件出现次数 参数事件ID AAABBB BBB:小时段出现次数 AAA:今日出现次数
+
+#草园
+Def_PDict_GrasslandNPCCount = "GrasslandNPCCount_%s" #草园NPCID个数，参数NPCID
+Def_PDict_GrasslandDropCount = "GrasslandDropCount_%s" #草园掉落统计，参数编号，记录格式 itemID*100+dropCount
#五行专精
Def_PDict_SkillElementID = "SkillElementID%s" #主技能选择的专精技能 参数主技能ID
@@ -4330,14 +4323,14 @@
Def_CalcAttrFunc_Plus, # 装备位强化 5
Def_CalcAttrFunc_Stone, # 装备宝石 6
Def_CalcAttrFunc_Wash, # 洗练 7
-Def_CalcAttrFunc_Wing, # 翅膀 8
+Def_CalcAttrFunc_Wing, # 翅膀 - 废弃 8
Def_CalcAttrFunc_Pet, # 灵宠 9
Def_CalcAttrFunc_Horse, # 坐骑 10
Def_CalcAttrFunc_Prestige, # 境界 11
Def_CalcAttrFunc_GodWeapon, # 神兵 12
Def_CalcAttrFunc_Dienstgrad, # 称号 13
Def_CalcAttrFunc_Rune, # 符印 14
-Def_CalcAttrFunc_EquipOutOfPrint, # 绝版属性随等级变化 15
+Def_CalcAttrFunc_15,
Def_CalcAttrFunc_Success, # 成就属性 16
Def_CalcAttrFunc_VIP, # VIP属性 17
Def_CalcAttrFunc_Stove, # 炼丹炉 18(废弃)
@@ -4360,22 +4353,23 @@
Def_CalcAttrFunc_MagicWeapon4, # 王者法宝 35
Def_CalcAttrFunc_Coat, # 时装 36
Def_CalcAttrFunc_LingQi, # 灵器 37
-) = range(38)
+Def_CalcAttrFunc_LingQiAttr, # 灵器属性 38
+) = range(39)
# 技能功能点列表 - 默认不算战力，不享受百分比加成，技能功能点暂时配置，之后优化技能属性逻辑后可去掉
CalcAttrFuncSkillList = [Def_CalcAttrFunc_HorseSkill, Def_CalcAttrFunc_PetSkill, Def_CalcAttrFunc_DogzBattleSkill]
# 不计算战力的功能点列表 - 由其他方式计算的战力的功能点，如装备用评分计算
-CalcAttrFuncNoFightPowerList = [Def_CalcAttrFunc_Equip, Def_CalcAttrFunc_DogzEquip]
+CalcAttrFuncNoFightPowerList = [Def_CalcAttrFunc_Equip, Def_CalcAttrFunc_DogzEquip, Def_CalcAttrFunc_LingQiAttr]
#战斗力分组类型对应功能点属性分类索引列表，并不是一一对应的，有些战斗力类型可由多个功能点组成
#***注意***: 以下功能点需包含上面定义的所有功能点，不然会导致有些属性无法加上
MFPTypeAttrFuncIndexDict = {ShareDefine.Def_MFPType_Role:[Def_CalcAttrFunc_RoleBase],
- ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_Equip, Def_CalcAttrFunc_EquipOutOfPrint],
+ ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_Equip],
ShareDefine.Def_MFPType_LingGen:[Def_CalcAttrFunc_LingGenQuailty, Def_CalcAttrFunc_LingGen],
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, Def_CalcAttrFunc_LingQi],
+ ShareDefine.Def_MFPType_LingQi:[Def_CalcAttrFunc_LingQi, Def_CalcAttrFunc_LingQiAttr],
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],
@@ -4468,19 +4462,28 @@
TriggerType_SuperHitSubLayer, # 暴击减层 67
TriggerType_SuperHitSkipCD, # 暴击无冷却 68
TriggerType_BuffHurtCnt, # 当持续buff伤害第X次时触发技能 69
-TriggerType_4074PerValue, # 特殊效果的加成 70
+TriggerType_AttackAddSkillPerYinji, # 增加技能伤害 同TriggerType_AttackAddSkillPer 区别为飘字 70
TriggerType_dFinalHurtReducePer, # 防守方的最终伤害减少百分比 71
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
TriggerType_SuperHitSuckBloodPer, # 暴击百分比吸血, 79
TriggerType_BurnPer, # 灼烧伤害百分比 80
TriggerType_BurnDisappear, # 灼烧消失触发 81
-) = range(1, 82)
+TriggerType_SkillValue, # 增加技能伤害固定值 82
+TriggerType_HitSuccess, # 命中成功率 83
+TriggerType_AddHP, # 技能回血 84
+TriggerType_ThumpHitSuckBloodPer, # 重击百分比吸血, 85
+TriggerType_SuperHitPer, # 暴击伤害百分比 86
+TriggerType_SkillSuccessExpend, # 使用技能成功后不触发技能 处理消耗等问题用 87
+TriggerType_ThumpSkillValue, # 重击增加技能固定值伤害 88
+TriggerType_HitValue, # 记录命中个数 89
+TriggerType_ChangeSkillEff, # 改变技能特效广播 90
+) = range(1, 91)
#不可以佩戴翅膀的地图
@@ -4587,6 +4590,7 @@
Def_Cost_AuctionBid, # 拍卖行竞价
Def_Cost_BuyDailyActionCnt, # 购买活动次数
Def_Cost_FBBuyBuff, # 副本买buff
+Def_Cost_CreatFamily, # 创建仙盟
#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
Def_Cost_RefreshArrestTask, # 刷新悬赏任务
Def_Cost_OffLineExp, # 兑换离线经验
@@ -4599,7 +4603,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
@@ -4679,6 +4683,7 @@
Def_Cost_AuctionBid:"AuctionBid",
Def_Cost_BuyDailyActionCnt:"BuyDailyActionCnt",
Def_Cost_FBBuyBuff:"FBBuyBuff",
+Def_Cost_CreatFamily:"CreatFamily",
}
## -----------------------------------------------------
@@ -4839,7 +4844,7 @@
ItemDel_ChatBubbleBox, # 激活聊天气泡框
ItemDel_GatherSoul, # 聚魂分解
ItemDel_CoatDecompose, # 时装分解
-ItemDel_ZhuXianDecompose, # 诛仙装备分解
+ItemDel_2037,
ItemDel_EquipStarUp, # 装备升星
ItemDel_EquipPlusEvolve, # 装备强化进化
) = range(2000, 2000 + 40)
@@ -4883,12 +4888,15 @@
ItemDel_ChatBubbleBox:"ChatBubbleBox",
ItemDel_GatherSoul:"GatherSoul",
ItemDel_CoatDecompose:"CoatDecompose",
- ItemDel_ZhuXianDecompose:"ZhuXianDecompose",
ItemDel_EquipStarUp:"EquipStarUp",
ItemDel_EquipPlusEvolve:"EquipPlusEvolve",
}
##==================================================================================================
+
+# 前端自定义场景状态
+CustomMapStep_Over = 0 # 没有或已结束
+CustomMapStep_Fight = 1 # 战斗进行中
# 副本参与类型
FB_JoinType = (
@@ -4937,9 +4945,9 @@
CME_Known:"未知",
CME_Class_Horse:"坐骑",
CME_Class_Wing:"翅膀",
-CME_Class_Official:"爵位",
-CME_FB_RunDaily:"日常跑环",
-CME_FB_RunFamily:"战盟跑环",
+CME_Class_Official:"爵位",
+CME_FB_RunDaily:"日常跑环",
+CME_FB_RunFamily:"战盟跑环",
}
# 功能对应的事件记录类型
@@ -4983,8 +4991,8 @@
VIPPrivilege_18, #18 洗炼副本购买次数 - 副本总表统一处理
VIPPrivilege_19, #19 虚无禁地额外次数 - 副本总表统一处理
VIPPrivilege_20, #20 暮光神庙购买次数
-VIPPrivilege_21, #21 恶魔深渊购买次数 - 副本总表统一处理
-VIPPrivilege_22, #22 黑暗之门购买次数
+VIPPrivilege_21, #21 仙界秘境 - 副本总表统一处理
+VIPPrivilege_22, #22 宗门试炼购买次数
VIPPrivilege_FamilyGoldPack, #23 仙盟钻石红包
VIPPrivilege_BoursePwd, #24 集市上架使用密码
VIPPrivilege_25, #25 封魔坛购买次数 - 副本总表统一处理
@@ -4998,7 +5006,8 @@
VIPPrivilege_XianyuanCoinUpperAdd, #33 仙缘币上限加成
VIPPrivilege_XianyuanCoinAddPer, #34 仙缘币获得倍率加成（万分比）
VIPPrivilege_35, #35 诛仙BOSS购买次数 - 副本总表统一处理
-) = range(1, 36)
+VIPPrivilege_36, #36 仙丹批量炼制
+) = range(1, 37)
(
@@ -5034,7 +5043,7 @@
(Def_SkillFuncType_Common, #0为通用技能
Def_SkillFuncType_FbSkill, #1为法宝功能获得的主动技能
Def_SkillFuncType_FbPassiveSkill, #2为法宝功能获得的被动技能
-Def_SkillFuncType_FbSPSkill, #3为法宝功能获得的SP技能
+Def_SkillFuncType_FbSPSkill, #3为法宝功能获得的SP技能 (专精)
Def_SkillFuncType_GiftSkill, #4为天赋技能
Def_SkillFuncType_HorseSkill, #5为坐骑技能
Def_SkillFuncType_PetSkill, #6为宠物技能
@@ -5045,7 +5054,9 @@
Def_SkillFuncType_RealmSuppress, #11为境界压制 目前是NPC在用
Def_SkillFuncType_Dogz, #12 神兽技能
Def_SkillFuncType_ZhuXian, #13 诛仙技能
-) = range(14)
+Def_SkillFuncType_SuiteSkill, #14 套装技能
+Def_SkillFuncType_PassiveSkillWithSP, #15 可有专精的被动技能
+) = range(16)
# 受技能效果完全影响的怪， 对应 Def_BattleRelationType_CommNoBoss
Def_SkillAttack_NPCIsBoss = [ Def_NPCType_Ogre_Normal , #平凡小怪 0 # c++ 定义为普通NPC视野刷新
@@ -5077,6 +5088,7 @@
Def_SkillFuncType_HorseSkill:ShareDefine.Def_MFPType_Horse,
Def_SkillFuncType_PetSkill:ShareDefine.Def_MFPType_Pet,
Def_SkillFuncType_GWSkill:ShareDefine.Def_MFPType_Prestige,
+ Def_SkillFuncType_SuiteSkill:ShareDefine.Def_MFPType_Equip,
}
@@ -5087,10 +5099,11 @@
GoldInvestType_Gold, # 仙玉投资
GoldInvestType_Gold2, # 仙玉投资2
GoldInvestType_Gold3, # 仙玉投资3
-) = range(1,5+1)
+GoldInvestType_Week, # 周卡投资
+) = range(1,6+1)
#可以循环投资的类型
-CanRepeatInvestType = [GoldInvestType_Month, GoldInvestType_VIP]
+CanRepeatInvestType = [GoldInvestType_Week, GoldInvestType_Month, GoldInvestType_VIP]
#仙玉投资类型
InvestGoldTypeList = [GoldInvestType_Gold, GoldInvestType_Gold2, GoldInvestType_Gold3]
@@ -5180,12 +5193,14 @@
Def_BRAct_WorldBOSS, #击杀世界boss获得掉落归属 6
Def_BRAct_BOSSHome, #击杀boss之家获得掉落归属 7
Def_BRAct_FMT, #挑战封魔坛BOSS 8
-Def_BRAct_RunTask, #完成师门悬赏 9
+Def_BRAct_RunTask, #完成仙盟跑环 9
Def_BRAct_XJMJ, #完成仙界秘境 10
Def_BRAct_KirinHome, #完成麒麟之府 11
Def_BRAct_TowerSweep, #符印塔扫荡 12
Def_BRAct_RuneTreasure, #符印寻宝 13
-) = range(1, 13+1)
+Def_BRAct_FairyDomain, #缥缈仙域 14
+Def_BRAct_FamilyBoss, #仙盟BOSS 15
+) = range(1, 15+1)
#全民来嗨活动定义
PeoplePartyActIDList = (
@@ -5219,7 +5234,7 @@
Def_WPAct_CrossPK, #跨服pk 11
Def_WPAct_Recharge, #充值X仙玉 12
Def_WPAct_GiftBag, #购买限时礼包 13
-Def_WPAct_FamilyRobBoss, #boss争夺战 14
+Def_WPAct_HorsePetBoss, #骑宠争夺 14
Def_WPAct_SWRH, #守卫人皇 15
Def_WPAct_ElderBattlefield, #上古战场 16
Def_WPAct_ChaosDemon, #混乱妖域 17
@@ -5233,7 +5248,8 @@
Def_WPAct_GodWeapon, #神兵总等级 25
Def_WPAct_Rune, #穿戴某品质符印 26
Def_WPAct_Pray, #祈愿 27
-) = range(1, 27+1)
+Def_WPAct_FamilyBoss, #仙盟Boss 28
+) = range(1, 28+1)
#可提前完成的周狂欢活动
AheadFinishWPActList = [Def_WPAct_Horse, Def_WPAct_Pet, Def_WPAct_Dogz, Def_WPAct_Rune]
--
Gitblit v1.8.0