From fcd85d03baffd8246e5f8202f2dbda8bfe12cff8 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 15 三月 2019 14:38:32 +0800
Subject: [PATCH] 6307 【后端】【2.0】多套装备开发单(提示修改)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py | 60 +++++++++++++++++++++++++-----------------------------------
1 files changed, 25 insertions(+), 35 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..d8579a2 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
@@ -134,17 +134,16 @@
if not realmIpyData:
GameWorld.ErrLog("没有该境界等级数据! Lv=%s" % curRealmLV)
return False
- needRealmPoint = realmIpyData.GetNeedPoint()
- if not needRealmPoint:
+ needLV = realmIpyData.GetNeedLV()
+ if not needLV:
GameWorld.DebugLog("境界已是最大等级，不能升级! Lv=%s" % curRealmLV, curPlayer.GetPlayerID())
return False
- if not PlayerControl.HaveMoney(curPlayer, ShareDefine.TYPE_Price_RealmPoint, needRealmPoint, False):
- GameWorld.DebugLog("境界修炼点不足，无法开启渡劫！needRealmPoint=%s" % (needRealmPoint), curPlayer.GetPlayerID())
+ if curPlayer.GetLV() < needLV:
+ GameWorld.DebugLog("等级不足，无法开启渡劫！needRealmPoint=%s" % (needLV), curPlayer.GetPlayerID())
return False
-# if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_RealmFBIsOpen) != 1:
-# return False
-
-
+ if not realmIpyData.GetBossID():
+ return False
+
return True
@@ -182,12 +181,13 @@
return
lineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ReqFBFuncLine)
- if lineID: #小境界0 大境界为境界等级
- lineID = curPlayer.GetOfficialRank()
- if not FBCommon.GetHadSetFBPropertyMark():
- FBCommon.SetFBPropertyMark(lineID)
- if lineID == 0:
- FBCommon.SetFBStep(FB_Step_MapPrepare, tick)
+ 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)
@@ -208,9 +208,9 @@
# __OnDuJieFBStart(tick)
fbStep = gameFB.GetFBStep()
- if lineID !=0 and fbStep == FB_Step_CallHelp:
- FBHelpBattle.SendGameServer_RefreshHelpBattlePlayer(curPlayer, ChConfig.Def_FBMapID_DuJie, lineID)
- return
+# if lineID !=0 and fbStep == FB_Step_CallHelp:
+# FBHelpBattle.SendGameServer_RefreshHelpBattlePlayer(curPlayer, ChConfig.Def_FBMapID_DuJie)
+# return
if fbStep == FB_Step_MapPrepare:
#初始化并通知等待倒计时
@@ -394,7 +394,7 @@
curStar = gameFB.GetGameFBDictByKey(DuJieFB_Star)
realmLV = gameFB.GetGameFBDictByKey(DuJieFB_RealmLV)
- realmIpyData = PlayerPrestigeSys.GetRealmIpyData(realmLV)
+
FBPropertyMark = FBCommon.GetFBPropertyMark()
lineID = 1 if FBPropertyMark else 0
leaveTick = invadeCfg[Def_Time_Leave] * 1000
@@ -411,7 +411,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 +419,11 @@
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
@@ -452,7 +444,7 @@
GameWorld.DebugLog("背包空间不够，发送邮件: mailItemList=%s" % str(prizeItemList), curPlayer.GetPlayerID())
else:
for itemID, itemCnt, isBind in prizeItemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem],
+ ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem],
event=["Dojie", False, {}])
return
@@ -528,14 +520,12 @@
# if curPlayer.GetFamilyID() <= 0:
# GameWorld.DebugLog("没有战盟，不能请求守护！")
# return
-
+ return
realmLV = GameWorld.GetGameFB().GetGameFBDictByKey(DuJieFB_RealmLV)
realmIpyData = PlayerPrestigeSys.GetRealmIpyData(realmLV)
if not realmIpyData:
return
- if realmIpyData.GetIsBigRealm():
- GameWorld.DebugLog("大境界渡劫，不能请求守护！")
- return
+
GameWorld.DebugLog("向盟友寻求渡劫守护！")
atkAdd = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_RealmFBAttrAdd % ShareDefine.Def_Effect_BaseAtkAddPer)
msgStr = str([atkAdd, isInspire])
--
Gitblit v1.8.0