From 531925c3bbc32e095107db631abf01b86cc93726 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 15 十一月 2018 14:45:32 +0800
Subject: [PATCH] 2379 【1.3】自动购买获取物品价格前后端统一

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
index 0072881..8b8ebcd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
@@ -1557,6 +1557,7 @@
         return 0
     #任务
     EventShell.EventRespons_FBEvent(curPlayer, 'fbhelp')
+    EventShell.EventRespons_FBEvent(curPlayer, 'fbhelp_%s'%mapID)
     # 每日活动
     PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FBHelp)
     addHelpPoint = helpPoint * addFBCnt
@@ -1566,7 +1567,10 @@
         PlayerControl.NotifyCode(curPlayer, 'AssistantIntegralFull')
         return 0
     addHelpPoint = min(addHelpPoint, dayMaxPoint-curDayPoint)
-    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FBHelpPointCntDay, curDayPoint+addHelpPoint)
+    updHelpPoint = curDayPoint+addHelpPoint
+    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FBHelpPointCntDay, updHelpPoint)
+    curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_DayFBHelpPoint, updHelpPoint, False)
+    
     PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_FBHelpPoint, addHelpPoint, isSysHint=False)
     PlayerControl.NotifyCode(curPlayer, 'AssistantIntegral', [addHelpPoint])
     GameWorld.DebugLog("    增加副本助战积分!mapID=%s, addHelpPoint=%s"%(mapID, addHelpPoint), curPlayer.GetID())
@@ -1661,7 +1665,7 @@
     #重置每日获得的助战积分
     if onDayType ==ShareDefine.Def_OnEventTypeEx:
         PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FBHelpPointCntDay, 0)
-        
+        curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_DayFBHelpPoint, 0, False)
     return
 
 ## 玩家通用副本登录处理
@@ -1676,6 +1680,9 @@
     NotifyFBCntRegainInfo(curPlayer)
     #判断副本里离线超过一定时间则退出副本
     CheckFBPlayerOffine(curPlayer)
+    #通知助战点数
+    curDayPoint = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FBHelpPointCntDay)
+    curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_DayFBHelpPoint, curDayPoint, False)
     return
 def CheckFBPlayerOffine(curPlayer):
     mapid = curPlayer.GetMapID()
@@ -2017,7 +2024,10 @@
     
     if mapID not in enterCDDict:
         return 0
-    
+    lvLimitDict = IpyGameDataPY.GetFuncEvalCfg('FBEnterCD', 3)
+    if mapID in lvLimitDict:
+        if curPlayer.GetLV() >= lvLimitDict[mapID]:
+            return 0
     cdTick = enterCDDict[mapID]
     lastEnterTick = GetFBPDictValue(curPlayer, ChConfig.Def_PDict_LastEnterFBTick % mapID)
     if not lastEnterTick:
@@ -2107,7 +2117,7 @@
         enterTickObj = ChPyNetSendPack.tagMCFBEnterTick()
         enterTickObj.Clear()
         enterTickObj.MapID = mapID
-        enterTickObj.LastEnterTick = max(enterCDDict.get(mapID) - (timeNum - lastEnterTick), 0)
+        enterTickObj.LastEnterTick = lastEnterTick#max(enterCDDict.get(mapID) - (timeNum - lastEnterTick), 0)
         enterList.EnterTickList.append(enterTickObj)
     
     enterList.Cnt = len(enterList.EnterTickList)

--
Gitblit v1.8.0