From 985bdf70fd0022733f75bf2106e69c6de77c26b1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 28 十一月 2025 17:29:51 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（卑弥呼所有技能；技能表增加字段Buff保留-BuffRetain，支持死亡保留、复活保留；增加触发方式42-大回合开始时（死亡后有效）；增加属性ID 73复活生命加成、74复活怒气加成；优化效果6014-支持失败次数额外概率；优化死亡、复活时的buff处理；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py | 31 ++++++++-----------------------
1 files changed, 8 insertions(+), 23 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 51b29fe..63d2b59 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
@@ -18,6 +18,7 @@
import ItemCommon
import NPCCommon
import ReadChConfig
+import PlayerActivity
import ChPyNetSendPack
import NetPackCommon
import IpyGameDataPY
@@ -1531,7 +1532,7 @@
def AddEnterFBCount(curPlayer, fbID, addCount=1, lineBit=-1, isFree=False):
## 增加玩家进入副本次数
## @param isFree: 是否免费进入的，免费的不增加实际进入次数，但需要触发进入次数额外处理，如活跃、成就等
- #addCountEx = addCount
+ addCountEx = addCount
addCount = 0 if isFree else addCount
fbID = GetRecordMapID(fbID)
enterCntKey = ChConfig.Def_Player_Dict_FbEnterCnt % fbID
@@ -1543,14 +1544,13 @@
PlayerControl.NomalDictSetProperty(curPlayer, enterCntKey, updValue)
else:
maxCnt = GetEnterFBMaxCnt(curPlayer, fbID)
- if enterCnt >= maxCnt:
+ if not isFree and enterCnt >= maxCnt:
return False
updCnt = min(maxCnt, enterCnt + addCount)
addCount = updCnt-enterCnt
PlayerControl.NomalDictSetProperty(curPlayer, enterCntKey, updCnt)
- #PlayerActivity.OnEnterFBActivity(curPlayer, fbID, updCnt, addCountEx)
- #PlayerSuccess.AddEnterFBSuccess(curPlayer, fbID, addCountEx)
+ PlayerActivity.AddDailyTaskValue(curPlayer, ChConfig.DailyTask_FBFinish, addCountEx, [fbID])
updValue = updCnt
GameWorld.DebugLog(" AddEnterFBCount fbID=%s, addCount=%s, lineBit=%s, enterCnt=%s,updValue=%s"
% (fbID, addCount, lineBit, enterCnt, updValue), curPlayer.GetPlayerID())
@@ -1619,9 +1619,10 @@
if not costType or not payMoneyList:
GameWorld.DebugLog("没有配置购买副本次数消耗货币数! mapID=%s,costType=%s,payMoneyList=%s" % (mapID, costType, payMoneyList))
return
- costMoney = payMoneyList[hasBuyCnt] if len(payMoneyList) > hasBuyCnt else payMoneyList[-1]
- if not PlayerControl.PayMoney(curPlayer, costType, costMoney, ChConfig.Def_Cost_BuyFBCnt, {"MapID":mapID}):
- return
+ if not PlayerGoldInvest.IsFBCntBuyFree(curPlayer, mapID):
+ costMoney = payMoneyList[hasBuyCnt] if len(payMoneyList) > hasBuyCnt else payMoneyList[-1]
+ if not PlayerControl.PayMoney(curPlayer, costType, costMoney, ChConfig.Def_Cost_BuyFBCnt, {"MapID":mapID}):
+ return
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FBBuyCnt % mapID, hasBuyCnt + 1)
Sync_FBPlayerFBInfoData(curPlayer, mapID)
return
@@ -1677,22 +1678,6 @@
# if mapID in mapIDList:
# return dataMapID
return mapID
-
-def GetGeneralTrainMapIDList():
- ## 获取通用养成副本
- GeneralTrainMapIDList = IpyGameDataPY.GetConfigEx("GeneralTrainMapIDList")
- if not GeneralTrainMapIDList:
- GeneralTrainMapIDList = []
- ipyDataMgr = IpyGameDataPY.IPY_Data()
- for i in xrange(ipyDataMgr.GetFBGeneralTrainCount()):
- ipyData = ipyDataMgr.GetFBGeneralTrainByIndex(i)
- dMapID = ipyData.GetDataMapID()
- if dMapID not in GeneralTrainMapIDList:
- GeneralTrainMapIDList.append(dMapID)
- GeneralTrainMapIDList = IpyGameDataPY.SetConfigEx("GeneralTrainMapIDList", GeneralTrainMapIDList)
- #GameWorld.Log("加载GeneralTrainMapIDList=%s" % GeneralTrainMapIDList)
-
- return GeneralTrainMapIDList
def Sync_FBPlayerFBInfoData(curPlayer, mapIDInfo=None):
## 通知个人通用副本信息
--
Gitblit v1.8.0