From 5d7c40ddd0f7a7589f5dd2e7835de8094f63d803 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 04 十二月 2018 15:16:53 +0800
Subject: [PATCH] 1 已删除 PyNetPack
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 77 insertions(+), 12 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
index e5ca696..854b607 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
@@ -45,7 +45,7 @@
self.fightPower = 0
self.familyID = 0
self.vipLV = 0
- self.checkInCount = 0
+ self.checkInCount = 0 # 累计登记次数
self.checkInTime = 0
self.todayHelpCountDict = {} # 今天已助战次数 {(mapID, lineID):count, ...}, 通用次数时lineID默认为0
self.todayXianyuanCoin = 0 # 今日已获得仙缘币
@@ -85,7 +85,7 @@
helpBattlePlayer.playerName = recData.GetStrValue1()
helpBattlePlayer.todayXianyuanCoin = int(recData.GetStrValue2())
helpCountDictStr = recData.GetStrValue3()
- if helpCountDictStr.startswith("{") and helpCountDictStr.endswith("{"):
+ if helpCountDictStr.startswith("{") and helpCountDictStr.endswith("}"):
helpBattlePlayer.todayHelpCountDict = eval(helpCountDictStr)
else:
GameWorld.ErrLog("LoadCheckInPlayerError: helpCountDictStr=%s" % helpCountDictStr, playerID)
@@ -174,7 +174,69 @@
if playerID not in PyGameData.g_fbHelpBattleRecord:
return
unNotifyRecordList = PyGameData.g_fbHelpBattleRecord.pop(playerID)
- SendMapServer_FBHelpBattleRecord(curPlayer, unNotifyRecordList)
+ SendMapServer_FBHelpBattleRecord(curPlayer, unNotifyRecordList, True)
+ return
+
+def OnMinuteProcess():
+ ''' 每分钟处理
+ 前X次登记后，分别在登记后的第X分钟赠送玩家宗门试炼一层的助战仙缘币，并伪造一份助战记录。
+ 助战记录随机从助战登记库里随机挑选1名除自己外的玩家，如果没有玩家，该特殊逻辑不生效
+ '''
+
+ if not PyGameData.g_fbHelpBattleCheckInPlayerDict:
+ return
+ helpPlayerIDList = PyGameData.g_fbHelpBattleCheckInPlayerDict.keys()
+
+ curTime = int(time.time())
+
+ playerManager = GameWorld.GetPlayerManager()
+ newbieCheckInCount = IpyGameDataPY.GetFuncCfg("HelpBattleCheckIn", 2) # 新手前X次登记特殊逻辑
+ sysAutoCallHelpDict = IpyGameDataPY.GetFuncEvalCfg("HelpBattleCheckIn", 3) # 系统自动召唤助战，默认功能线路0， {登记多少分钟后:[随机地图ID, ...], ...}
+ for playerID, checkInPlayer in PyGameData.g_fbHelpBattleCheckInPlayerDict.items():
+
+ curPlayer = playerManager.FindPlayerByID(playerID)
+
+ if not curPlayer or PlayerControl.GetIsTJG(curPlayer):
+ #GameWorld.DebugLog(" 离线或脱机不处理, playerID=%s" % playerID)
+ continue
+
+ checkInCount = checkInPlayer.checkInCount
+ if checkInCount > newbieCheckInCount:
+ #GameWorld.DebugLog(" 超过规定的登记次数，不处理, playerID=%s,checkInCount=%s > newbieCheckInCount=%s"
+ # % (playerID, checkInCount, newbieCheckInCount))
+ continue
+
+ checkInTime = checkInPlayer.checkInTime
+ checkInMinutes = (curTime - checkInTime) / 60
+ if checkInMinutes not in sysAutoCallHelpDict:
+ #GameWorld.DebugLog(" 签到时间不满足，不处理, playerID=%s,checkInMinutes=%s not in %s"
+ # % (playerID, checkInMinutes, sysAutoCallHelpDict))
+ continue
+
+ randHelpMapList = sysAutoCallHelpDict[checkInMinutes]
+ # 随机一个不是自己的登记玩家
+ for _ in xrange(20):
+ randPlayerID = random.choice(helpPlayerIDList)
+ if randPlayerID != playerID:
+ break
+
+ # 只有自己不处理
+ if randPlayerID == playerID:
+ #GameWorld.DebugLog(" 登记玩家只有自己，不处理, playerID=%s" % (playerID))
+ continue
+
+ randHelpMapID = random.choice(randHelpMapList)
+ lineID = 0 # 默认0
+
+ helpBattlePlayer = PyGameData.g_fbHelpBattleCheckInPlayerDict[randPlayerID]
+ relation = __GetHelpBattleRelation(curPlayer, helpBattlePlayer)
+ calledPlayerID = playerID # 因为这里是系统模拟玩家被召唤助战，所以被召唤玩家就是当前被处理的玩家ID
+ GameWorld.DebugLog(" 系统模拟召唤新手登记玩家: checkInMinutes=%s,playerID=%s,callPlayerID=%s" % (checkInMinutes, playerID, randPlayerID))
+
+ calledPlayerDict = {calledPlayerID:relation}
+ msgList = ["Call", randHelpMapID, lineID, calledPlayerDict]
+ __DoFBHelpBattleCall(randPlayerID, helpBattlePlayer.playerName, msgList)
+
return
## 是否在助战登记列表里
@@ -199,7 +261,7 @@
# 召唤
elif cmd == "Call":
- result = __DoFBHelpBattleCall(curPlayer, msgList)
+ result = __DoFBHelpBattleCall(curPlayer.GetPlayerID(), curPlayer.GetName(), msgList)
if result == None:
return
@@ -235,13 +297,14 @@
% (curPlayer.GetLV(), fightPower, curPlayer.GetFamilyID(), curPlayer.GetVIPLv(), todayXianyuanCoin, checkInCount + 1, haveViewCache), playerID)
return [isOK, haveViewCache]
-def UpdateCheckInPlayerInfo(playerID, fightPower, familyID):
+def UpdateCheckInPlayerInfo(playerID, fightPower, familyID, playerName):
## 更新登记的助战玩家等级战力
if playerID not in PyGameData.g_fbHelpBattleCheckInPlayerDict:
return
helpBattlePlayer = PyGameData.g_fbHelpBattleCheckInPlayerDict[playerID]
helpBattlePlayer.fightPower = fightPower
helpBattlePlayer.familyID = familyID
+ helpBattlePlayer.playerName = playerName
GameWorld.DebugLog("更新助战玩家等级战力: fightPower=%s,familyID=%s" % (fightPower, familyID), playerID)
return
@@ -384,7 +447,7 @@
if PlayerFriend.IsFriend(playerID, tagPlayerID):
return checkRelation
if checkRelation == 2:
- if curPlayer.GetFamilyID() == tagFamilyID:
+ if tagFamilyID and curPlayer.GetFamilyID() == tagFamilyID:
return checkRelation
return 0
@@ -403,9 +466,10 @@
helpPlayerDict["Relation"] = relation
return helpPlayerDict
-def __DoFBHelpBattleCall(curPlayer, msgList):
+def __DoFBHelpBattleCall(callPlayerID, callPlayerName, msgList):
''' 助战召唤，不管最终过关与否，被召唤方都直接算助战成功，这里处理被召唤的，主动方在地图直接处理
'''
+ # calledPlayerDict = {} # {被召唤的玩家ID:关系, ...}
mapID, funcLineID, calledPlayerDict = msgList[1:]
fbFuncIpyData = IpyGameDataPY.GetIpyGameData("FBFunc", mapID)
fbHelpIpyData = IpyGameDataPY.GetIpyGameData("FBHelpBattle", mapID, funcLineID)
@@ -421,8 +485,8 @@
helpCountKey = (mapID, helpCountLineID)
curTime = int(time.time())
- tagPlayerID = curPlayer.GetPlayerID()
- tagPlayerName = curPlayer.GetName()
+ tagPlayerID = callPlayerID
+ tagPlayerName = callPlayerName
playerMgr = GameWorld.GetPlayerManager()
xianyuanCoinUpper = IpyGameDataPY.GetFuncCfg("HelpBattlePoint", 1) # 每日仙缘币上限
baseHelpPoint = fbFuncIpyData.GetHelpPoint() # 助战 - 基础仙缘币
@@ -453,7 +517,8 @@
coinAdd = int((baseHelpPoint + relationAdd) * addCoinRate / 10000.0)
canAddMax = max(playerXianyuanCoinUpper - todayXianyuanCoin, 0)
coinAddReal = min(coinAdd, canAddMax) # 实际加仙缘币
- GameWorld.DebugLog(" 助战增加仙缘币: coinAddReal=%s, todayMapHelpCount=%s" % (coinAddReal, todayMapHelpCount), calledPlayerID)
+ GameWorld.DebugLog(" 助战增加仙缘币: todayXianyuanCoin=%s,coinUpper=%s,canAddMax=%s,coinAdd=%s,coinAddReal=%s, todayMapHelpCount=%s"
+ % (todayXianyuanCoin, playerXianyuanCoinUpper, canAddMax, coinAdd, coinAddReal, todayMapHelpCount), calledPlayerID)
# GameServer 直接先加
helpBattlePlayer.todayXianyuanCoin += coinAddReal
@@ -479,7 +544,7 @@
return
-def SendMapServer_FBHelpBattleRecord(curPlayer, syncHelpRecordList):
+def SendMapServer_FBHelpBattleRecord(curPlayer, syncHelpRecordList, isLogin=False):
if not syncHelpRecordList:
return
@@ -487,7 +552,7 @@
for record in syncHelpRecordList:
helpRecordList.append([record.callPlayerID, record.callPlayerName, record.mapID, record.funcLineID,
record.xianyuanCoinAdd, record.relation, record.vipLV, record.recordTime])
- addXianyuanCoinMsg = str(["HelpRecord", helpRecordList])
+ addXianyuanCoinMsg = str(["HelpRecord", helpRecordList, isLogin])
curPlayer.MapServer_QueryPlayerResult(0, 0, 'FBHelpBattle', addXianyuanCoinMsg, len(addXianyuanCoinMsg))
GameWorld.DebugLog(" MapServer_QueryPlayerResult %s" % addXianyuanCoinMsg, curPlayer.GetPlayerID())
return
--
Gitblit v1.8.0