From ea1b7e5229ebbae2340b5616c796f2a2b00a123f Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 28 五月 2019 10:54:34 +0800
Subject: [PATCH] 6805 【后端】【2.0】副本前端化(代码优化)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Guard.py | 12 +++++++++---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/自定义场景说明.txt | 2 ++
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Guard.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Guard.py
index a5743b2..3321d6a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Guard.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Guard.py
@@ -40,16 +40,22 @@
def OnClientEndFB(curPlayer, mapID, lineID, dataList):
#客户端副本发送结束
+ if PlayerControl.GetCustomMapID(curPlayer) != mapID:
+ return
+ hasEnter = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID, False,
+ [mapID])
+ if hasEnter:
+ return
+ GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID, 1, False, [mapID])
itemID, giveExp = FBCommon.GetFBLineReward(mapID, 0)
- #
overDict = {}
- ItemControler.GivePlayerItem(curPlayer, itemID, 1, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere])
+ ItemControler.GivePlayerItemOrMail(curPlayer, [[itemID, 1, 0]])
if giveExp:
PlayerControl.PlayerControl(curPlayer).AddExp(giveExp)
overDict[FBCommon.Over_exp] = giveExp
if itemID:
overDict[FBCommon.Over_itemInfo] = FBCommon.GetJsonItemList([itemID])
- GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID, 1, False, [mapID])
+
FBCommon.NotifyFBOver(curPlayer,mapID,lineID,1,overDict)
EventShell.EventRespons_FBEvent(curPlayer, "guardfbpass")
PlayerControl.SetCustomMap(curPlayer, 0, 0)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py
index 3a9d6bf..4716952 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py
@@ -576,7 +576,7 @@
GameWorld.DebugLog('封魔坛 客户端副本发送结束mapID=%s,lineID=%s,dataList=%s' % (mapID,lineID,dataList), curPlayer.GetPlayerID())
rank, hurt = dataList[:2]
prizeItemList = GiveSealDemonAward(curPlayer, lineID, rank, False, True, [curPlayer.GetPosX(), curPlayer.GetPosY(), True])
- if rank == 1:
+ if rank == 1 and prizeItemList:
bossID = CurFBLineBOSSID(lineID)
NPCCommon.GameServer_KillGameWorldBoss(bossID, curPlayer.GetName(), hurt, False)
diff --git "a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/\350\207\252\345\256\232\344\271\211\345\234\272\346\231\257\350\257\264\346\230\216.txt" "b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/\350\207\252\345\256\232\344\271\211\345\234\272\346\231\257\350\257\264\346\230\216.txt"
index 4c3eb9c..b4faf14 100644
--- "a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/\350\207\252\345\256\232\344\271\211\345\234\272\346\231\257\350\257\264\346\230\216.txt"
+++ "b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/\350\207\252\345\256\232\344\271\211\345\234\272\346\231\257\350\257\264\346\230\216.txt"
@@ -10,6 +10,8 @@
缥缈仙草园 32050 0
VIPBoss 31240 对应功能线路ID
跨服PVP前期 0 0
+守护副本 31250 0
+前期封魔坛 52020 对应功能线路ID
---------------------------------
【开发说明】
--
Gitblit v1.8.0