From 6ce06da11598b0012297e502759ade43e63d7eaa Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 25 六月 2019 17:00:59 +0800
Subject: [PATCH] 7534 【2.0.100】【后端】日常活动新增蓬莱仙境
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 107 +++++++++++++++++++++++------------------------------
1 files changed, 46 insertions(+), 61 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index e4ef773..c8002e4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -263,7 +263,7 @@
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 # 直接给符印融合石
@@ -271,7 +271,7 @@
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_GoldMoney]
#---------------------------------------------------------------------
@@ -361,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 #坐骑
@@ -586,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_ChangeSkillTypeID = 1305 # 改变释放的技能ID
+Def_Skill_Effect_AddExpRate = 1306 # 被技能杀死的 额外加经验
#写死的技能效果ID------------NPC专用
Def_Skill_Effect_AttackMove = 2100 # NPC位移战斗
@@ -731,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,
@@ -780,13 +769,10 @@
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 = [
@@ -807,11 +793,6 @@
#内网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
@@ -852,10 +833,6 @@
Def_PackCnt_DogzItem = 100
#初始化神兽装备格子数
Def_PackCnt_DogzEquip = 100
-#初始化诛仙背包格子数
-Def_PackCnt_ZhuXianItem = 100
-#初始化诛仙装备格子数
-Def_PackCnt_ZhuXianEquip = 12
#初始化装备栏2
Def_PackCnt_Equip2 = 0
#初始化回收站
@@ -1099,8 +1076,6 @@
ShareDefine.rptPet,
ShareDefine.rptDogzItem,
ShareDefine.rptDogzEquip,
- ShareDefine.rptZhuXianItem,
- ShareDefine.rptZhuXianEquip,
]
#装备可强化背包列表
@@ -1249,7 +1224,7 @@
) = range( 0, Def_AutoAtkSkillType )
#技能类型
-Def_SkillType_Count = 24
+Def_SkillType_Count = 25
(
Def_SkillType_Special , #特殊技能 0
Def_SkillType_Atk , #攻击类 1
@@ -1275,6 +1250,7 @@
Def_SkillType_PassiveLstPlsBuff, #被动触发持续增益类buff 21
Def_SkillType_PassiveLstDepBuff, #被动触发持续减益类buff 22
Def_SkillType_AttrSkillNoLearn, # 可叠加的同类型ID属性类技能 不可学习 算属性直接取表 目前用于神兽技能 23
+ Def_SkillType_PassiveLstPlsBuffAtk, #被动持续攻击类BUFF 24
) = range( 0, Def_SkillType_Count )
@@ -1298,20 +1274,21 @@
Def_SkillType_PassiveActionBuff : IPY_GameWorld.bfActionBuff , #影响行为BUFF 14
Def_SkillType_PassiveLstPlsBuff: IPY_GameWorld.bfProcessBuff, #被动触发持续增益类buff 3
Def_SkillType_PassiveLstDepBuff: IPY_GameWorld.bfProcessDeBuff, #被动触发持续减益类buff 4
+ Def_SkillType_PassiveLstPlsBuffAtk : IPY_GameWorld.bfProcessBuff , #持续增益BUFF 3
}
# 伤害型技能
-Def_HurtSkill_List = [Def_SkillType_Atk, Def_SkillType_LstPlsBuffAtk]
+Def_HurtSkill_List = [Def_SkillType_Atk, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk]
#持续型技能列表
-Def_LstBuff_List = [ Def_SkillType_LstPlsBuff, Def_SkillType_LstDepBuff, Def_SkillType_LstPlsBuffAtk,
+Def_LstBuff_List = [ Def_SkillType_LstPlsBuff, Def_SkillType_LstDepBuff, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk,
Def_SkillType_PassiveLstPlsBuff, Def_SkillType_PassiveLstDepBuff ]
#对敌使用技能列表
Def_CanAttackSkill_List = [ Def_SkillType_LstDepBuff, Def_SkillType_DepBuff, Def_SkillType_Atk,
- Def_SkillType_Action, Def_SkillType_LstPlsBuffAtk,
+ Def_SkillType_Action, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk,
Def_SkillType_PassiveDepBuff, Def_SkillType_PassiveActionBuff, Def_SkillType_PassiveLstDepBuff ]
#不利BUFF给NPC添加仇恨
@@ -1456,7 +1433,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
@@ -1775,9 +1752,9 @@
Def_FBMapID_SealDemon = 52010
#单人封魔坛
Def_FBMapID_SealDemonEx = 52020
-#诛仙BOSS
+#诛仙BOSS/雷罚BOSS
Def_FBMapID_ZhuXianBoss = 31380
-#天星塔
+#天星塔/丹塔
Def_FBMapID_SkyTower = 31370
#仙魔之争
Def_FBMapID_XMZZ = 31010
@@ -1856,6 +1833,8 @@
# 无玩家时不自动关闭的自伸缩副本
Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_GatherSoul]
+# 无玩家时自动关闭的非自伸缩副本
+Def_NoPlayerCloseNotAutoSizeMap = [Def_FBMapID_ZhuXianBoss]
# 不可切换PK模式的地图
Def_CanNotChangeAtkModelMap = []
@@ -3386,6 +3365,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" # 刷新天书任务时的玩家等级
@@ -3610,10 +3590,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" # 天星塔已通关层数
@@ -4349,14 +4325,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(废弃)
@@ -4379,22 +4355,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],
@@ -4505,7 +4482,10 @@
TriggerType_ThumpHitSuckBloodPer, # 重击百分比吸血, 85
TriggerType_SuperHitPer, # 暴击伤害百分比 86
TriggerType_SkillSuccessExpend, # 使用技能成功后不触发技能 处理消耗等问题用 87
-) = range(1, 88)
+TriggerType_ThumpSkillValue, # 重击增加技能固定值伤害 88
+TriggerType_HitValue, # 记录命中个数 89
+TriggerType_ChangeSkillEff, # 改变技能特效广播 90
+) = range(1, 91)
#不可以佩戴翅膀的地图
@@ -4612,6 +4592,7 @@
Def_Cost_AuctionBid, # 拍卖行竞价
Def_Cost_BuyDailyActionCnt, # 购买活动次数
Def_Cost_FBBuyBuff, # 副本买buff
+Def_Cost_CreatFamily, # 创建仙盟
#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
Def_Cost_RefreshArrestTask, # 刷新悬赏任务
Def_Cost_OffLineExp, # 兑换离线经验
@@ -4624,7 +4605,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
@@ -4704,6 +4685,7 @@
Def_Cost_AuctionBid:"AuctionBid",
Def_Cost_BuyDailyActionCnt:"BuyDailyActionCnt",
Def_Cost_FBBuyBuff:"FBBuyBuff",
+Def_Cost_CreatFamily:"CreatFamily",
}
## -----------------------------------------------------
@@ -4864,7 +4846,7 @@
ItemDel_ChatBubbleBox, # 激活聊天气泡框
ItemDel_GatherSoul, # 聚魂分解
ItemDel_CoatDecompose, # 时装分解
-ItemDel_ZhuXianDecompose, # 诛仙装备分解
+ItemDel_2037,
ItemDel_EquipStarUp, # 装备升星
ItemDel_EquipPlusEvolve, # 装备强化进化
) = range(2000, 2000 + 40)
@@ -4908,7 +4890,6 @@
ItemDel_ChatBubbleBox:"ChatBubbleBox",
ItemDel_GatherSoul:"GatherSoul",
ItemDel_CoatDecompose:"CoatDecompose",
- ItemDel_ZhuXianDecompose:"ZhuXianDecompose",
ItemDel_EquipStarUp:"EquipStarUp",
ItemDel_EquipPlusEvolve:"EquipPlusEvolve",
}
@@ -5012,8 +4993,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 封魔坛购买次数 - 副本总表统一处理
@@ -5027,7 +5008,8 @@
VIPPrivilege_XianyuanCoinUpperAdd, #33 仙缘币上限加成
VIPPrivilege_XianyuanCoinAddPer, #34 仙缘币获得倍率加成（万分比）
VIPPrivilege_35, #35 诛仙BOSS购买次数 - 副本总表统一处理
-) = range(1, 36)
+VIPPrivilege_36, #36 仙丹批量炼制
+) = range(1, 37)
(
@@ -5063,7 +5045,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为宠物技能
@@ -5075,7 +5057,8 @@
Def_SkillFuncType_Dogz, #12 神兽技能
Def_SkillFuncType_ZhuXian, #13 诛仙技能
Def_SkillFuncType_SuiteSkill, #14 套装技能
-) = range(15)
+Def_SkillFuncType_PassiveSkillWithSP, #15 可有专精的被动技能
+) = range(16)
# 受技能效果完全影响的怪， 对应 Def_BattleRelationType_CommNoBoss
Def_SkillAttack_NPCIsBoss = [ Def_NPCType_Ogre_Normal , #平凡小怪 0 # c++ 定义为普通NPC视野刷新
@@ -5118,10 +5101,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]
@@ -5252,7 +5236,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
@@ -5266,7 +5250,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