From 55b78ba8396c6919e4060990f0dec625a7ca9bd8 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 15 六月 2019 13:51:40 +0800
Subject: [PATCH] 7182 答题广播修改 仙盟BOSS掉落光柱
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py | 13 ++++++++-----
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py | 4 ++--
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
index 7e838e8..06275cc 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
@@ -241,7 +241,7 @@
playerName = curPlayer.GetName()
gameWorld.SetDict(FamilyPartyFB_QuestionID%curFamilyid, 0)
gameWorld.SetDict(FamilyPartyFB_AnswerTick%curFamilyid, tick)
- PlayerControl.FamilyNotify(curFamilyid, 'Party_Answer', [playerName])
+
if curFamilyid in PyGameData.g_familyAnswerDict:
PyGameData.g_familyAnswerDict[curFamilyid][0] +=1
PyGameData.g_familyAnswerDict[curFamilyid][1] = tick
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
index dd0ad70..4b8390d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_AllFamilyBoss.py
@@ -30,6 +30,7 @@
import ItemControler
import PlayerWeekParty
import PlayerActivity
+import NPCCommon
import EventReport
import GameObj
@@ -125,7 +126,7 @@
if not state:
if not GameWorld.GetGameFB().GetGameFBDictByKey(FBDict_IsOver):
GameWorld.GetGameFB().SetGameFBDict(FBDict_IsOver, tick)
- __DoLogicAllFamilyBossOver(0, tick)
+ __DoLogicAllFamilyBossOver(0, tick, 0, 0)
return
@@ -345,7 +346,7 @@
return playerHurtList
-def __DoLogicAllFamilyBossOver(isPass, tick):
+def __DoLogicAllFamilyBossOver(isPass, tick, dropPosX, dropPosY):
#结算
FBCommon.SetFBStep(FB_Step_Over, tick)
msgStr = str([])
@@ -367,6 +368,7 @@
batchPlayerIDList, batchAddItemList, batchParamList, batchDetailList = [], [], [], []
event = ["AllFamilyBoss", False, {}]
needMemberCnt = IpyGameDataPY.GetFuncCfg('LeagueBOSSNumber1')
+ bossID = CurFBLineBOSSID(lineID)
for rank, hurtInfo in enumerate(playerHurtList, 1):
familyID = hurtInfo[0]
memberIDList = hurtInfo[1][2]
@@ -386,7 +388,8 @@
member = playerManager.FindPlayerByID(memberID)
if member:
if menberItemList:
- ItemControler.GivePlayerItemOrMail(member, menberItemList, 'LeagueBOSS1', event)
+ NPCCommon.DoGiveItemByVirtualDrop(member, menberItemList, bossID, dropPosX, dropPosY, mailTypeKey='LeagueBOSS1')
+ #ItemControler.GivePlayerItemOrMail(member, menberItemList, 'LeagueBOSS1', event)
member.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, leaveTick, True)
FBCommon.NotifyFBOver(member, ChConfig.Def_FBMapID_AllFamilyBoss, lineID, isPass, overDict)
elif menberItemList:
@@ -477,8 +480,8 @@
GameWorld.DebugLog('结束 设置BOSS死亡')
GameWorld.GetGameFB().SetGameFBDict(FBDict_IsOver, tick)
-
- __DoLogicAllFamilyBossOver(1, tick)
+ dropPosX, dropPosY = curNPC.GetPosX(), curNPC.GetPosY()
+ __DoLogicAllFamilyBossOver(1, tick, dropPosX, dropPosY)
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py
index 60af27c..ad3c8f9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py
@@ -251,13 +251,13 @@
# if mapID != ChConfig.Def_FBMapID_FamilyParty:
# return
#
-
+
addPoint, addExp = IpyGameDataPY.GetFuncEvalCfg('PartyReward', 2)
#仙盟贡献度
PlayerFamily.AddPlayerFamilyActiveValue(curPlayer, addPoint, True, ShareDefine.Def_AddFAVReason_FamilyParty, True)
#答题经验更新
PlayerControl.PlayerControl(curPlayer).AddExp(addExp, ShareDefine.Def_ViewExpType_SysEx)
-
+ PlayerControl.FamilyNotify(curPlayer.GetFamilyID(), 'Party_Answer', [curPlayer.GetName(), addPoint])
curAnswerCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FamilyPartyAnswerCnt)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FamilyPartyAnswerCnt, curAnswerCnt + 1)
--
Gitblit v1.8.0