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/DB/StructData/DBFamily.py | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/StructData/DBFamily.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/StructData/DBFamily.py
index 7d2b5b7..5d66d8b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/StructData/DBFamily.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DB/StructData/DBFamily.py
@@ -75,10 +75,10 @@
@param dbData: 实例对应绑定的dbData
@return: 成功返回实例对象，失败返回None
'''
- dataToJson = False
- # 如果需要 dataToJson，可根据ActionType在这里处理
+ dataToJson = True
+ # 默认使用 dataToJson，如果不需要的可根据 ActionType 在这里处理
if dbData.ActionType in []:
- dataToJson = True
+ dataToJson = False
actionData = FamilyActionData(dbData, dataToJson)
self.__actionDataList.append(actionData)
return actionData
@@ -132,7 +132,28 @@
elif False:
aData = FamilyActionData()
return aData
-
+
+ def GetActionDataByValue1(self, value1, isAdd=False):
+ ## 获取Action根据Value1
+ # @return: None or findActionData
+ findActionData = None
+ for actionData in self.__actionDataList:
+ if actionData.GetValue1() == value1:
+ findActionData = actionData
+ break
+ if not findActionData and isAdd:
+ findActionData = self.AddAction()
+ findActionData.SetValue1(value1)
+ return findActionData
+
+ def DelActionDataByValue1(self, value1):
+ ## 删除Action根据Value1
+ for actionData in self.__actionDataList[::-1]:
+ if actionData.GetValue1() == value1:
+ self.__actionDataList.remove(actionData)
+ break
+ return
+
class FamilyActionMgr():
def __init__(self):
@@ -140,6 +161,8 @@
return
def GetFamilyAction(self, familyID, actionType):
+ if not familyID:
+ return FamilyAction()
if familyID not in self.__familyActionDict:
self.__familyActionDict[familyID] = {}
actionDict = self.__familyActionDict[familyID]
@@ -474,7 +497,7 @@
def FindFamily(self, familyID):
family = None
- if familyID in self.__familyIDDict:
+ if familyID and familyID in self.__familyIDDict:
family = self.__familyIDDict[familyID]
elif False:
family = Family()
--
Gitblit v1.8.0