From f8746d124f66d507826a274aaaa0b71e0a67446a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 01 十月 2018 17:59:29 +0800
Subject: [PATCH] 1 修复boss没配置复活等级时间时报错问题; 2 修复邮件给非定制装备无传奇属性bug; 3 上线重新刷一次无传奇属性的装备;

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py    |    2 ++
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py            |    2 +-
 3 files changed, 51 insertions(+), 1 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
index 571ee07..542e1e7 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
@@ -620,7 +620,7 @@
     onlineCnt = __GetBossOnlineHeroCnt(bossid)[0]
     LVLimit = ipyData.GetLVLimit()
     openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay)
-    if openServerDay != 0:
+    if openServerDay != 0 and LVLimit and len(LVLimit) == 2:
         yesterdayCnt = len([1 for lv in PyGameData.g_yesterdayPlayerLVDict.values() if LVLimit[0]<=lv <= LVLimit[1]]) #参数昨日活跃人数
     else:
         yesterdayCnt = IpyGameDataPY.GetFuncCfg('FirstDayActivePlayerCnt')
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
index f34a7fb..d572f68 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.py
@@ -1201,6 +1201,9 @@
                     ItemCommon.DR_GetItem(curPlayer, packIndex, eventName, itemNoteDict, addDict)
             else:
                 #可以放下
+                if isEquip:
+                    self.CheckEquipAttr(packIndex, tagItem)
+                    
                 if tagItem.GetGameWorldItemType() == IPY_GameWorld.gwitRoleItem:
                     item.PutIn(tagItem)
                 elif tagItem.GetGameWorldItemType() == IPY_GameWorld.gwitSingleItem:
@@ -1217,6 +1220,51 @@
         #放入东西
         return putResult
     
+    def CheckEquipAttr(self, packType, curItem):
+        legendAttrIDCount = curItem.GetUserAttrCount(ShareDefine.Def_IudetLegendAttrID)
+        legendAttrValueCount = curItem.GetUserAttrCount(ShareDefine.Def_IudetLegendAttrValue)
+        
+        if legendAttrIDCount and legendAttrValueCount and legendAttrIDCount == legendAttrValueCount:
+            return
+        
+        legendAttrInfo = GetAddEquipLegendAttr(curItem)
+        if not legendAttrInfo:
+            return
+        
+        curPlayer = self.__Player
+        srcScore = ItemCommon.GetEquipGearScore(curItem)
+        legendAttrIDList, legendAttrValueList = legendAttrInfo
+        curItem.ClearUserAttr(ShareDefine.Def_IudetLegendAttrID)
+        curItem.ClearUserAttr(ShareDefine.Def_IudetLegendAttrValue)
+        for i in xrange(len(legendAttrIDList)):
+            curItem.AddUserAttr(ShareDefine.Def_IudetLegendAttrID, legendAttrIDList[i])
+            curItem.AddUserAttr(ShareDefine.Def_IudetLegendAttrValue, legendAttrValueList[i])
+        ItemCommon.MakeEquipGS(curItem)
+        updScore = ItemCommon.GetEquipGearScore(curItem)
+        GameWorld.ErrLog("传奇属性异常,重新刷新一次属性: packType=%s,itemID=%s,legendAttrIDList=%s,legendAttrValueList=%s,srcScore=%s,updScore=%s" 
+                         % (packType, curItem.GetItemTypeID(), legendAttrIDList, legendAttrValueList, srcScore, updScore), curPlayer.GetPlayerID())
+        return
+    
+    def CheckRolePackEquipAttr(self):
+        curPlayer = self.__Player
+        key = "LoginCheckEquipAttr"
+        if curPlayer.NomalDictGetProperty(key):
+            return
+        checkPackList = [IPY_GameWorld.rptEquip, IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse]
+        for packType in checkPackList:
+            curPack = curPlayer.GetItemManager().GetPack(packType)
+            for i in xrange(curPack.GetCount()):
+                curItem = curPack.GetAt(i)
+                #GameWorld.DebugLog("packType=%s,i=%s" % (packType, i))
+                if curItem.IsEmpty():
+                    continue
+                isEquip = ItemCommon.CheckItemIsEquip(curItem)
+                if not isEquip:
+                    continue
+                self.CheckEquipAttr(packType, curItem)
+        PlayerControl.NomalDictSetProperty(curPlayer, key, 1)
+        return
+
     ## 是否能放入物品 
     #  @param packIndex 背包索引
     #  @param curItemID 当前物品ID
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index fb1a30c..281504c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -548,6 +548,8 @@
     
     # 上线查询一次充值订单
     curPlayer.SendDBQueryRecharge()
+    # 上线检查一次装备属性
+    ItemControler.PlayerItemControler(curPlayer).CheckRolePackEquipAttr()
     
     curPlayer.SetState(0)   # 脱机挂恢复为正常上线
     curPlayer.SetFacePic(0) # 通知数据库是否保存还是下线,做一次恢复,1为保存 0为正常下线

--
Gitblit v1.8.0