From 4522a07fe53f63a2ff97701ee6a166e80e329181 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 19 二月 2019 12:01:09 +0800
Subject: [PATCH] 6249 【后端】【2.0】拍卖行（拍卖物品表、拍卖记录表定义）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py
index 6cbe254..c337889 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py
@@ -182,10 +182,11 @@
return
lineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ReqFBFuncLine)
- if lineID: #小境界0 大境界为境界等级
- lineID = curPlayer.GetOfficialRank()
- if not FBCommon.GetHadSetFBPropertyMark():
- FBCommon.SetFBPropertyMark(lineID)
+ if not FBCommon.GetHadSetFBPropertyMark(): #此处副本属性和功能线路ID不同，故分开设置
+ propertyMark = curPlayer.GetOfficialRank() if lineID else lineID #小境界0 大境界为境界等级
+ GameWorld.GetGameFB().SetGameFBDict(ChConfig.Map_FBDict_PropertyMark, propertyMark + 1)
+ PlayerControl.SetFBFuncLineID(curPlayer, lineID)
+ #FBCommon.SetFBPropertyMark(lineID)
if lineID == 0:
FBCommon.SetFBStep(FB_Step_MapPrepare, tick)
@@ -209,7 +210,7 @@
fbStep = gameFB.GetFBStep()
if lineID !=0 and fbStep == FB_Step_CallHelp:
- FBHelpBattle.SendGameServer_RefreshHelpBattlePlayer(curPlayer, ChConfig.Def_FBMapID_DuJie, lineID)
+ FBHelpBattle.SendGameServer_RefreshHelpBattlePlayer(curPlayer, ChConfig.Def_FBMapID_DuJie)
return
if fbStep == FB_Step_MapPrepare:
@@ -411,7 +412,6 @@
EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_DuJie, lineID, ChConfig.CME_Log_End, 0, isPass)
curPlayer.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, leaveTick, True)
- FBCommon.NotifyFBOver(curPlayer, ChConfig.Def_FBMapID_DuJie, lineID, isPass, overDict)
if isPass and leaderPlayer:
if curPlayer.GetPlayerID() == leaderPlayerID:
#渡劫通过处理
@@ -420,18 +420,15 @@
FBCommon.SetFBPDictValue(curPlayer, ChConfig.Def_PDict_LastEnterFBTick % ChConfig.Def_FBMapID_DuJie, 0)
FBCommon.SyncFBEnterTick(curPlayer)
if lineID:
- FBHelpBattle.DoSingleFBAddXianyuanCoin(curPlayer, ChConfig.Def_FBMapID_DuJie, FBPropertyMark)
-# else:
-# #帮忙打的给奖励
-# __GiveTeamAward(curPlayer, leaderPlayer, realmIpyData, curStar)
-# EventShell.EventRespons_DujieFBHelpPass(curPlayer)
-# FBCommon.AddFBHelpPoint(curPlayer, ChConfig.Def_FBMapID_DuJie, 1)
+ addXianyuanCoin, reason = FBHelpBattle.DoFBAddXianyuanCoin(curPlayer, ChConfig.Def_FBMapID_DuJie, FBPropertyMark)
+ overDict[FBCommon.Over_xianyuanCoin] = [addXianyuanCoin, reason]
if realmIpyData and realmIpyData.GetIsBigRealm():
#成就
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_DujieFBHelpPass, 1)
if playerCnt > 1: #多人组队渡劫
EventShell.EventRespons_FBEvent(curPlayer, 'teamdujie')
+ FBCommon.NotifyFBOver(curPlayer, ChConfig.Def_FBMapID_DuJie, lineID, isPass, overDict)
return
--
Gitblit v1.8.0