From 47e583801c89ba24233de12ddd4291945ef15827 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 28 十一月 2018 15:46:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 202 insertions(+), 15 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
index eb7a34a..b86c71e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.py
@@ -16,21 +16,23 @@
#-------------------------------------------------------------------------------
import PlayerFriend
-import PlayerViewCache
import IpyGameDataPY
+import PlayerViewCache
+import IPY_GameServer
+import PlayerControl
+import ShareDefine
import PyGameData
import GameWorld
+import ChConfig
import random
import time
-import IPY_GameServer
-import PlayerControl
-import ChConfig
-import ChPyNetSendPack
-import NetPackCommon
MaxRobotID = 100 # 最大机器人NPC定义ID
-
+
+Def_RecType_CheckInPlayer = ShareDefine.Def_UniversalGameRecType_FBHelpBattleCheckInPlayer
+Def_RecType_HelpRecord = ShareDefine.Def_UniversalGameRecType_FBHelpBattleRecord
+
## 助战玩家简要信息
class HelpBattlePlayer():
@@ -43,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 # 今日已获得仙缘币
@@ -62,7 +64,181 @@
self.vipLV = 0 # 当时的VIP等级
self.recordTime = 0 # 记录的时间
return
+
+def OnServerStart():
+ GameWorld.Log("开服加载助战相关信息...")
+ universalRecMgr = GameWorld.GetUniversalRecMgr()
+ checkInPlayerRecList = universalRecMgr.GetTypeList(Def_RecType_CheckInPlayer)
+ for index in xrange(checkInPlayerRecList.Count()):
+ recData = checkInPlayerRecList.At(index)
+ playerID = recData.GetValue1()
+ helpBattlePlayer = HelpBattlePlayer(playerID)
+ helpBattlePlayer.checkInTime = recData.GetTime()
+ helpBattlePlayer.fightPower = recData.GetValue2()
+ helpBattlePlayer.familyID = recData.GetValue3()
+ helpBattlePlayer.checkInCount = recData.GetValue4()
+ value5 = recData.GetValue5()
+ helpBattlePlayer.playerLV = value5 / 100000
+ helpBattlePlayer.vipLV = int(str(value5)[-5:-3])
+ helpBattlePlayer.realmLV = int(str(value5)[-3:-1])
+ helpBattlePlayer.job = value5 % 10
+ helpBattlePlayer.playerName = recData.GetStrValue1()
+ helpBattlePlayer.todayXianyuanCoin = int(recData.GetStrValue2())
+ helpCountDictStr = recData.GetStrValue3()
+ if helpCountDictStr.startswith("{") and helpCountDictStr.endswith("{"):
+ helpBattlePlayer.todayHelpCountDict = eval(helpCountDictStr)
+ else:
+ GameWorld.ErrLog("LoadCheckInPlayerError: helpCountDictStr=%s" % helpCountDictStr, playerID)
+ PyGameData.g_fbHelpBattleCheckInPlayerDict[playerID] = helpBattlePlayer
+ GameWorld.Log("加载助战登记玩家记录: %s" % len(PyGameData.g_fbHelpBattleCheckInPlayerDict))
+ helpRecordRecList = universalRecMgr.GetTypeList(Def_RecType_HelpRecord)
+ for index in xrange(helpRecordRecList.Count()):
+ recData = helpRecordRecList.At(index)
+ playerID = recData.GetValue1()
+
+ helpRecord = FBHelpBattleRecord()
+ helpRecord.callPlayerID = int(recData.GetStrValue2())
+ helpRecord.callPlayerName = recData.GetStrValue1()
+ helpRecord.mapID = recData.GetValue2()
+ helpRecord.funcLineID = recData.GetValue3()
+ helpRecord.xianyuanCoinAdd = recData.GetValue4()
+ helpRecord.relation = recData.GetValue5() % 10
+ helpRecord.vipLV = recData.GetValue5() / 10
+ helpRecord.recordTime = recData.GetTime()
+
+ unNotifyRecordList = PyGameData.g_fbHelpBattleRecord.get(playerID, [])
+ unNotifyRecordList.append(helpRecord)
+ PyGameData.g_fbHelpBattleRecord[playerID] = unNotifyRecordList
+
+ GameWorld.Log("加载玩家未同步助战: %s" % len(PyGameData.g_fbHelpBattleRecord))
+ for playerID, helpList in PyGameData.g_fbHelpBattleRecord.items():
+ GameWorld.Log("加载玩家未同步助战记录: %s" % (len(helpList)), playerID)
+ return
+
+def OnServerClose():
+ GameWorld.Log("关服保存助战相关信息...")
+ universalRecMgr = GameWorld.GetUniversalRecMgr()
+ universalRecMgr.Delete(Def_RecType_CheckInPlayer)
+ universalRecMgr.Delete(Def_RecType_HelpRecord)
+
+ GameWorld.Log("保存助战登记玩家记录: %s" % len(PyGameData.g_fbHelpBattleCheckInPlayerDict))
+ checkInPlayerRecList = universalRecMgr.GetTypeList(Def_RecType_CheckInPlayer)
+ for playerID, checkInPlayer in PyGameData.g_fbHelpBattleCheckInPlayerDict.items():
+ recData = checkInPlayerRecList.AddRec()
+ recData.SetTime(checkInPlayer.checkInTime)
+ recData.SetValue1(playerID)
+ recData.SetValue2(checkInPlayer.fightPower)
+ recData.SetValue3(checkInPlayer.familyID)
+ recData.SetValue4(checkInPlayer.checkInCount)
+ recData.SetValue5(int("%d%02d%02d%d" % (checkInPlayer.playerLV, checkInPlayer.vipLV, checkInPlayer.realmLV, checkInPlayer.job)))
+ recData.SetStrValue1(checkInPlayer.playerName)
+ recData.SetStrValue2(str(checkInPlayer.todayXianyuanCoin))
+ recData.SetStrValue3(str(checkInPlayer.todayHelpCountDict).replace(" ", ""))
+
+ GameWorld.Log("保存助战未同步记录: %s" % len(PyGameData.g_fbHelpBattleRecord))
+ helpRecordRecList = universalRecMgr.GetTypeList(Def_RecType_HelpRecord)
+ for playerID, helpList in PyGameData.g_fbHelpBattleRecord.items():
+ GameWorld.Log("玩家未同步助战记录: %s" % (len(helpList)), playerID)
+ for helpRecord in helpList:
+ recData = helpRecordRecList.AddRec()
+ recData.SetTime(helpRecord.recordTime)
+ recData.SetValue1(playerID)
+ recData.SetValue2(helpRecord.mapID)
+ recData.SetValue3(helpRecord.funcLineID)
+ recData.SetValue4(helpRecord.xianyuanCoinAdd)
+ recData.SetValue5(helpRecord.vipLV*10+helpRecord.relation)
+ recData.SetStrValue1(helpRecord.callPlayerName)
+ recData.SetStrValue2(str(helpRecord.callPlayerID))
+ return
+
+def HelpBattleOnDay():
+ curTime = int(time.time())
+ checkInValidHours = IpyGameDataPY.GetFuncCfg("HelpBattleCheckIn", 1) # 登记有效时长，小时
+ # 这里延长30分钟清除，防止已经被召唤还没结算的导致找不到登记信息
+ checkInValidSeconds = checkInValidHours * 3600 + 30 * 60
+
+ # 清超时登记，重置信息
+ for playerID, checkInPlayer in PyGameData.g_fbHelpBattleCheckInPlayerDict.items():
+ checkInTime = checkInPlayer.checkInTime
+ if curTime - checkInTime > checkInValidSeconds:
+ PyGameData.g_fbHelpBattleCheckInPlayerDict.pop(playerID)
+ GameWorld.Log("清除超时助战登记玩家: curTime=%s,checkInTime=%s" % (curTime, checkInTime), playerID)
+ continue
+ checkInPlayer.todayHelpCountDict = {}
+ checkInPlayer.todayXianyuanCoin = 0
+ return
+
+def OnHelpPlayerLogin(curPlayer):
+ playerID = curPlayer.GetPlayerID()
+ if playerID not in PyGameData.g_fbHelpBattleRecord:
+ return
+ unNotifyRecordList = PyGameData.g_fbHelpBattleRecord.pop(playerID)
+ SendMapServer_FBHelpBattleRecord(curPlayer, unNotifyRecordList)
+ 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
+
## 是否在助战登记列表里
def IsInHelpBattleCheckInList(playerID): return playerID in PyGameData.g_fbHelpBattleCheckInPlayerDict
@@ -85,7 +261,7 @@
# 召唤
elif cmd == "Call":
- result = __DoFBHelpBattleCall(curPlayer, msgList)
+ result = __DoFBHelpBattleCall(curPlayer.GetPlayerID(), curPlayer.GetName(), msgList)
if result == None:
return
@@ -270,7 +446,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
@@ -289,23 +465,32 @@
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)
if not fbFuncIpyData or not fbHelpIpyData or not calledPlayerDict:
return
+ helpCountLineID = funcLineID # 助战次数所属lineID，当所有层通用时，默认为0
+ dayFreeHelpCountInfo = fbHelpIpyData.GetDayFreeHelpCount()
+ if dayFreeHelpCountInfo and len(dayFreeHelpCountInfo) == 2:
+ isAllLineCount = dayFreeHelpCountInfo[1]
+ if isAllLineCount:
+ helpCountLineID = 0
+ 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() # 助战 - 基础仙缘币
relationCoinAddDict = IpyGameDataPY.GetFuncEvalCfg("HelpBattlePoint", 2, {}) # 社交关系加成 {"社交关系":[过关加成, 助战加成], ...}
- GameWorld.DebugLog("召唤助战: mapID=%s, funcLineID=%s, calledPlayerDict=%s" % (mapID, funcLineID, calledPlayerDict), tagPlayerID)
+ GameWorld.DebugLog("召唤助战: mapID=%s, funcLineID=%s, helpCountKey=%s, calledPlayerDict=%s" % (mapID, funcLineID, helpCountKey, calledPlayerDict), tagPlayerID)
for calledPlayerID, relation in calledPlayerDict.items():
if calledPlayerID not in PyGameData.g_fbHelpBattleCheckInPlayerDict:
@@ -316,6 +501,8 @@
relationAdd = relationAddList[1] if len(relationAddList) == 2 else 0
helpBattlePlayer = PyGameData.g_fbHelpBattleCheckInPlayerDict[calledPlayerID]
+ todayMapHelpCount = helpBattlePlayer.todayHelpCountDict.get(helpCountKey, 0) + 1
+ helpBattlePlayer.todayHelpCountDict[helpCountKey] = todayMapHelpCount
todayXianyuanCoin = helpBattlePlayer.todayXianyuanCoin # 今日已获得仙缘币
vipLV = helpBattlePlayer.vipLV
if vipLV:
@@ -329,7 +516,7 @@
coinAdd = int((baseHelpPoint + relationAdd) * addCoinRate / 10000.0)
canAddMax = max(playerXianyuanCoinUpper - todayXianyuanCoin, 0)
coinAddReal = min(coinAdd, canAddMax) # 实际加仙缘币
- GameWorld.DebugLog(" 助战增加仙缘币: coinAddReal=%s" % (coinAddReal), calledPlayerID)
+ GameWorld.DebugLog(" 助战增加仙缘币: coinAddReal=%s, todayMapHelpCount=%s" % (coinAddReal, todayMapHelpCount), calledPlayerID)
# GameServer 直接先加
helpBattlePlayer.todayXianyuanCoin += coinAddReal
--
Gitblit v1.8.0