From b85693e99689649bb80518d7764271a00af8bc15 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 01 九月 2018 16:33:40 +0800
Subject: [PATCH] Fix: 3156 【后端】仙盟联赛参赛资格受仙盟等级限制
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.py | 5 +++++
ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/CreateFamily.py | 7 ++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/CreateFamily.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/CreateFamily.py
index 7eec012..7f5a044 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/CreateFamily.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/CreateFamily.py
@@ -27,7 +27,7 @@
def OnExec(curPlayer, gmList):
if not gmList:
- GameWorld.DebugAnswer(curPlayer, "CreatFamily 创建假仙盟个数 可选参数(是否设置联赛名次)")
+ GameWorld.DebugAnswer(curPlayer, "CreatFamily 创建假仙盟个数 可选参数(仙盟等级 是否设置联赛名次)")
GameWorld.DebugAnswer(curPlayer, "删除创建的假仙盟: CreatFamily 0")
return
@@ -66,7 +66,8 @@
FakeLeaderName = "假盟主".decode(ShareDefine.Def_Game_Character_Encoding).encode(GameWorld.GetCharacterEncoding())
succCreatCount = 0
creatCount = min(100, creatCount)
- warRank = gmList[1] if len(gmList) > 1 else 0
+ familyLV = gmList[1] if len(gmList) > 1 else 1
+ warRank = gmList[2] if len(gmList) > 2 else 0
familyManager = GameWorld.GetFamilyManager()
curCnt = familyManager.GetCount()
for i in xrange(curCnt + 1, creatCount + curCnt + 1):
@@ -79,7 +80,7 @@
succCreatCount += 1
#---创建假仙盟---
curFamily.SetCreateTime(creatTime)
- curFamily.SetLV(1)
+ curFamily.SetLV(familyLV)
curFamily.SetAcceptJoin(ShareDefine.FamilyAcceptJoin_Refuse) # 设置拒绝申请
curFamily.SetLeaderName("%s%s" % (FakeLeaderName, i))
minTotalFightPower -= 1
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.py
index 152d079..8e29300 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.py
@@ -416,11 +416,16 @@
familyMgr = GameWorld.GetFamilyManager()
sortFamilyIDList = PlayerFamily.GetSortFamilyIDList()
familyCount = len(sortFamilyIDList)
+ joinFamilyLVLimit = IpyGameDataPY.GetFuncCfg("FamilyMatchSet", 1)
+ GameWorld.DebugLog("最低参赛仙盟等级： %s" % joinFamilyLVLimit)
for i, familyID in enumerate(sortFamilyIDList):
family = familyMgr.FindFamily(familyID)
if not family:
GameWorld.ErrLog("仙盟联赛首轮分组时无法找到该仙盟: i=%s,familyID=%s" % (i, familyID))
continue
+ if family.GetLV() < joinFamilyLVLimit:
+ GameWorld.Log("仙盟等级不足，无法参与联赛！familyID=%s,LV=%s,joinFamilyLVLimit=%s" % (familyID, family.GetLV(), joinFamilyLVLimit))
+ continue
groupFamilyList.append(family)
# 添加参赛仙盟及成员名单
--
Gitblit v1.8.0