From 01e033a79a5ce63e298015d0783560a77ccffea9 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 14 九月 2018 11:46:46 +0800
Subject: [PATCH] fix:3543 【后端】【主干】【1.0.15】开服红包优化 每天赠送次数

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_DuJie.py |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 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 1fd9bf3..ebda50a 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
@@ -172,12 +172,18 @@
 # @return 无意义
 # @remarks 玩家进入副本
 def DoEnterFB(curPlayer, tick):
+    gameFB = GameWorld.GetGameFB()
+    fbStep = gameFB.GetFBStep()
+    if fbStep == FB_Step_LeaveTime:
+        PlayerControl.PlayerLeaveFB(curPlayer)
+        return
+    
     lineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ReqFBFuncLine)
     if not FBCommon.GetHadSetFBPropertyMark():
         FBCommon.SetFBPropertyMark(lineID)
         FBCommon.SetFBStep(FB_Step_MapPrepare, tick)
     
-    gameFB = GameWorld.GetGameFB()
+    
     
     DuJieFBCfg = GetRealmFBTimeCfg()
     if not gameFB.GetGameFBDictByKey(DuJieFB_LeaderPlayerID):
@@ -311,7 +317,7 @@
     if tick - GameWorld.GetGameFB().GetFBStepTick() < invadeCfg[Def_Time_Leave] * 1000:
         return
     # 时间到,踢出还在副本的玩家等...
-    FBCommon.DoLogic_FBKickAllPlayer()
+    #FBCommon.DoLogic_FBKickAllPlayer()
     return
 
 def __OnDuJieFBStart(tick):
@@ -368,7 +374,7 @@
 
     curStar = gameFB.GetGameFBDictByKey(DuJieFB_Star)
     realmLV = gameFB.GetGameFBDictByKey(DuJieFB_RealmLV)
-    
+    realmIpyData = PlayerPrestigeSys.GetRealmIpyData(realmLV)
     lineID = FBCommon.GetFBPropertyMark()
     leaveTick = invadeCfg[Def_Time_Leave] * 1000
     overDict = {FBCommon.Over_costTime:costTime,FBCommon.Over_grade:curStar, FBCommon.Over_leaderID:leaderPlayerID}
@@ -393,10 +399,10 @@
                 FBCommon.SyncFBEnterTick(curPlayer)
             else:
                 #帮忙打的给奖励
-                __GiveTeamAward(curPlayer, leaderPlayer, realmLV, curStar)
+                __GiveTeamAward(curPlayer, leaderPlayer, realmIpyData, curStar)
                 EventShell.EventRespons_DujieFBHelpPass(curPlayer)
-                
-            realmIpyData = PlayerPrestigeSys.GetRealmIpyData(realmLV)
+                FBCommon.AddFBHelpPoint(curPlayer, ChConfig.Def_FBMapID_DuJie, 1)
+            
             if realmIpyData and realmIpyData.GetIsBigRealm():
                 #成就
                 PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_DujieFBHelpPass, 1)
@@ -404,9 +410,8 @@
     
     return
 
-def __GiveTeamAward(curPlayer, leaderPlayer, realmLV, curStar):
+def __GiveTeamAward(curPlayer, leaderPlayer, realmIpyData, curStar):
     #帮忙打的给奖励
-    realmIpyData = PlayerPrestigeSys.GetRealmIpyData(realmLV)
     if not realmIpyData:
         return
     teamAwardDict = realmIpyData.GetTeamAward()

--
Gitblit v1.8.0