From d42896d1fe05ba65cf3bf537075c3d00467dfbb8 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 11 七月 2019 11:38:48 +0800
Subject: [PATCH] 860312  混服或合服情况下需要指定修改的平台和服务器,Serverid不填写代表不改变只替换spid

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossGrassland.py |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossGrassland.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossGrassland.py
index 2b48a84..fe910da 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossGrassland.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossGrassland.py
@@ -25,6 +25,7 @@
 import PlayerControl
 import ChConfig
 import FBCommon
+import ItemControler
 
 FBDict_SyncFBNPC = 'SyncFBNPC' #是否需要同步副本NPC
 
@@ -296,6 +297,16 @@
         isAuctionItem = 0
         itemID, itemCount = itemCountInfo/100, itemCountInfo%100
         awardItemList.append([itemID, itemCount, isAuctionItem])
+    extraAward = [] #额外物品奖励
+    ipyData = IpyGameDataPY.GetIpyGameDataByCondition("FairyDomain", {"MapID":mapID, "LineID":lineID})
+    if ipyData:
+        fdEventID = ipyData.GetID()
+        extraAward = PlayerFairyDomain.GetFairyAppointAward(curPlayer, fdEventID)
+    if not extraAward:
+        extraAward = FBCommon.GetFBLineReward(mapID, lineID)
+    if extraAward:
+        ItemControler.GivePlayerItemOrMail(curPlayer, extraAward)
+        awardItemList += extraAward
     overDict = {FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(awardItemList)}
     FBCommon.NotifyFBOver(curPlayer, mapID, lineID, 1, overDict)
     ResetGrasslandAwardRecord(curPlayer)

--
Gitblit v1.8.0