From d9f13c5e9a02f31cad2f58357acd3140809e88c1 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 11 九月 2018 19:57:27 +0800
Subject: [PATCH] fix:3477【后端】【1.0.15】【1.1.0】娲皇遗迹新增Vip特权：副本购买次数
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.py | 66 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.py
index 8e29300..d5a9976 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.py
@@ -223,7 +223,7 @@
if familyWarRank:
GameWorld.Log("解散仙盟，触发更新仙盟联赛排名: delFamilyID=%s,familyWarRank=%s" % (familyID, familyWarRank))
- PlayerFamily.UpdFamilyWarRank()
+ UpdFamilyWarRank()
# 补发未分配的连胜奖励
AllotWinRewardBySystem(GetFamilyWarChampionRecData(), True)
@@ -294,7 +294,9 @@
# 下周分组定级
elif stateValue == FamilyWarState_NextWeekGroupRank:
- DoLogicFamilyWar_NextWeekGroupRank()
+ pass
+ #废弃该阶段逻辑
+ #DoLogicFamilyWar_NextWeekGroupRank()
else:
GameWorld.ErrLog("不存在该仙盟联赛状态！stateValue=%s" % stateValue)
@@ -425,20 +427,20 @@
continue
if family.GetLV() < joinFamilyLVLimit:
GameWorld.Log("仙盟等级不足，无法参与联赛！familyID=%s,LV=%s,joinFamilyLVLimit=%s" % (familyID, family.GetLV(), joinFamilyLVLimit))
- continue
- groupFamilyList.append(family)
-
- # 添加参赛仙盟及成员名单
- PyGameData.g_familyWarFamilyIDList.append(familyID)
- for index in xrange(family.GetCount()):
- curMember = family.GetAt(index)
- memPlayerID = curMember.GetPlayerID()
- memPlayer = curMember.GetPlayer()
- isAddOK = AddFamilyWarMem(memPlayerID, familyID, warMemRecList)
- lastJoinFamilyID = lastFamilyWarMemDict.get(memPlayerID, 0)
- # 重新通知玩家参与的仙盟
- if lastJoinFamilyID and isAddOK and lastJoinFamilyID != familyID and memPlayer:
- __NotifyPlayerJoinFamilyInfo(memPlayer, familyID)
+ else:
+ groupFamilyList.append(family)
+
+ # 添加参赛仙盟及成员名单
+ PyGameData.g_familyWarFamilyIDList.append(familyID)
+ for index in xrange(family.GetCount()):
+ curMember = family.GetAt(index)
+ memPlayerID = curMember.GetPlayerID()
+ memPlayer = curMember.GetPlayer()
+ isAddOK = AddFamilyWarMem(memPlayerID, familyID, warMemRecList)
+ lastJoinFamilyID = lastFamilyWarMemDict.get(memPlayerID, 0)
+ # 重新通知玩家参与的仙盟
+ if lastJoinFamilyID and isAddOK and lastJoinFamilyID != familyID and memPlayer:
+ __NotifyPlayerJoinFamilyInfo(memPlayer, familyID)
# 满一组仙盟数 or 没有仙盟了
if len(groupFamilyList) == FamilyWar_GroupFamilyCount or i == familyCount - 1:
@@ -453,6 +455,8 @@
GameWorld.Log(" PyGameData.g_familyWarFamilyIDList: %s" % PyGameData.g_familyWarFamilyIDList)
GameWorld.Log(" PyGameData.g_familyWarMemDict: %s" % PyGameData.g_familyWarMemDict)
+ GameWorld.Log(" 通用记录对战家族数: %s" % warBatRecList.Count())
+ GameWorld.Log(" 通用记录参与玩家数: %s" % warMemRecList.Count())
GameWorld.Log(" 仙盟联赛首轮比赛分组确认完毕！")
PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_FamilyWar_Round, FamilyWarRound_First) # 设置已处理过的轮次
return
@@ -736,6 +740,34 @@
PlayerFamily.UpdFamilyWarRank()
return
+def UpdFamilyWarRank():
+ '''更新仙盟联赛排名
+ 注意：该逻辑在仙盟联赛周期中不可执行，仅在下周分组定级状态下可更新，由程序控制，在活动结束后结算调用
+ 仙盟联赛新一周期开始时、仙盟解散时 会触发该逻辑
+ '''
+ #gameWorld = GameWorld.GetGameWorld()
+ #state = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyWar)
+ #if state != GameWorldFamilyWar.FamilyWarState_NextWeekGroupRank:
+ # GameWorld.DebugLog("非下周分组定级阶段不可更新仙盟联赛排名!")
+ # return
+
+ GameWorld.Log("=== 更新仙盟联赛排名 ===")
+
+ familyMgr = GameWorld.GetFamilyManager()
+ sortFamilyIDList = PlayerFamily.GetSortFamilyIDList()
+ for rank, familyID in enumerate(sortFamilyIDList, 1):
+ family = familyMgr.FindFamily(familyID)
+ if not family:
+ continue
+ curRank = PlayerFamily.GetFamilyWarRank(family)
+ if not curRank:
+ break
+ if curRank != rank:
+ PlayerFamily.SetFamilyWarRank(family, rank)
+ GameWorld.Log(" 更新仙盟联赛仙盟排名: familyID=%s,curRank=%s,updRank=%s" % (family.GetID(), curRank, rank))
+
+ return
+
def __DoLogicFamilyWarAllOver():
''' 仙盟赛全部比赛结束后逻辑
非最高级别组: 第一名晋级
@@ -862,6 +894,8 @@
PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_FamilyWar_Round, 0) # 重置对战轮次
PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_FamilyWar_AllOver, 1) # 设置已经处理过总结算
+
+ UpdFamilyWarRank() # 改为比赛结束后默认更新联赛排名
return
def UpdFamilyWarChampion(championFamilyID):
--
Gitblit v1.8.0