From da703bbc7bc857362753504d9b82ce8d2250a9b6 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 15 三月 2019 16:32:02 +0800
Subject: [PATCH] 6307 【后端】【2.0】多套装备开发单(外观设置修改)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py
index a9e6ec7..0a67be3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/OpenServerCampaign.py
@@ -80,7 +80,8 @@
     
     recordData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OSC_RecordData % campaignType)
     
-    if campaignType not in [ShareDefine.Def_Campaign_Type_StoneLV, ShareDefine.Def_Campaign_Type_FightPower] and value <= recordData:
+    if campaignType not in [ShareDefine.Def_Campaign_Type_StoneLV, ShareDefine.Def_Campaign_Type_FightPower, 
+                            ShareDefine.Def_Campaign_Type_RuneLV] and value <= recordData:
         GameWorld.DebugLog("    开服活动数据小于历史记录, 不更新 campaignType=%s,recordData=%s,updValue=%s" 
                            % (campaignType, recordData, value), curPlayer.GetPlayerID())
         return
@@ -275,6 +276,8 @@
         order = queryResultList[i]
         billAwardInfo = None
         billRankAwardIpyList = IpyGameDataPY.GetIpyGameDataList("OSCBillRankAward", campaignType)
+        if not billRankAwardIpyList:
+            continue
         for billRankIpyData in billRankAwardIpyList:
             if (billRankIpyData.GetRankA() <= order <= billRankIpyData.GetRankB()) \
                 or (not billRankIpyData.GetRankB() and billRankIpyData.GetRankA() == order):
@@ -331,7 +334,7 @@
         for itemInfo in giveItemList:
             itemID, itemCount = itemInfo[:2]
             isBind = itemInfo[2] if len(itemInfo) > 2 else 1
-            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem], 
+            ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, 0, [IPY_GameWorld.rptItem], 
                                          event=[ChConfig.ItemGive_OpenServerCampaign, True, drDict])
     return
 

--
Gitblit v1.8.0