From 26a116683bd08fe6705f12d6386068a801b702b9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 03 四月 2020 18:11:33 +0800
Subject: [PATCH] 4475 【主干】免费送的3个仙盟，概率随机重名导致无法创建（手动创建与系统随机仙盟名相同的默认当做创建该系统仙盟，防止重复）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py | 41 +++++++++++++----------------------------
1 files changed, 13 insertions(+), 28 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 3a91193..b50fa1c 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
@@ -30,7 +30,6 @@
import PlayerSuccess
import EventShell
import EventReport
-import FBHelpBattle
import math
import time
@@ -134,17 +133,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
@@ -187,8 +185,8 @@
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)
+ #if lineID == 0:
+ FBCommon.SetFBStep(FB_Step_MapPrepare, tick)
@@ -208,10 +206,6 @@
# if gameFB.GetFBStep() == FB_Step_Fighting:
# __OnDuJieFBStart(tick)
fbStep = gameFB.GetFBStep()
-
- if lineID !=0 and fbStep == FB_Step_CallHelp:
- FBHelpBattle.SendGameServer_RefreshHelpBattlePlayer(curPlayer, ChConfig.Def_FBMapID_DuJie)
- return
if fbStep == FB_Step_MapPrepare:
#初始化并通知等待倒计时
@@ -395,7 +389,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
@@ -419,15 +413,8 @@
#清除CD
FBCommon.SetFBPDictValue(curPlayer, ChConfig.Def_PDict_LastEnterFBTick % ChConfig.Def_FBMapID_DuJie, 0)
FBCommon.SyncFBEnterTick(curPlayer)
- if lineID:
- 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
@@ -525,14 +512,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