From fa10596d9f3abf523f8e900d7b920e4af8ea6bc5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 07 三月 2019 14:45:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py
index 9961324..f36ce5f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_XMZZ.py
@@ -27,6 +27,7 @@
import ItemCommon
import FormulaControl
import NPCCustomRefresh
+import PlayerWeekParty
import PlayerSuccess
import PyGameData
import EventReport
@@ -137,7 +138,7 @@
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_XMZZLastStartTime, curtime)
#FBCommon.SetFBStep(FB_Step_Prepare, tick)
#PrepareXMZZPK(curPlayer, tick)
-
+ PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_XMZZ, 1)
msgInfo = str([1]) # 是否刚开始
GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(curPlayer.GetID(), 0, 0, 'XMZZStartFight', msgInfo, len(msgInfo))
curPlayer.SetHP(curPlayer.GetMaxHP())
@@ -366,8 +367,8 @@
# @return 返回值无意义
# @remarks 玩家主动离开副本.
def DoPlayerDead(curPlayer):
- if GameWorld.GetGameFB().GetFBStep() != FB_Step_Fighting:
- return
+# if GameWorld.GetGameFB().GetFBStep() != FB_Step_Fighting:
+# return
HPPer = __GetHPPer(curPlayer)
__SendPKResult(curPlayer, 0, 1, HPPer)
@@ -449,7 +450,7 @@
prizeItemList = winCntAwardDict[str(prizeEx)]
# 给物品 [奖励物品id,个数,是否绑定]
for itemID, itemCnt, isBind in prizeItemList:
- if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind,
+ if not ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0,
[IPY_GameWorld.rptItem], True, showSysInfo=True):
playerID = curPlayer.GetPlayerID()
--
Gitblit v1.8.0