From f5a2d72d60cf43cf28a44868d62deeda8d10482f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 28 六月 2019 20:48:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py |  212 +++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 159 insertions(+), 53 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
index 60dd666..e76cf2a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
@@ -30,8 +30,9 @@
 import EventReport
 import PlayerFamily
 import PlayerActivity
+import ItemControler
 import PlayerSuccess
-import PlayerMagicWeapon
+import GameFuncComm
 import PyGameData
 import PlayerVip
 import GameObj
@@ -66,6 +67,10 @@
 Help_isHelp = 'isHelp' #本次是否是助战
 Help_helpCount = 'helpCount' #该副本今日已助战次数
 Help_relation = 'relation' #该副本关系加成信息 [优先关系, 总加成]
+Help_robotJob = 'robotJob' #机器人职业 {"ObjID":job, ...}
+Help_isAuto = 'isAuto' #是否自动召唤
+Help_hasRefreshBoss = 'hasRefreshBoss' #是否已刷新boss
+Help_gsItemInfo = 'gsItemInfo' #聚魂副本物品信息 {"波数":[[{"ItemID":101, "ItemCount":10}]]}
 
 #副本结算信息通用key
 Over_dataMapID = 'dataMapID' #数据地图ID
@@ -90,6 +95,9 @@
 Over_enterLV = 'enterLV' #进入时等级
 Over_leaderID = 'leaderID' #渡劫玩家ID
 Over_xianyuanCoin = 'xianyuanCoin' #获得仙缘币信息 [获得仙缘币数, 没有获得的原因] 原因: 1-达到助战次数上限,2-达到每日获得仙缘币上限
+Over_helpPlayer = 'helpPlayer' #助战玩家信息 {"玩家ID":{玩家信息key:value, ...}, ...}
+Over_ownerID = 'ownerID' #归属玩家ID
+Over_ownerName = 'ownerName' #归属玩家名
 
 #副本行为
 (
@@ -157,6 +165,10 @@
 def CheckCanEnterFBComm(curPlayer, mapID, lineID, fbIpyData, fbLineIpyData, reqEnterCnt=1, isNotify=True, isTeamAsk=False):
     # 可否进入副本通用检查, 扫荡通用
     playerID = curPlayer.GetPlayerID()
+    
+    if not FBLogic.OnNeedCheckCanEnterFBComm(curPlayer, mapID, lineID):
+        return ShareDefine.EntFBAskRet_OK
+    
     # 总表通用检查
     if fbIpyData:
         #开服天开放检查
@@ -196,15 +208,6 @@
             if isNotify:
                 PlayerControl.NotifyCode(curPlayer, "FbLV", [mapID])
             return ShareDefine.EntFBAskRet_LVLimit
-        
-        #职业阶判断
-        jobRankLimit = fbLineIpyData.GetJobRankLimit()
-        if jobRankLimit and PlayerControl.GetJobRank(curPlayer) < jobRankLimit:
-            GameWorld.Log("玩家职业阶级不足, 无法进入副本!mapID=%s,lineID=%s,jobRank=%s < jobRankLimit=%s" 
-                          % (mapID, lineID, PlayerControl.GetJobRank(curPlayer), jobRankLimit), playerID)
-            if isNotify:
-                PlayerControl.NotifyCode(curPlayer, "SingleEnterJob", [mapID])
-            return ShareDefine.EntFBAskRet_JobRankLimit
         
         #门票判断
         if not GetFBEnterTicket(curPlayer, mapID, lineID, fbLineIpyData, reqEnterCnt, isTeamAsk)[0]:
@@ -371,6 +374,17 @@
     gameFB.SetGameFBDict(ChConfig.Def_FB_NPCStrengthenMaxLV, maxLV)
     GameWorld.Log("NPC成长动态等级变更: isLeave=%s,totalLV=%s,playerCnt=%s,averageLV=%s,maxLV=%s" 
                   % (isLeave, totalLV, playerCnt, averageLV, maxLV), playerID)
+    # 上古战场特殊处理
+    if mapID == ChConfig.Def_FBMapID_ElderBattlefield:
+        lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
+        fbLineIpyData = GetFBLineIpyData(mapID, lineID)
+        lvLimitMin = 0 if not fbLineIpyData else fbLineIpyData.GetLVLimitMin()
+        robotLVDiff = IpyGameDataPY.GetFuncCfg("ElderBattlefieldCfg", 5)
+        robotLVMin, robotLVMax = averageLV - robotLVDiff, averageLV
+        robotLVMin = max(lvLimitMin, robotLVMin)
+        gameFB.SetGameFBDict(ChConfig.Def_FB_NPCStrengthenMaxLV, robotLVMax)
+        gameFB.SetGameFBDict(ChConfig.Def_FB_NPCStrengthenMinLV, robotLVMin)
+        GameWorld.Log("    更新上古机器人等级范围: lineID=%s,robotLVDiff=%s,robotLV=(%s~%s)" % (lineID, robotLVDiff, robotLVMin, robotLVMax))
     return True
 
 def UpdFBLineNPCStrengthenPlayerCnt(playerID, isLeave):
@@ -432,18 +446,18 @@
 #  @return
 def SetFBPropertyMark(propertyMark, setPlayer=None):
     GameWorld.GetGameFB().SetGameFBDict(ChConfig.Map_FBDict_PropertyMark, propertyMark + 1) # 存储时+1才能判断是否存储过
-    if setPlayer != None:
-        PlayerControl.SetFBFuncLineID(setPlayer, propertyMark)
-        GameWorld.DebugLog("SetFBPropertyMark 设置玩家副本功能线路ID: %s" % propertyMark, setPlayer.GetPlayerID())
-        return
-    
-    playerManager = GameWorld.GetMapCopyPlayerManager()
-    for index in xrange(playerManager.GetPlayerCount()):
-        curPlayer = playerManager.GetPlayerByIndex(index)
-        if not curPlayer.GetPlayerID():
-            continue
-        PlayerControl.SetFBFuncLineID(curPlayer, propertyMark)
-        GameWorld.DebugLog("SetFBPropertyMark 广播玩家副本功能线路ID: %s" % propertyMark, curPlayer.GetPlayerID())
+#    if setPlayer != None:
+#        PlayerControl.SetFBFuncLineID(setPlayer, propertyMark)
+#        GameWorld.DebugLog("SetFBPropertyMark 设置玩家副本功能线路ID: %s" % propertyMark, setPlayer.GetPlayerID())
+#        return
+#    
+#    playerManager = GameWorld.GetMapCopyPlayerManager()
+#    for index in xrange(playerManager.GetPlayerCount()):
+#        curPlayer = playerManager.GetPlayerByIndex(index)
+#        if not curPlayer.GetPlayerID():
+#            continue
+#        PlayerControl.SetFBFuncLineID(curPlayer, propertyMark)
+#        GameWorld.DebugLog("SetFBPropertyMark 广播玩家副本功能线路ID: %s" % propertyMark, curPlayer.GetPlayerID())
     return
 
 ## 是否已经扣除入场券/进入次数等
@@ -457,6 +471,15 @@
 #  @return
 def SetHadDelTicket(curPlayer, delSign=1):
     GameWorld.GetGameFB().SetPlayerGameFBDict(curPlayer.GetID(), ChConfig.FBPlayerDict_IsDelTicket, delSign)
+    return
+
+## 自定义场景阶段
+def GetCustomMapStep(curPlayer, mapID, lineID):
+    return curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_CustomMapStep % (mapID, lineID))
+def SetCustomMapStep(curPlayer, mapID, lineID, step):
+    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_CustomMapStep % (mapID, lineID), step)
+    if step == ChConfig.CustomMapStep_Over:
+        PlayerControl.SetCustomMap(curPlayer, 0, 0)
     return
 
 def GetCurSingleFBPlayer():
@@ -566,7 +589,7 @@
     return
 
 def GetJsonItemList(itemList):
-    ## [[itemID,itemCount,isBind], curItem] -> [{"ItemID":101, "Count":10, "IsBind":1, "IsSuite":1, "UserData":"自定义属性字符串"}]
+    ## [[itemID,itemCount,isAuctionItem], curItem] -> [{"ItemID":101, "Count":10, "IsAuctionItem":1, "UserData":"自定义属性字符串"}]
     jsonItemList = []
     for itemInfo in itemList:
         itemDict = {}
@@ -577,7 +600,7 @@
             if infolen > 1:
                 itemDict['Count'] = itemInfo[1]
             if infolen > 2:
-                itemDict['IsBind'] = int(itemInfo[2])
+                itemDict['IsAuctionItem'] = int(itemInfo[2])
         elif isinstance(itemInfo, int):
             itemDict['ItemID'] = itemInfo
         else: #物品实例
@@ -585,8 +608,8 @@
                 continue
             itemDict['ItemID'] = itemInfo.GetItemTypeID()
             itemDict['Count'] = itemInfo.GetCount()
-            itemDict['IsBind'] = int(itemInfo.GetIsBind())
-            itemDict['IsSuite'] = int(itemInfo.GetIsSuite())
+            itemDict['IsAuctionItem'] = ItemControler.GetIsAuctionItem(itemInfo)
+            #itemDict['IsSuite'] = int(itemInfo.GetIsSuite())
             itemDict['UserData'] = itemInfo.GetUserData()
         jsonItemList.append(itemDict)
     return jsonItemList
@@ -614,7 +637,7 @@
 #---------------------------------------------------------------------
 def SyncDynamicBarrierState(barrierPointList, state, curPlayer=None):
     '''同步动态障碍物是否有效性
-    @param barrierPointList: 障碍物点列表 [[aPosX,aPosY,bPosX,bPosY], [aPosX,aPosY,bPosX,bPosY], ...]
+    @param barrierPointList: 障碍物点列表 [[aPosX,aPosY,bPosX,bPosY,angle可选], [aPosX,aPosY,bPosX,bPosY,angle可选], ...]
     @param state: 是否有效
     @param curPlayer: 指定通知目标玩家,为None时广播本地图所有玩家
     '''
@@ -622,12 +645,15 @@
     barrierStatePack.Clear()
     barrierStatePack.State = state
     barrierStatePack.BarrierList = []
-    for aPosX, aPosY, bPosX, bPosY in barrierPointList:
+    for posInfo in barrierPointList:
+        aPosX, aPosY, bPosX, bPosY = posInfo[:4]
+        angle = posInfo[4] if len(posInfo) > 4 else 0
         barrier = ChPyNetSendPack.tagMCDynamicBarrier()
         barrier.APosX = aPosX
         barrier.APosY = aPosY
         barrier.BPosX = bPosX
         barrier.BPosY = bPosY
+        barrier.Angle = angle
         barrierStatePack.BarrierList.append(barrier)
     barrierStatePack.Count = len(barrierStatePack.BarrierList)
     if curPlayer:
@@ -1001,6 +1027,35 @@
     #可以进入
     return True
 #---------------------------------------------------------------------
+def Sync_FBNPC(mapID=0, npcIDList=[], curPlayer=None):
+    ## 同步当前副本NPC给副本中的所有玩家
+    if not mapID:
+        mapID = GameWorld.GetMap().GetMapID()
+        mapID = GetRecordMapID(mapID)
+    npcCntDict = {}
+    gameNPCManager = GameWorld.GetNPCManager()
+    for index in xrange(gameNPCManager.GetNPCCount()):
+        curNPC = gameNPCManager.GetNPCByIndex(index)
+        npcID = curNPC.GetNPCID()
+        if not npcID:
+            continue
+        if curNPC.GetGameNPCObjType() == IPY_GameWorld.gnotPet:
+            continue
+        if npcIDList and npcID not in npcIDList:
+            continue
+        npcCntDict[npcID] = npcCntDict.get(npcID, 0) + 1
+        
+    if curPlayer:
+        NPCCommon.SyncNPCCntInfo(curPlayer, mapID, npcCntDict)
+    else:
+        playerManager = GameWorld.GetMapCopyPlayerManager()
+        for i in xrange(playerManager.GetPlayerCount()):
+            curPlayer = playerManager.GetPlayerByIndex(i)
+            if curPlayer.GetID() == 0:
+                continue
+            NPCCommon.SyncNPCCntInfo(curPlayer, mapID, npcCntDict)
+    return npcCntDict
+
 ##获得地图上的NPC列表
 # @param 无参数
 # @return 返回值, NPC实例列表[curNPC,curNPC,,,,,]
@@ -1519,24 +1574,39 @@
     maxCnt = GetEnterFBMaxCnt(curPlayer, mapID)
     maxCanAdd = max(0, maxDayTimes - (maxCnt-enterCnt))
     #GameWorld.DebugLog('封魔坛最大可恢复次数 %s'%maxCanAdd)
-    if not maxCanAdd:
-        return
+
     curTime = int(time.time())
-    recoverInterval = IpyGameDataPY.GetFuncCfg('FBCntRegainInterval')
     lastRegainTime = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FbCntRegainStartTime % mapID)
+    if not lastRegainTime:
+        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FbCntRegainStartTime % mapID, curTime)
+        return
+    recoverInterval = IpyGameDataPY.GetFuncCfg('FBCntRegainInterval')
     needTime = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FbCntRegainTotalTime % mapID)
     if not needTime:
         needTime = recoverInterval
     passTime = curTime - lastRegainTime
     if passTime < needTime:
         return
-    recoverCnt = min(maxCanAdd, 1 + (passTime-needTime) / recoverInterval) # 恢复次数
+    recoverCnt = 1 + (passTime-needTime) / recoverInterval # 恢复次数
+    if recoverCnt > maxCanAdd:
+        #记录超出的次数,用于资源找回
+        beyondTimes = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FbCntRegainOverTime % mapID)
+        updBeyondTimes = recoverCnt - maxCanAdd + beyondTimes
+        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FbCntRegainOverTime % mapID, updBeyondTimes)
+        if not maxCanAdd:
+            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FbCntRegainStartTime % mapID, curTime)
+        GameWorld.DebugLog('    封魔坛恢复次数 记录超出的次数addOverCnt=%s, updBeyondTimes=%s'%(recoverCnt-maxCanAdd, updBeyondTimes))
+    
+    if not maxCanAdd:
+        return
+    recoverCnt = min(maxCanAdd, recoverCnt)
+    
     enterCntKey = ChConfig.Def_Player_Dict_EnterFbCntDay % mapID
     newEnterCnt = max(0, enterCnt-recoverCnt)
     PlayerControl.NomalDictSetProperty(curPlayer, enterCntKey, newEnterCnt)
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FbCntRegainTotalTime % mapID, 0)
     if recoverCnt == maxCanAdd:
-        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FbCntRegainStartTime % mapID, 0)
+        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FbCntRegainStartTime % mapID, curTime)
     else:
         startTime = curTime- (passTime-needTime)%recoverInterval
         PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FbCntRegainStartTime % mapID, startTime)
@@ -1674,7 +1744,15 @@
         if mapID in [ChConfig.Def_FBMapID_SealDemon]:
             newEnterCnt = max(0, dayTimes - (maxCnt - enterCnt))
             PlayerControl.NomalDictSetProperty(curPlayer, enterCntKey, newEnterCnt)
+            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FbCntRegainOverTime % mapID, 0)
             GameWorld.DebugLog("        特殊副本已进入次数更新: newEnterCnt=%s" % newEnterCnt)
+        elif mapID == ChConfig.Def_FBMapID_ZhuXianBoss:
+            if GameFuncComm.GetFuncCanUse(curPlayer, ShareDefine.GameFuncID_ZhuXianBoss):
+                curCnt = min(maxCnt - enterCnt + IpyGameDataPY.GetFuncCfg('ZhuXianBossCntCfg'), IpyGameDataPY.GetFuncCfg('ZhuXianBossCntCfg', 2))
+                if curCnt > dayTimes:
+                    PlayerControl.NomalDictSetProperty(curPlayer, itemAddCntKey, curCnt - dayTimes)
+                elif curCnt < dayTimes:
+                    PlayerControl.NomalDictSetProperty(curPlayer, enterCntKey, dayTimes - curCnt)
             
         mapIDInfo.append(mapID)
         
@@ -1740,6 +1818,9 @@
     if mapID == ChConfig.Def_FBMapID_SealDemon and maxDayTimes and maxCnt - enterCnt >= maxDayTimes:
         GameWorld.DebugLog('当前次数已满,无需购买。。')
         return
+    if mapID == ChConfig.Def_FBMapID_ZhuXianBoss and maxCnt - enterCnt >= IpyGameDataPY.GetFuncCfg('ZhuXianBossCntCfg', 2):
+        return
+    
     if hasBuyCnt >= canBuyCnt:
         GameWorld.DebugLog("购买次数已经用完mapID=%s"%mapID)
         return
@@ -1886,7 +1967,7 @@
 #  @param tick 当前时间
 #  @param isMaxlv 是否直接满级
 #  @return None
-def FbEncourageBuff(curPlayer, key, encourageType, tick, isMaxlv=False):
+def FbEncourageBuff(curPlayer, key, encourageType, tick, ownerID=0):
     #GameWorld.Log("FbEncourageBuff moneyType=%s" % (moneyType))
     curMapID = curPlayer.GetMapID()
     curMapID = GetRecordMapID(curMapID)
@@ -1895,10 +1976,10 @@
         return
     maxCnt = ipyData.GetInspireMaxLV()
     gameFB = GameWorld.GetGameFB()
-    curPlayerID = curPlayer.GetID()
-    encourageLV = gameFB.GetPlayerGameFBDictByKey(curPlayerID, key)
+    ownerID = ownerID or curPlayer.GetID()
+    encourageLV = gameFB.GetPlayerGameFBDictByKey(ownerID, key)
     encourageCntKey = 'FbEncourageCnt_%s' % encourageType
-    encourageCnt = gameFB.GetPlayerGameFBDictByKey(curPlayerID, encourageCntKey)
+    encourageCnt = gameFB.GetPlayerGameFBDictByKey(ownerID, encourageCntKey)
     maxLV = IpyGameDataPY.GetFuncEvalCfg('FBEncourageBuff', 2, {}).get(curMapID, 0)
     if encourageLV >= maxLV:
         PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_93643")
@@ -1933,29 +2014,47 @@
         return
     
     buffType = SkillCommon.GetBuffType(skillBuff)
-    BuffSkill.DoAddBuff(curPlayer, buffType, skillBuff, tick)
-    gameFB.SetPlayerGameFBDict(curPlayerID, key, encourageLV+1)
-    gameFB.SetPlayerGameFBDict(curPlayerID, encourageCntKey, encourageCnt+1)
+    
+    gameFB.SetPlayerGameFBDict(ownerID, key, encourageLV+1)
+    gameFB.SetPlayerGameFBDict(ownerID, encourageCntKey, encourageCnt+1)
     #GameWorld.Log("FbEncourageBuff encourage nextLV=%s success" % encourageLV)
     addHurtNum = IpyGameDataPY.GetFuncEvalCfg('FBEncourageBuff', 3, {}).get(curMapID, 0)
-    PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_628920", [(encourageLV+1)*addHurtNum])
-    SendFBEncourageInfo(curPlayer, encourageLV+1)
-    #成就
-    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FBEncourage, 1, [curMapID])
-    EventShell.EventRespons_FBEncourage(curPlayer, curMapID)
-    return
+    if curMapID == ChConfig.Def_FBMapID_AllFamilyBoss:
+        #给副本里所有盟成员提示
+        playerManager = GameWorld.GetMapCopyPlayerManager()
+        for index in xrange(playerManager.GetPlayerCount()):
+            player = playerManager.GetPlayerByIndex(index)
+            if not player:
+                continue
+            if player.GetFamilyID() != ownerID:
+                continue
+            BuffSkill.DoAddBuff(player, buffType, skillBuff, tick)
+            PlayerControl.NotifyCode(player, "AllianceBossText2", [curPlayer.GetName(), encourageLV+1])
+            SendFBEncourageInfo(player, encourageLV+1, ownerID)
+            if player.GetID() == curPlayer.GetID():
+                PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FBEncourage, 1, [curMapID])
+                EventShell.EventRespons_FBEncourage(curPlayer, curMapID)
+            
+    else:
+        BuffSkill.DoAddBuff(curPlayer, buffType, skillBuff, tick)
+        PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_628920", [(encourageLV+1)*addHurtNum])
+        SendFBEncourageInfo(curPlayer, encourageLV+1, ownerID)
+        #成就
+        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FBEncourage, 1, [curMapID])
+        EventShell.EventRespons_FBEncourage(curPlayer, curMapID)
+    return True
 
 ## 添加副本鼓舞buff,一般用于玩家掉线后,在规定时间内重新上线回到副本时重新上buff
 #  @param curPlayer 玩家
 #  @param key 副本玩家字典key
 #  @param tick 当前时间
 #  @return None
-def AddFbEncourageBuff(curPlayer, key, tick):
+def AddFbEncourageBuff(curPlayer, key, tick, ownerID=0):
     curPlayerID = curPlayer.GetID()
     GameWorld.Log("AddFbEncourageBuff() curPlayerID=%s" % curPlayerID)
-  
+    ownerID = ownerID or curPlayer.GetID()
     gameFB = GameWorld.GetGameFB()
-    encourageLV = gameFB.GetPlayerGameFBDictByKey(curPlayerID, key)
+    encourageLV = gameFB.GetPlayerGameFBDictByKey(ownerID, key)
     if not encourageLV:
         return
     mapID = GameWorld.GetMap().GetMapID()
@@ -1970,7 +2069,7 @@
     buffType = SkillCommon.GetBuffType(skillBuff)
     BuffSkill.DoAddBuff(curPlayer, buffType, skillBuff, tick)
     
-    SendFBEncourageInfo(curPlayer, encourageLV)
+    SendFBEncourageInfo(curPlayer, encourageLV, ownerID)
     return
 
 ## 清除鼓舞buff
@@ -1990,7 +2089,7 @@
 ## 发送副本鼓舞信息
 #  @param curPlayer 玩家
 #  @return None
-def SendFBEncourageInfo(curPlayer, lv):
+def SendFBEncourageInfo(curPlayer, lv, ownerID=0):
     #//A3 0A 副本鼓舞信息通知 #tagMCFBEncourageInfo
     curMapID = curPlayer.GetMapID()
     curMapID = GetRecordMapID(curMapID)
@@ -2002,12 +2101,12 @@
     encourageInfo.InfoList = []
     encourageCntKey = 'FbEncourageCnt_%s'
     gameFB = GameWorld.GetGameFB()
-    curPlayerID = curPlayer.GetID()
+    ownerID = ownerID or curPlayer.GetID()
     for ipyData in ipyDataList:
         inspireType = ipyData.GetInspireType()
         packData = ChPyNetSendPack.tagMCFBEncourageCnt()
         packData.MoneyType = inspireType
-        packData.EncourageCnt = gameFB.GetPlayerGameFBDictByKey(curPlayerID, encourageCntKey % inspireType)
+        packData.EncourageCnt = gameFB.GetPlayerGameFBDictByKey(ownerID, encourageCntKey % inspireType)
         encourageInfo.InfoList.append(packData)
     encourageInfo.Cnt = len(encourageInfo.InfoList)
     NetPackCommon.SendFakePack(curPlayer, encourageInfo)
@@ -2361,4 +2460,11 @@
         fbHelpFunc(curPlayer, tick)
     return
 
+def GetCrossDynamicLineMapZoneID():
+    ## 获取跨服动态线路地图本线路跨服分区
+    return GameWorld.GetGameWorld().GetPropertyID() / 10000
+
+def GetCrossDynamicLineMapFuncLineID():
+    ## 获取跨服动态线路地图本线路功能线路ID
+    return GameWorld.GetGameWorld().GetPropertyID() % 10000 / 10
 

--
Gitblit v1.8.0