From 3d7d4a003455176e07b517068608a999796fdf6e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 27 十一月 2018 22:25:02 +0800
Subject: [PATCH] 4762 【后端】修复两个非好友玩家都没有仙盟时被视为同仙盟的bug;

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py
index aa723b7..02516a2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py
@@ -28,6 +28,9 @@
 import ItemControler
 import IpyGameDataPY
 import ChEquip
+import FBCommon
+import BossHurtMng
+
 import time
 import json
 
@@ -81,6 +84,7 @@
     #-----------
     #玩家属性缓存
     curPlayerPropDict = {}
+    curPlayerPropDict["AccID"] = curPlayer.GetAccID()
     curPlayerPropDict["LV"] = curPlayer.GetLV()
     curPlayerPropDict["RealmLV"] = curPlayer.GetOfficialRank()
     curPlayerPropDict["Job"] = curPlayer.GetJob()
@@ -90,6 +94,7 @@
     curPlayerPropDict["FamilyID"] = curPlayer.GetFamilyID()
     curPlayerPropDict["FamilyName"] = curPlayer.GetFamilyName()
     curPlayerPropDict["FightPower"] = curPlayer.GetFightPower()
+    curPlayerPropDict["AppID"] = GameWorld.GetPlayerPlatform(curPlayer)
     #仙魔之争所需属性
     curPlayerPropDict["MinAtk"] = curPlayer.GetMinAtk()
     curPlayerPropDict["MaxAtk"] = curPlayer.GetMaxAtk()
@@ -101,6 +106,18 @@
     curPlayerPropDict['GeTuiClientID'] = curPlayer.GetAccountData().GetGeTuiClientID()
     curPlayerPropDict['Time'] = int(time.time())    # 最后一次发送即当做离线时间
     
+    # 各类功能 BOSS次数, BOSS相关对应B.Boss信息.xlsx的CntMark
+    # 封魔坛剩余次数
+    enterCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_EnterFbCntDay % ChConfig.Def_FBMapID_SealDemon)
+    maxCnt = FBCommon.GetEnterFBMaxCnt(curPlayer, ChConfig.Def_FBMapID_SealDemon)
+    curPlayerPropDict['CntMark_%s'%ChConfig.Def_FBMapID_SealDemon] = max(maxCnt - enterCnt, 0)
+    # 世界BOSS剩余次数
+    curPlayerPropDict['CntMark_%s'%ShareDefine.Def_Boss_Func_World] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_World)
+    # BOSS之家剩余次数
+    curPlayerPropDict['CntMark_%s'%ShareDefine.Def_Boss_Func_Home] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_Home)
+    # 神兽BOSS剩余次数
+    curPlayerPropDict['CntMark_%s'%ShareDefine.Def_Boss_Func_Dogz] = BossHurtMng.GetCanKillBossCnt(curPlayer, ShareDefine.Def_Boss_Func_Dogz)
+
     #-----------
     #装备数据打包缓存
     curEquipItemList = __GetPackEquipCacheList(curPlayer, IPY_GameWorld.rptEquip)
@@ -253,8 +270,8 @@
 ## 符印信息
 def __GetRuneInfo(curPlayer):
     runeDict = {}
-    runeUnlockList = IpyGameDataPY.GetFuncEvalCfg("RuneUnlock", 1)
-    for holeNum in xrange(1, len(runeUnlockList) + 1):
+    runeHoleCnt = IpyGameDataPY.GetFuncCfg("RuneUnlock", 4)
+    for holeNum in xrange(1, runeHoleCnt + 1):
         runeData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Rune_Data % holeNum, 0)
         if not runeData:
             continue

--
Gitblit v1.8.0