From 4dcb18d0e7848effd25e0d5970e9c84808da957c Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 10 六月 2019 14:12:34 +0800
Subject: [PATCH] 7155 【后端】【2.0】新增仙盟创建规则

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   83 +++++++++++++++++++++++++++--------------
 1 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 2711992..0101a93 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             #所有类型
@@ -450,6 +451,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       #使用道具给予符印精华
@@ -764,7 +766,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,      # 吸血 
 
 (
@@ -785,27 +789,24 @@
 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  
@@ -2970,6 +2971,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
@@ -3065,8 +3067,6 @@
 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
@@ -3373,6 +3373,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
@@ -3506,8 +3507,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开始
@@ -3785,11 +3786,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
@@ -3882,6 +3886,7 @@
 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" #炼丹祈福次数
@@ -3928,6 +3933,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
@@ -4473,7 +4482,7 @@
 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
@@ -4486,7 +4495,12 @@
 TriggerType_BurnPer,    # 灼烧伤害百分比 80
 TriggerType_BurnDisappear,    # 灼烧消失触发 81
 TriggerType_SkillValue,    # 增加技能伤害固定值 82
-) = range(1, 83)
+TriggerType_HitSuccess,        # 命中成功率 83
+TriggerType_AddHP,        # 技能回血 84
+TriggerType_ThumpHitSuckBloodPer,   # 重击百分比吸血, 85
+TriggerType_SuperHitPer,  # 暴击伤害百分比 86
+TriggerType_SkillSuccessExpend, # 使用技能成功后不触发技能 处理消耗等问题用 87
+) = range(1, 88)
 
 
 #不可以佩戴翅膀的地图
@@ -4593,6 +4607,7 @@
 Def_Cost_AuctionBid, # 拍卖行竞价
 Def_Cost_BuyDailyActionCnt, # 购买活动次数
 Def_Cost_FBBuyBuff, # 副本买buff
+Def_Cost_CreatFamily, # 创建仙盟
 #-----------以下为暂时没用的,先不删除,如有新增消费点则放在这些之前------------
 Def_Cost_RefreshArrestTask, # 刷新悬赏任务
 Def_Cost_OffLineExp, # 兑换离线经验
@@ -4605,7 +4620,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
 
@@ -4685,6 +4700,7 @@
 Def_Cost_AuctionBid:"AuctionBid",
 Def_Cost_BuyDailyActionCnt:"BuyDailyActionCnt",
 Def_Cost_FBBuyBuff:"FBBuyBuff",
+Def_Cost_CreatFamily:"CreatFamily",
 }
 ## -----------------------------------------------------
 
@@ -4896,6 +4912,10 @@
 
 ##==================================================================================================
 
+# 前端自定义场景状态
+CustomMapStep_Over = 0 # 没有或已结束
+CustomMapStep_Fight = 1 # 战斗进行中
+
 # 副本参与类型
 FB_JoinType = (
 FB_JoinType_None, # 默认无
@@ -5051,7 +5071,8 @@
 Def_SkillFuncType_RealmSuppress,  #11为境界压制 目前是NPC在用
 Def_SkillFuncType_Dogz,     #12 神兽技能
 Def_SkillFuncType_ZhuXian,     #13 诛仙技能
-) = range(14)
+Def_SkillFuncType_SuiteSkill,     #14 套装技能
+) = range(15)
 
 # 受技能效果完全影响的怪, 对应 Def_BattleRelationType_CommNoBoss
 Def_SkillAttack_NPCIsBoss = [ Def_NPCType_Ogre_Normal     ,  #平凡小怪 0    # c++ 定义为普通NPC视野刷新
@@ -5083,6 +5104,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,
                            }
 
 
@@ -5186,12 +5208,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 = (
@@ -5225,7 +5249,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
@@ -5239,7 +5263,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