From f44f49720af5ac79493636a1c67bbd10687dbf6c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十二月 2018 18:16:05 +0800
Subject: [PATCH] 860312 礼包卡账号小写
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.py | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.py
index 9f104f2..0c48d53 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.py
@@ -69,8 +69,10 @@
FB_Step_Over, # 副本结束
) = range(3)
-def OnLogin(curPlayer):
- OnElderBattlefieldFBResult(curPlayer, True)
+def OnFBPlayerOnLogin(curPlayer):
+ mapID = GameWorld.GetMap().GetMapID()
+ if mapID != ChConfig.Def_FBMapID_ElderBattlefield:
+ OnElderBattlefieldFBResult(curPlayer, True)
return
def OnElderBattlefieldStateChange(state, tick):
@@ -380,11 +382,14 @@
def OnElderBattlefieldFBResult(curPlayer, isLogin=False):
# 玩家处理上古战场结算信息
+ curStage = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ElderBattlefieldStage, 0)
+ if not curStage:
+ return
GameWorld.DebugLog(' 玩家处理上古战场结算信息 , isLogin=%s' % isLogin, curPlayer.GetPlayerID())
lineID = 0 #GameWorld.GetGameWorld().GetPropertyID() -1
fbRewardDict = FBCommon.GetFBLineReward(ChConfig.Def_FBMapID_ElderBattlefield, lineID)
- curStage = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ElderBattlefieldStage, 0)
+
itemList = fbRewardDict.get(curStage, [])
succIDList = PlayerSuccess.GetCanGetAwardSuccByType(curPlayer, [ShareDefine.SuccType_ElderBattlefieldKill, ShareDefine.SuccType_ElderBattlefieldConKill])
succAwardDict = PlayerSuccess.GiveSuccAward(curPlayer, succIDList, False)
@@ -551,7 +556,7 @@
if atkIsPlayer:
PlayerControl.FBNotify('AncientBattlefield_7', [atkobj.GetName(), defender.GetName(), defContKillCntEx])
else:
- PlayerControl.FBNotify('AncientBattlefield_robot', [atkobj.GetNPCID(), atkobj.GetObjID(), defender.GetName(), defContKillCntEx])
+ PlayerControl.FBNotify('AncientBattlefield_robot', [atkobj.GetNPCID(), atkobj.GetID(), defender.GetName(), defContKillCntEx])
gameFB.SetPlayerGameFBDict(tagPlayerID, FBPlayerDict_ContKillCntEx, 0)
#记录仇人
if atkIsPlayer:
--
Gitblit v1.8.0