From 01e033a79a5ce63e298015d0783560a77ccffea9 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 14 九月 2018 11:46:46 +0800
Subject: [PATCH] fix:3543 【后端】【主干】【1.0.15】开服红包优化 每天赠送次数
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py | 103 ++++++++++++++++++++++++++++++---------------------
1 files changed, 60 insertions(+), 43 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py
index fe9b667..50c2fcb 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py
@@ -665,6 +665,47 @@
NetPackCommon.SendFakePack(curPlayer, familyViewPack)
return
+#// A4 12 搜索家族 #tagCGPySearchFamily
+#
+#struct tagCGPySearchFamily
+#{
+# tagHead Head;
+# BYTE MsgLen; //模糊搜索家族，如果输入为空，则为不限制该条件
+# char Msg[MsgLen]; //size = MsgLen
+# BYTE LV; //最低家族等级,如果为0，则不限制该条件
+# BYTE MaxCount; //搜索结果所需最大条数，后端限制最多返回20条
+# BYTE IsSearching; //默认1，如果有指定其他值，则返回指定值
+#};
+def PySearchFamily(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+
+ msg = clientData.Msg
+ minFamilyLV = clientData.LV
+ maxCount = min(20, clientData.MaxCount)
+ IsSearching = clientData.IsSearching
+
+ familyMgr = GameWorld.GetFamilyManager()
+ familyViewPack = ChPyNetSendPack.tagGCPyAllFamilyView()
+ familyViewPack.Clear()
+ familyViewPack.IsSearching = IsSearching
+ familyViewPack.TotalCount = 1
+ #familyViewPack.CurPage = viewPage
+ familyViewPack.Family = []
+ for i, familyID in enumerate(PyGameData.g_sortFamilyIDList):
+ family = familyMgr.FindFamily(familyID)
+ if not family:
+ continue
+ if msg not in family.GetName():
+ continue
+ if minFamilyLV and family.GetLV() < minFamilyLV:
+ continue
+ familyViewPack.Family.append(__GetFamilyView(i, family))
+ if len(familyViewPack.Family) >= maxCount:
+ break
+ familyViewPack.PageCount = len(familyViewPack.Family)
+ NetPackCommon.SendFakePack(curPlayer, familyViewPack)
+ return
+
#class IPY_CFamilyChangeBroadcast
#{
#public:
@@ -708,7 +749,7 @@
pack = IPY_GameServer.IPY_CFamilyChangeBroadcast()
#更改家族公告
curFamily.SetBroadcast(pack.GetMsg())
-
+ GameWorld.Log('更改仙盟公告 Family=%s,公告=%s'%(GameWorld.CodeToGBK(curFamily.GetName()), GameWorld.CodeToGBK(pack.GetMsg())), curPlayerID)
#通知客户端家族信息改变
curFamily.Broadcast_FamilyChange()
playerManager = GameWorld.GetPlayerManager()
@@ -1153,10 +1194,11 @@
if pack_FamilyLv not in ChConfig.Def_Family_MemberLVList:
GameWorld.Log("更改家族成员等级->封包异常->等级 = %s不存在" % (pack_FamilyLv), curPlayerID)
return
- if curMember.GetFamilyLV() != IPY_GameServer.fmlLeader:
- if tagMember.GetFamilyLV() >= curMember.GetFamilyLV() or pack_FamilyLv >= curMember.GetFamilyLV():
- GameWorld.Log("更改家族成员等级->目标职位比自己的高或者对方的当前职位比自己高", curPlayerID)
- return
+ if not isGMOP:
+ if curMember.GetFamilyLV() != IPY_GameServer.fmlLeader:
+ if tagMember.GetFamilyLV() >= curMember.GetFamilyLV() or pack_FamilyLv >= curMember.GetFamilyLV():
+ GameWorld.Log("更改家族成员等级->目标职位比自己的高或者对方的当前职位比自己高", curPlayerID)
+ return
familyID = curFamily.GetID() # 家族ID
familyName = curFamily.GetName() # 家族名字
@@ -1223,7 +1265,8 @@
if GetFamilyMemberHasPow(tagMember, ChConfig.Def_PurviewDictKey_CanCall):
tagPlayer.Sync_FamilyInfo()
PlayerFamilyAction.ViewFamilyRequestInfo(tagPlayer)
-
+ if isGMOP:
+ curFamily.SetBroadcast('')
curFamily.Broadcast_FamilyChange()
return True
#---------------------------------------------------------------------
@@ -2464,13 +2507,13 @@
familyMoney = family.GetMoney()
- useMoney = GetFamilySetting(family, ChConfig.Def_FamilySetting_SystemLostMoney)
-
- #家族资金不足, 解散
- if familyMoney < useMoney:
- family.SetMoney(0)
- delFamilyList.append(family)
- continue
+# useMoney = GetFamilySetting(family, ChConfig.Def_FamilySetting_SystemLostMoney)
+#
+# #家族资金不足, 解散
+# if familyMoney < useMoney:
+# family.SetMoney(0)
+# delFamilyList.append(family)
+# continue
#多久没人上线，解散
offlineDay = GetLastOnlineMemberOfflineTime(family)
GameWorld.DebugLog(' 仙盟%s %s天没人上线了'%(family.GetID(), offlineDay))
@@ -2486,10 +2529,10 @@
ChConfig.Def_Family_ClearRequestAddNote_Day)
#此处不通知地图服务器家族资金变更
- family.SetMoney(familyMoney - useMoney)
- if useMoney > 0:
- #帮会日常维持消耗{%S1%}银两帮会资金
- PlayerControl.FamilyNotify(family.GetID(), 'jiazu_lhs_272921', [useMoney])
+# family.SetMoney(familyMoney - useMoney)
+# if useMoney > 0:
+# #帮会日常维持消耗{%S1%}银两帮会资金
+# PlayerControl.FamilyNotify(family.GetID(), 'jiazu_lhs_272921', [useMoney])
#自动传位
__AutoChangeLeader(family)
@@ -3301,32 +3344,6 @@
return ret
return 0
-
-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
-
- familyMgr = GameWorld.GetFamilyManager()
- sortFamilyIDList = GetSortFamilyIDList()
- for rank, familyID in enumerate(sortFamilyIDList, 1):
- family = familyMgr.FindFamily(familyID)
- if not family:
- continue
- curRank = GetFamilyWarRank(family)
- if not curRank:
- break
- if curRank != rank:
- SetFamilyWarRank(family, rank)
- GameWorld.Log("更新仙盟联赛仙盟排名: familyID=%s,rank=%s" % (family.GetID(), rank))
-
- return
#// A4 11 一键申请入盟 #tagCGOneKeyJoinFamily
#
--
Gitblit v1.8.0