From bd042c2dfd7d7b9cc7a40a6a3e149c52f6c7e87d Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 07 三月 2019 10:10:00 +0800
Subject: [PATCH] 6307 【后端】【2.0】多套装备开发单(初始装备背包格子130)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py
index 731364b..525da05 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py
@@ -85,10 +85,11 @@
     
     # 同步更新助战信息
     if PlayerFBHelpBattle.IsInHelpBattleCheckInList(PlayerID):
-        PropDataDict = eval(PropData)
+        PropDataDict = json.loads(PropData)
         fightPower = PropDataDict.get("FightPower", 0)
         familyID = PropDataDict.get("FamilyID", 0)
-        PlayerFBHelpBattle.UpdateCheckInPlayerInfo(PlayerID, fightPower, familyID)
+        playerName = PropDataDict.get("Name", "")
+        PlayerFBHelpBattle.UpdateCheckInPlayerInfo(PlayerID, fightPower, familyID, playerName)
         
     #暂时关闭
     #===========================================================================
@@ -235,7 +236,7 @@
         return
     
     playerEquipList = []
-    equipItemList = eval(itemData)
+    equipItemList = json.loads(itemData)
     for equipItemDict in equipItemList:
         equipIndex = equipItemDict["ItemIndex"]
         if equipIndex not in ShareDefine.RoleEquipType:
@@ -273,8 +274,9 @@
             answerPack.LV = 1
             answerPack.RealmLV = 1
             answerPack.OnlineType = ChConfig.Def_Offline
+            answerPack.ServerGroupID = 0
         else:
-            cacheDict = eval(curCache.GetPropData())
+            cacheDict = json.loads(curCache.GetPropData())
     
             answerPack.PlayerID = clientPack.PlayerID
             answerPack.PlayerName = cacheDict["Name"]
@@ -282,6 +284,7 @@
             answerPack.LV = cacheDict["LV"]
             answerPack.RealmLV = cacheDict["RealmLV"]
             answerPack.OnlineType = ChConfig.Def_Offline
+            answerPack.ServerGroupID = cacheDict.get("ServerGroupID", 0)
             
     else:
         answerPack.PlayerID = clientPack.PlayerID
@@ -291,6 +294,7 @@
         answerPack.RealmLV = tagPlayer.GetOfficialRank()
         answerPack.OnlineType = ChConfig.Def_Online
         answerPack.IsInTeam = tagPlayer.GetTeamID() > 0
+        answerPack.ServerGroupID = PlayerControl.GetPlayerServerGroupID(tagPlayer)
 
     curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
     NetPackCommon.SendFakePack(curPlayer, answerPack)
@@ -301,7 +305,7 @@
     curCache = ViewCacheMgr.FindCache(playerID)
     if not curCache:
         return
-    PropData = eval(curCache.GetPropData())
+    PropData = json.loads(curCache.GetPropData())
     PropData["FamilyID"] = familyID
     PropData["FamilyName"] = familyName
     playerLV = PropData["LV"]

--
Gitblit v1.8.0