From a9e7531f41368484b3d857e4236cb4c40ff2e704 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 20 五月 2019 15:43:16 +0800
Subject: [PATCH] 6851 【后端】【2.0】日常副本结算界面显示奖励
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py | 14 +++++++-------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ClearDevil.py | 1 +
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
index e66fdf4..388d7cb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
@@ -5384,18 +5384,18 @@
expPoint = curMission.GetProperty(Def_Run_Around_Reward_ExpPoint)
exp = expPoint * ChConfig.Def_PerPointValue + exp
money = curMission.GetProperty(Def_Run_Around_Reward_Money)
-
+ moneyDict = {}
if exp != 0:
playerControl.AddExp(exp)
#PlayerControl.NotifyCode(curPlayer, 'GeRen_lhs_0', [exp])
-
- addDataDict = {ChConfig.Def_Give_Reason_SonKey:"Run"}
- PlayerControl.GiveMoney(curPlayer, runAroundReward.MoneyType, money, ChConfig.Def_GiveMoney_Mission, addDataDict, False)
-
+ if money:
+ addDataDict = {ChConfig.Def_Give_Reason_SonKey:"Run"}
+ PlayerControl.GiveMoney(curPlayer, runAroundReward.MoneyType, money, ChConfig.Def_GiveMoney_Mission, addDataDict, False)
+ moneyDict[runAroundReward.MoneyType] = money
familyHornor = curMission.GetProperty(Def_Run_Around_Reward_FamilyHornor)
if familyHornor:
PlayerFamily.AddPlayerFamilyActiveValue(curPlayer, familyHornor, True, ShareDefine.Def_AddFAVReason_DoFamilyMisson, True)
-
+ moneyDict[ShareDefine.TYPE_Price_Family_Contribution] = familyHornor
item_id = curMission.GetProperty(Def_Day_Event_Reward_Item_Id)
item_count = curMission.GetProperty(Def_Day_Event_Reward_Item_Count)
@@ -5413,7 +5413,7 @@
GameWorld.DebugLog("任务：%d 获得经验:%d,钱=%s,物品ID=%s,物品数量=%s"
% (curMission.GetMissionID(), exp, money, item_id, item_count))
- FBLogic.DoFB_OnFinishRunAroundTask(curPlayer, curMissionID, exp, {runAroundReward.MoneyType:money}, itemInfo)
+ FBLogic.DoFB_OnFinishRunAroundTask(curPlayer, curMissionID, exp, moneyDict, itemInfo)
#触发OSS记录
if GameWorld.IsMissonDR(curPlayer):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ClearDevil.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ClearDevil.py
index 49bb331..0e46602 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ClearDevil.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ClearDevil.py
@@ -434,6 +434,7 @@
awardDict[FBCommon.Over_exp] = exp
awardDict[FBCommon.Over_expPoint] = expPoint
awardDict[FBCommon.Over_itemInfo] = FBCommon.GetJsonItemList(itemList)
+ awardDict[FBCommon.Over_money] = FBCommon.GetJsonMoneyList(moneyDict)
__SendOverInfo(curPlayer, awardDict)
return
--
Gitblit v1.8.0