From 414e694600077975d13979e925e152a52f4f8d03 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 09 十二月 2025 18:08:05 +0800
Subject: [PATCH] 383 【武将】武将宿缘-服务端
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py | 254 +++++++++++++++++++---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py | 9
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 6
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py | 81 +++++++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 112 ++++++++++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 74 ++++++
PySysDB/PySysDBPY.h | 28 ++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Hero.py | 40 +++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 4
9 files changed, 556 insertions(+), 52 deletions(-)
diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index 3640f44..d1e46da 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -211,7 +211,7 @@
//武将品质表
struct HeroQuality
{
- DWORD _Quality; //品质
+ BYTE _Quality; //品质
list InitTalentWeight; // 初始天赋数权重
BYTE InitStarUpper; // 初始星级上限
DWORD InitAddPer; // 卡牌初始加成万分率
@@ -226,7 +226,7 @@
//武将品质突破表
struct HeroQualityBreak
{
- DWORD _Quality; //品质
+ BYTE _Quality; //品质
DWORD _BreakLV; //突破等级
WORD UPLVNeed; // 突破到下级需要等级
list UPCostItemList; // 突破到下级消耗道具
@@ -235,7 +235,7 @@
//武将品质觉醒表
struct HeroQualityAwake
{
- DWORD _Quality; //品质
+ BYTE _Quality; //品质
DWORD _AwakeLV; //觉醒等级
list UPCostItem; // 觉醒到下级消耗道具
DWORD RebirthCostMoney; //重生消耗货币
@@ -244,7 +244,7 @@
//品质武将升级表
struct HeroQualityLV
{
- DWORD _Quality; //品质
+ BYTE _Quality; //品质
DWORD _HeroLV; //武将等级
list UPCostItem; // 升级到下级消耗道具
list AttrIDList; // 武将属性ID列表
@@ -258,6 +258,26 @@
list HeroIDList; // 推荐武将ID列表
};
+//武将宿缘表
+struct HeroFates
+{
+ WORD _FatesID; //宿缘ID
+ BYTE FatesQuality; //宿缘品质
+ list HeroIDList; // 武将ID组合列表
+ list AwardItemList; // 激活奖励物品列表
+ list AttrIDList; // 属性ID列表
+ list LVAttrValueList; // 每级属性值列表
+};
+
+//武将宿缘品质等级表
+struct HeroFatesQualityLV
+{
+ BYTE _FatesQuality; //宿缘品质
+ BYTE _FatesLV; //宿缘等级
+ BYTE NeedStarTotal; // 升到该级所需总星数
+ BYTE NeedHeroCnt; // 所需品质武将数
+};
+
//属性条目表
struct PlayerAttr
{
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 54f27c9..7880763 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -1270,7 +1270,7 @@
Writer = hxp
Releaser = hxp
RegType = 0
-RegisterPackCount = 12
+RegisterPackCount = 13
PacketCMD_1=0xB2
PacketSubCMD_1=0x30
@@ -1319,3 +1319,7 @@
PacketCMD_12=0xB2
PacketSubCMD_12=0x40
PacketCallFunc_12=OnHeroDismiss
+
+PacketCMD_13=0xB2
+PacketSubCMD_13=0x41
+PacketCallFunc_13=OnHeroFates
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 6c5daa6..19843f7 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -223,7 +223,7 @@
Def_CalcAttrList = (
Def_CalcAttr_LV, # 主公等级 0
Def_CalcAttr_MainEquip, # 主装备 1
-Def_CalcAttr_2,
+Def_CalcAttr_HeroFates, # 武将宿缘 2
Def_CalcAttr_Realm, # 官职 3
Def_CalcAttr_Gubao, # 古宝 4
Def_CalcAttr_HJG, # 幻境阁 5
@@ -234,6 +234,7 @@
CalcAttrName = {
Def_CalcAttr_LV:"主公等级",
Def_CalcAttr_MainEquip:"主装备",
+ Def_CalcAttr_HeroFates:"武将宿缘",
Def_CalcAttr_Realm:"官职",
Def_CalcAttr_Gubao:"古宝",
Def_CalcAttr_HJG:"幻境阁",
@@ -3842,6 +3843,7 @@
Def_PDict_HeroBookH = "HeroBookH_%s" # 武将图鉴历史最高等级，参数(武将ID) cccbbba: bbb-存星级图鉴最高等级；ccc-存突破图鉴最高等级
Def_PDict_HeroAwakeRebirthCnt = "HeroAwakeRebirthCnt" # 已觉醒过的武将今日已重生次数，共享次数
Def_PDict_HeroRecommend = "HeroRecommend_%s" # 阵容推荐领奖状态，参数(推荐ID) 根据武将ID所在索引位记录是否领取
+Def_PDict_HeroFatesInfo = "HeroFatesInfo_%s" # 武将宿缘信息，参数(宿缘ID) 宿缘等级*10 + 宿缘状态
#主线
Def_PDict_UnXiantaoCntExp = "UnXiantaoCntExp" # 累计未结算经验的战锤数
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index 475dfb6..df6e0dc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
@@ -11860,6 +11860,87 @@
#------------------------------------------------------
+# B2 41 武将宿缘 #tagCSHeroFates
+
+class tagCSHeroFates(Structure):
+ Head = tagHead()
+ FatesID = 0 #(BYTE FatesID)// 宿缘ID
+ OPType = 0 #(BYTE OPType)// 0-激活领奖；1-升级
+ IndexCnt = 0 #(BYTE IndexCnt)
+ ItemIndexList = list() #(vector<WORD> ItemIndexList)// 升级时消耗的材料卡在武将背包索引列表，升级时才发
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xB2
+ self.Head.SubCmd = 0x41
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.FatesID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.OPType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.IndexCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.IndexCnt):
+ value,_pos=CommFunc.ReadWORD(_lpData,_pos)
+ self.ItemIndexList.append(value)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xB2
+ self.Head.SubCmd = 0x41
+ self.FatesID = 0
+ self.OPType = 0
+ self.IndexCnt = 0
+ self.ItemIndexList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 1
+ length += 1
+ length += 2 * self.IndexCnt
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.FatesID)
+ data = CommFunc.WriteBYTE(data, self.OPType)
+ data = CommFunc.WriteBYTE(data, self.IndexCnt)
+ for i in range(self.IndexCnt):
+ data = CommFunc.WriteWORD(data, self.ItemIndexList[i])
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ FatesID:%d,
+ OPType:%d,
+ IndexCnt:%d,
+ ItemIndexList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.FatesID,
+ self.OPType,
+ self.IndexCnt,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagCSHeroFates=tagCSHeroFates()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSHeroFates.Head.Cmd,m_NAtagCSHeroFates.Head.SubCmd))] = m_NAtagCSHeroFates
+
+
+#------------------------------------------------------
# B2 38 武将锁定 #tagCSHeroLock
class tagCSHeroLock(Structure):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 94bbe03..c12717b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -31079,6 +31079,118 @@
#------------------------------------------------------
+# B1 31 宿缘信息 #tagSCHeroFatesInfo
+
+class tagSCHeroFates(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("FatesID", c_ubyte), # 宿缘ID
+ ("State", c_ubyte), # 宿缘状态：0-未激活；1-已激活已领奖
+ ("FatesLV", c_ubyte), # 宿缘等级，激活时为0级，升级后有升级属性
+ ]
+
+ def __init__(self):
+ self.Clear()
+ return
+
+ def ReadData(self, stringData, _pos=0, _len=0):
+ self.Clear()
+ memmove(addressof(self), stringData[_pos:], self.GetLength())
+ return _pos + self.GetLength()
+
+ def Clear(self):
+ self.FatesID = 0
+ self.State = 0
+ self.FatesLV = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagSCHeroFates)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B1 31 宿缘信息 //tagSCHeroFatesInfo:
+ FatesID:%d,
+ State:%d,
+ FatesLV:%d
+ '''\
+ %(
+ self.FatesID,
+ self.State,
+ self.FatesLV
+ )
+ return DumpString
+
+
+class tagSCHeroFatesInfo(Structure):
+ Head = tagHead()
+ Count = 0 #(BYTE Count)
+ FatesList = list() #(vector<tagSCHeroFates> FatesList)
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xB1
+ self.Head.SubCmd = 0x31
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.Count):
+ temFatesList = tagSCHeroFates()
+ _pos = temFatesList.ReadData(_lpData, _pos)
+ self.FatesList.append(temFatesList)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xB1
+ self.Head.SubCmd = 0x31
+ self.Count = 0
+ self.FatesList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ for i in range(self.Count):
+ length += self.FatesList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.Count)
+ for i in range(self.Count):
+ data = CommFunc.WriteString(data, self.FatesList[i].GetLength(), self.FatesList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ Count:%d,
+ FatesList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.Count,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagSCHeroFatesInfo=tagSCHeroFatesInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagSCHeroFatesInfo.Head.Cmd,m_NAtagSCHeroFatesInfo.Head.SubCmd))] = m_NAtagSCHeroFatesInfo
+
+
+#------------------------------------------------------
# B1 22 武将信息 #tagSCHeroInfo
class tagSCHero(Structure):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Hero.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Hero.py
index c97c796..a11242a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Hero.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Hero.py
@@ -42,6 +42,8 @@
GameWorld.DebugAnswer(curPlayer, "重置图鉴: Hero t 0 [重置阵容推荐]")
GameWorld.DebugAnswer(curPlayer, "重置重生: Hero r")
GameWorld.DebugAnswer(curPlayer, "武将皮肤: Hero sk 武将ID 皮肤索引 是否解锁")
+ GameWorld.DebugAnswer(curPlayer, "重置宿缘: Hero sy 0")
+ GameWorld.DebugAnswer(curPlayer, "设置宿缘: Hero sy 宿缘ID 等级 [是否激活]")
GameWorld.DebugAnswer(curPlayer, "清空武将: ClearPack 35")
GameWorld.DebugAnswer(curPlayer, "新增武将: MakeItemCount 英雄ID [个数]")
GameWorld.DebugAnswer(curPlayer, "阵容上阵: Hero f 阵容ID [武将ID ...]")
@@ -126,6 +128,44 @@
PlayerHero.ActiveHeroSkin(curPlayer, heroID, skinIndex, isActive)
return
+ # 宿缘
+ if value == "sy":
+ syncIDList = []
+ if not value2:
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ for index in range(ipyDataMgr.GetHeroFatesCount()):
+ ipyData = ipyDataMgr.GetHeroFatesByIndex(index)
+ fatesID = ipyData.GetFatesID()
+ if not PlayerHero.GetHeroFatesState(curPlayer, fatesID):
+ continue
+ PlayerHero.SetHeroFatesState(curPlayer, fatesID, 0)
+ PlayerHero.SetHeroFatesLV(curPlayer, fatesID, 0)
+ syncIDList.append(fatesID)
+ GameWorld.DebugAnswer(curPlayer, "重置宿缘")
+ else:
+ fatesID = value2
+ fatesLV = msgList[2] if len(msgList) > 2 else 0
+ fatesState = msgList[3] if len(msgList) > 3 else None
+ ipyData = IpyGameDataPY.GetIpyGameData("HeroFates", fatesID)
+ if not ipyData:
+ GameWorld.DebugAnswer(curPlayer, "宿缘ID不存在: %s" % fatesID)
+ return
+ if fatesLV:
+ fatesQuality = ipyData.GetFatesQuality()
+ if not IpyGameDataPY.GetIpyGameData("HeroFatesQualityLV", fatesQuality, fatesLV):
+ GameWorld.DebugAnswer(curPlayer, "宿缘品质(%s)等级(%s)不存在" % (fatesQuality, fatesLV))
+ return
+ syncIDList.append(fatesID)
+ if fatesState != None:
+ PlayerHero.SetHeroFatesState(curPlayer, fatesID, fatesState)
+ else:
+ fatesState = PlayerHero.GetHeroFatesState(curPlayer, fatesID)
+ PlayerHero.SetHeroFatesLV(curPlayer, fatesID, fatesLV)
+ GameWorld.DebugAnswer(curPlayer, "设置宿缘ID=%s,LV=%s,State=%s" % (fatesID, fatesLV, fatesState))
+ PlayerHero.Sync_HeroFatesInfo(curPlayer, syncIDList)
+ PlayerHero.RefreshLordAttr(curPlayer)
+ return
+
itemIndex = value2
heroItem = PlayerHero.GetHeroItem(curPlayer, itemIndex)
if not heroItem:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 017f1bd..cbd6e77 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -217,7 +217,7 @@
),
"HeroQuality":(
- ("DWORD", "Quality", 1),
+ ("BYTE", "Quality", 1),
("list", "InitTalentWeight", 0),
("BYTE", "InitStarUpper", 0),
("DWORD", "InitAddPer", 0),
@@ -230,21 +230,21 @@
),
"HeroQualityBreak":(
- ("DWORD", "Quality", 1),
+ ("BYTE", "Quality", 1),
("DWORD", "BreakLV", 1),
("WORD", "UPLVNeed", 0),
("list", "UPCostItemList", 0),
),
"HeroQualityAwake":(
- ("DWORD", "Quality", 1),
+ ("BYTE", "Quality", 1),
("DWORD", "AwakeLV", 1),
("list", "UPCostItem", 0),
("DWORD", "RebirthCostMoney", 0),
),
"HeroQualityLV":(
- ("DWORD", "Quality", 1),
+ ("BYTE", "Quality", 1),
("DWORD", "HeroLV", 1),
("list", "UPCostItem", 0),
("list", "AttrIDList", 0),
@@ -254,6 +254,22 @@
"LineupRecommend":(
("DWORD", "RecommendID", 1),
("list", "HeroIDList", 0),
+ ),
+
+ "HeroFates":(
+ ("WORD", "FatesID", 1),
+ ("BYTE", "FatesQuality", 0),
+ ("list", "HeroIDList", 0),
+ ("list", "AwardItemList", 0),
+ ("list", "AttrIDList", 0),
+ ("list", "LVAttrValueList", 0),
+ ),
+
+ "HeroFatesQualityLV":(
+ ("BYTE", "FatesQuality", 1),
+ ("BYTE", "FatesLV", 1),
+ ("BYTE", "NeedStarTotal", 0),
+ ("BYTE", "NeedHeroCnt", 0),
),
"PlayerAttr":(
@@ -2448,7 +2464,7 @@
self.attrTuple = None
return
- def GetQuality(self): return self.attrTuple[0] # 品质 DWORD
+ def GetQuality(self): return self.attrTuple[0] # 品质 BYTE
def GetInitTalentWeight(self): return self.attrTuple[1] # 初始天赋数权重 list
def GetInitStarUpper(self): return self.attrTuple[2] # 初始星级上限 BYTE
def GetInitAddPer(self): return self.attrTuple[3] # 卡牌初始加成万分率 DWORD
@@ -2466,7 +2482,7 @@
self.attrTuple = None
return
- def GetQuality(self): return self.attrTuple[0] # 品质 DWORD
+ def GetQuality(self): return self.attrTuple[0] # 品质 BYTE
def GetBreakLV(self): return self.attrTuple[1] # 突破等级 DWORD
def GetUPLVNeed(self): return self.attrTuple[2] # 突破到下级需要等级 WORD
def GetUPCostItemList(self): return self.attrTuple[3] # 突破到下级消耗道具 list
@@ -2478,7 +2494,7 @@
self.attrTuple = None
return
- def GetQuality(self): return self.attrTuple[0] # 品质 DWORD
+ def GetQuality(self): return self.attrTuple[0] # 品质 BYTE
def GetAwakeLV(self): return self.attrTuple[1] # 觉醒等级 DWORD
def GetUPCostItem(self): return self.attrTuple[2] # 觉醒到下级消耗道具 list
def GetRebirthCostMoney(self): return self.attrTuple[3] # 重生消耗货币 DWORD
@@ -2490,7 +2506,7 @@
self.attrTuple = None
return
- def GetQuality(self): return self.attrTuple[0] # 品质 DWORD
+ def GetQuality(self): return self.attrTuple[0] # 品质 BYTE
def GetHeroLV(self): return self.attrTuple[1] # 武将等级 DWORD
def GetUPCostItem(self): return self.attrTuple[2] # 升级到下级消耗道具 list
def GetAttrIDList(self): return self.attrTuple[3] # 武将属性ID列表 list
@@ -2505,6 +2521,32 @@
def GetRecommendID(self): return self.attrTuple[0] # 推荐ID DWORD
def GetHeroIDList(self): return self.attrTuple[1] # 推荐武将ID列表 list
+
+# 武将宿缘表
+class IPY_HeroFates():
+
+ def __init__(self):
+ self.attrTuple = None
+ return
+
+ def GetFatesID(self): return self.attrTuple[0] # 宿缘ID WORD
+ def GetFatesQuality(self): return self.attrTuple[1] # 宿缘品质 BYTE
+ def GetHeroIDList(self): return self.attrTuple[2] # 武将ID组合列表 list
+ def GetAwardItemList(self): return self.attrTuple[3] # 激活奖励物品列表 list
+ def GetAttrIDList(self): return self.attrTuple[4] # 属性ID列表 list
+ def GetLVAttrValueList(self): return self.attrTuple[5] # 每级属性值列表 list
+
+# 武将宿缘品质等级表
+class IPY_HeroFatesQualityLV():
+
+ def __init__(self):
+ self.attrTuple = None
+ return
+
+ def GetFatesQuality(self): return self.attrTuple[0] # 宿缘品质 BYTE
+ def GetFatesLV(self): return self.attrTuple[1] # 宿缘等级 BYTE
+ def GetNeedStarTotal(self): return self.attrTuple[2] # 升到该级所需总星数 BYTE
+ def GetNeedHeroCnt(self): return self.attrTuple[3] # 所需品质武将数 BYTE
# 属性条目表
class IPY_PlayerAttr():
@@ -5531,6 +5573,8 @@
self.__LoadFileData("HeroQualityAwake", onlyCheck)
self.__LoadFileData("HeroQualityLV", onlyCheck)
self.__LoadFileData("LineupRecommend", onlyCheck)
+ self.__LoadFileData("HeroFates", onlyCheck)
+ self.__LoadFileData("HeroFatesQualityLV", onlyCheck)
self.__LoadFileData("PlayerAttr", onlyCheck)
self.__LoadFileData("FightPowerRatio", onlyCheck)
self.__LoadFileData("MainChapter", onlyCheck)
@@ -6078,6 +6122,20 @@
self.CheckLoadData("LineupRecommend")
return self.ipyLineupRecommendCache[index]
+ def GetHeroFatesCount(self):
+ self.CheckLoadData("HeroFates")
+ return self.ipyHeroFatesLen
+ def GetHeroFatesByIndex(self, index):
+ self.CheckLoadData("HeroFates")
+ return self.ipyHeroFatesCache[index]
+
+ def GetHeroFatesQualityLVCount(self):
+ self.CheckLoadData("HeroFatesQualityLV")
+ return self.ipyHeroFatesQualityLVLen
+ def GetHeroFatesQualityLVByIndex(self, index):
+ self.CheckLoadData("HeroFatesQualityLV")
+ return self.ipyHeroFatesQualityLVCache[index]
+
def GetPlayerAttrCount(self):
self.CheckLoadData("PlayerAttr")
return self.ipyPlayerAttrLen
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
index 0fc5405..907551c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
@@ -42,6 +42,7 @@
Sync_HeroInfo(curPlayer)
Sync_PlayerHeroInfo(curPlayer)
Sync_LineupRecommendInfo(curPlayer)
+ Sync_HeroFatesInfo(curPlayer)
return
def OnPlayerFirstLogin(curPlayer):
@@ -1507,43 +1508,196 @@
Sync_LineupRecommendInfo(curPlayer, [recommendID])
return
-#def RefreshLordAttr(curPlayer):
-# ## 刷新主公属性
-# CalcHeroAddAttr(curPlayer)
-# PlayerOnline.GetOnlinePlayer(curPlayer).RefreshRoleAttr()
-# return
+def GetHeroFatesState(curPlayer, fatesID): # 宿缘ID状态: 0-未激活；1-已激活
+ info = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HeroFatesInfo % fatesID)
+ return info % 10
+def SetHeroFatesState(curPlayer, fatesID, state):
+ info = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HeroFatesInfo % fatesID)
+ info = info / 10 * 10 + min(state, 9)
+ info = PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_HeroFatesInfo % fatesID, info)
+ return info
-#def CalcHeroAddAttr(curPlayer):
-# ## 计算武将对主公增加的属性
-#
-# heroBookAttrDict = {}
-# playerID = curPlayer.GetID()
-#
-# ipyDataMgr = IpyGameDataPY.IPY_Data()
-# for index in range(ipyDataMgr.GetHeroCount()):
-# ipyData = ipyDataMgr.GetHeroByIndex(index)
-# heroID = ipyData.GetHeroID()
-# if not ipyData.GetPlayerCanUse():
-# continue
-# if not GetHeroBookInitState(curPlayer, heroID):
-# # 图鉴未激活
-# continue
-# quality = ipyData.GetQuality()
-# qualityIpyData = IpyGameDataPY.GetIpyGameData("HeroQuality", quality)
-# if not qualityIpyData:
-# continue
-# #bookInitAddPer = qualityIpyData.GetBookInitAddPer()
-# #bookStarAddPer = qualityIpyData.GetBookStarAddPer()
-# #bookBreakLVAddPer = qualityIpyData.GetBookBreakLVAddPer()
-# bookStar = GetHeroBookStarLV(curPlayer, heroID)
-# bookBreakLV = GetHeroBookBreakLV(curPlayer, heroID)
-# for attrPerID in ChConfig.BaseAttrPerIDList:
-# addPer = bookInitAddPer + bookStar * bookStarAddPer + bookBreakLV * bookBreakLVAddPer
-# heroBookAttrDict[attrPerID] = heroBookAttrDict.get(attrPerID, 0) + addPer
-#
-# GameWorld.DebugLog("武将图鉴属性: %s" % heroBookAttrDict, playerID)
-# PlayerOnline.GetOnlinePlayer(curPlayer).SetCalcAttr(ChConfig.Def_CalcAttr_HeroBook, heroBookAttrDict)
-# return
+def GetHeroFatesLV(curPlayer, fatesID): # 宿缘ID等级
+ info = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HeroFatesInfo % fatesID)
+ return info / 10
+def SetHeroFatesLV(curPlayer, fatesID, lv):
+ info = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HeroFatesInfo % fatesID)
+ info = lv * 10 + info % 10
+ info = PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_HeroFatesInfo % fatesID, info)
+ return info
+
+#// B2 41 武将宿缘 #tagCSHeroFates
+#
+#struct tagCSHeroFates
+#{
+# tagHead Head;
+# BYTE FatesID; // 宿缘ID
+# BYTE OPType; // 0-激活领奖；1-升级
+# BYTE IndexCnt;
+# WORD ItemIndexList[IndexCnt]; // 升级时消耗的材料卡在武将背包索引列表，升级时才发
+#};
+def OnHeroFates(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ fatesID = clientData.FatesID
+ opType = clientData.OPType
+ itemIndexList = clientData.ItemIndexList
+
+ if opType == 1:
+ __onHeroFatesLVUP(curPlayer, fatesID, itemIndexList)
+ else:
+ __onHeroFatesActivite(curPlayer, fatesID)
+ return
+
+def __onHeroFatesActivite(curPlayer, fatesID):
+ ## 宿缘激活
+ if GetHeroFatesState(curPlayer, fatesID):
+ GameWorld.DebugLog("宿缘组合已经激活了! fatesID=%s" % fatesID)
+ return
+ ipyData = IpyGameDataPY.GetIpyGameData("HeroFates", fatesID)
+ if not ipyData:
+ return
+ heroIDList = ipyData.GetHeroIDList()
+ for heroID in heroIDList:
+ if not GetHeroActivite(curPlayer, heroID):
+ GameWorld.DebugLog("有武将未获得过，不可激活宿缘! fatesID=%s,heroID=%s,heroIDList=%s" % (fatesID, heroID, heroIDList))
+ return
+ GameWorld.DebugLog("激活宿缘! fatesID=%s,heroIDList=%s" % (fatesID, heroIDList))
+ SetHeroFatesState(curPlayer, fatesID, 1)
+ itemList = ipyData.GetAwardItemList()
+ ItemControler.GivePlayerItemOrMail(curPlayer, itemList, event=["HeroFates", False, {}])
+ Sync_HeroFatesInfo(curPlayer, [fatesID])
+ return
+
+def __onHeroFatesLVUP(curPlayer, fatesID, useIndexList):
+ if not GetHeroFatesState(curPlayer, fatesID):
+ GameWorld.DebugLog("宿缘组合未激活! fatesID=%s" % fatesID)
+ return
+ ipyData = IpyGameDataPY.GetIpyGameData("HeroFates", fatesID)
+ if not ipyData:
+ return
+ fatesQuality = ipyData.GetFatesQuality()
+ heroIDList = ipyData.GetHeroIDList()
+ fatesNextLV = GetHeroFatesLV(curPlayer, fatesID) + 1
+ GameWorld.DebugLog("宿缘升级: fatesID=%s,fatesQuality=%s,fatesNextLV=%s,heroIDList=%s,useIndexList=%s" % (fatesID, fatesQuality, fatesNextLV, heroIDList, useIndexList))
+ qualityLVIpyData = IpyGameDataPY.GetIpyGameData("HeroFatesQualityLV", fatesQuality, fatesNextLV)
+ if not qualityLVIpyData:
+ return
+ needStarTotal = qualityLVIpyData.GetNeedStarTotal()
+ needHeroCnt = qualityLVIpyData.GetNeedHeroCnt()
+
+ costItemList = []
+ heroStarDict = {}
+ olPlayer = PlayerOnline.GetOnlinePlayer(curPlayer)
+ curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptHero)
+ for index in range(curPack.GetCount()):
+ heroItem = curPack.GetAt(index)
+ if not heroItem or heroItem.IsEmpty():
+ continue
+ heroID = heroItem.GetItemTypeID()
+
+ # 材料卡
+ if index in useIndexList:
+ if __checkHeroFatesLVUPItem(olPlayer, fatesQuality, index, heroItem, heroID):
+ costItemList.append(heroItem)
+
+ if heroID not in heroIDList:
+ continue
+ if heroID not in heroStarDict:
+ heroStarDict[heroID] = 0
+ star = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroStar)
+ if star <= heroStarDict[heroID]:
+ continue
+ heroStarDict[heroID] = star
+
+ nowStarTotal = sum(heroStarDict.values())
+ if nowStarTotal < needStarTotal:
+ GameWorld.DebugLog(" 当前总星级不足: nowStarTotal=%s < %s, heroStarDict=%s" % (nowStarTotal, needStarTotal, heroStarDict))
+ return
+ GameWorld.DebugLog(" 当前总星级: nowStarTotal=%s,needStarTotal=%s,heroStarDict=%s" % (nowStarTotal, needStarTotal, heroStarDict))
+
+ if len(costItemList) < needHeroCnt:
+ GameWorld.DebugLog(" 可用材料卡不足: %s < %s" % (len(costItemList), needHeroCnt))
+ return
+
+ GameWorld.DebugLog(" 宿缘升级! needHeroCnt=%s" % needHeroCnt)
+ for heroItem in costItemList[:needHeroCnt]:
+ ItemCommon.DelItem(curPlayer, heroItem, heroItem.GetCount(), False, "HeroFatesLVUP")
+
+ SetHeroFatesLV(curPlayer, fatesID, fatesNextLV)
+ Sync_HeroFatesInfo(curPlayer, [fatesID])
+ RefreshLordAttr(curPlayer) # 宿缘
+ return
+
+def __checkHeroFatesLVUPItem(olPlayer, fatesQuality, itemIndex, heroItem, heroID):
+ ## 检查宿缘材料卡可否使用
+ heroIpyData = IpyGameDataPY.GetIpyGameData("Hero", heroID)
+ if not heroIpyData:
+ return
+
+ quality = heroIpyData.GetQuality()
+ if quality != fatesQuality:
+ GameWorld.DebugLog(" 与宿缘品质不同的卡无法使用: itemIndex=%s,heroID=%s,quality=%s != %s" % (itemIndex, heroID, quality, fatesQuality))
+ return
+
+ #未生效、未上阵、未锁定、未进行过升级、突破、升星、觉醒
+ heroLV = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroLV)
+ breakLV = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroBreakLV)
+ starLV = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroStar)
+ awakeLV = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroAwakeLV)
+ if heroLV > 1 or breakLV or starLV or awakeLV:
+ GameWorld.DebugLog(" 升级突破升星觉醒过的武将无法使用! itemIndex=%s,heroLV=%s,breakLV=%s,starLV=%s,awakeLV=%s" % (itemIndex, heroLV, breakLV, starLV, awakeLV))
+ return
+
+ if heroItem.GetIsLocked():
+ GameWorld.DebugLog(" 锁定的武将无法使用! itemIndex=%s" % (itemIndex))
+ return
+
+ lineupCount = heroItem.GetUserAttrCount(ShareDefine.Def_IudetHeroLineup)
+ if lineupCount:
+ lineupValueList = [heroItem.GetUserAttrByIndex(ShareDefine.Def_IudetHeroLineup, lpIndex) for lpIndex in range(lineupCount)]
+ GameWorld.DebugLog(" 上阵中的武将无法使用! itemIndex=%s,lineupValueList=%s" % (itemIndex, lineupValueList))
+ return
+
+ heroID = heroItem.GetItemTypeID()
+ _, effItemIndex, _ = olPlayer.GetHeroEffectiveCard(heroID)
+ if itemIndex == effItemIndex:
+ GameWorld.DebugLog(" 生效中的卡牌无法使用! itemIndex=%s,heroID=%s,effItemIndex=%s" % (itemIndex, heroID, effItemIndex))
+ return
+
+ return True
+
+def RefreshLordAttr(curPlayer):
+ ## 刷新主公属性
+ CalcHeroAddAttr(curPlayer)
+ PlayerOnline.GetOnlinePlayer(curPlayer).RefreshRoleAttr()
+ return
+
+def CalcHeroAddAttr(curPlayer):
+ ## 计算武将对主公增加的属性
+
+ fatesAttrDict = {}
+ playerID = curPlayer.GetID()
+
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ for index in range(ipyDataMgr.GetHeroFatesCount()):
+ ipyData = ipyDataMgr.GetHeroFatesByIndex(index)
+ fatesID = ipyData.GetFatesID()
+ if not GetHeroFatesState(curPlayer, fatesID):
+ continue
+ fatesLV = GetHeroFatesLV(curPlayer, fatesID)
+ if fatesLV <= 0:
+ continue
+ attrIDList = ipyData.GetAttrIDList()
+ lvAttrValueList = ipyData.GetLVAttrValueList()
+ for i in range(min(len(attrIDList), len(lvAttrValueList))):
+ attrID = attrIDList[i]
+ attrValuePerLV = lvAttrValueList[i]
+ attrValue = attrValuePerLV * fatesLV
+ fatesAttrDict[attrID] = fatesAttrDict.get(attrID, 0) + attrValue
+
+ GameWorld.DebugLog("宿缘属性: %s" % fatesAttrDict, playerID)
+ PlayerOnline.GetOnlinePlayer(curPlayer).SetCalcAttr(ChConfig.Def_CalcAttr_HeroFates, fatesAttrDict)
+ return
def Sync_HeroInfo(curPlayer, heroIDList=None):
if heroIDList != None:
@@ -1657,3 +1811,31 @@
clientPack.Count = len(clientPack.RecommendList)
NetPackCommon.SendFakePack(curPlayer, clientPack)
return
+
+def Sync_HeroFatesInfo(curPlayer, syncIDList=None):
+
+ fatesList = []
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ for index in range(ipyDataMgr.GetHeroFatesCount()):
+ ipyData = ipyDataMgr.GetHeroFatesByIndex(index)
+ fatesID = ipyData.GetFatesID()
+ state = GetHeroFatesState(curPlayer, fatesID)
+ if syncIDList != None:
+ if fatesID not in syncIDList:
+ continue
+ elif not state:
+ continue
+ fates = ChPyNetSendPack.tagSCHeroFates()
+ fates.FatesID = fatesID
+ fates.State = state
+ fates.FatesLV = GetHeroFatesLV(curPlayer, fatesID)
+ fatesList.append(fates)
+
+ if not fatesList:
+ return
+
+ clientPack = ChPyNetSendPack.tagSCHeroFatesInfo()
+ clientPack.FatesList = fatesList
+ clientPack.Count = len(clientPack.FatesList)
+ NetPackCommon.SendFakePack(curPlayer, clientPack)
+ return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
index ab521b9..5c14dcf 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
@@ -584,7 +584,7 @@
GameWorld.DebugLog("doCalcAllAttr...", curPlayer.GetPlayerID())
CalcRoleBase(curPlayer)
ChEquip.CalcRoleEquipAttr(curPlayer)
- #PlayerHero.CalcHeroAddAttr(curPlayer)
+ PlayerHero.CalcHeroAddAttr(curPlayer)
PlayerPrestigeSys.CalcOfficialRankAttr(curPlayer)
PlayerGubao.CalcGubaoAttr(curPlayer)
PlayerHJG.CalcHJGAttr(curPlayer)
@@ -814,6 +814,7 @@
lvAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_LV)
equipAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_MainEquip)
+ fatesAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_HeroFates)
realmAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Realm)
gubaoAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Gubao)
hjgAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_HJG)
@@ -832,6 +833,7 @@
GameWorld.DebugLog(" 主公等级属性=%s" % lvAttrDict, playerID)
GameWorld.DebugLog(" 主公装备属性=%s" % equipAttrDict, playerID)
+ GameWorld.DebugLog(" 主公宿缘属性=%s" % fatesAttrDict, playerID)
GameWorld.DebugLog(" 主公官职属性=%s" % realmAttrDict, playerID)
GameWorld.DebugLog(" 主公古宝属性=%s" % gubaoAttrDict, playerID)
GameWorld.DebugLog(" 主幻境阁属性=%s" % hjgAttrDict, playerID)
@@ -876,6 +878,9 @@
if attrID in ChConfig.BaseAttrIDList:
cardPer = effCardAddPer
+ fatesValue = fatesAttrDict.get(attrID, 0)
+ fatesPer = fatesAttrDict.get(attrPerID, 0) / 10000.0 if attrPerID else 0
+
realmValue = realmAttrDict.get(attrID, 0)
realmPer = realmAttrDict.get(attrPerID, 0) / 10000.0 if attrPerID else 0
@@ -916,7 +921,7 @@
# 计算
attrParamDict = {"lvValue":lvValue, "equipValue":equipValue, "realmValue":realmValue, "realmPer":realmPer, "cardPer":cardPer,
"gubaoValue":gubaoValue, "gubaoPer":gubaoPer, "hjgValue":hjgValue, "hjgPer":hjgPer, "horseValue":horseValue, "horsePer":horsePer,
- "beautyValue":beautyValue, "beautyPer":beautyPer,
+ "beautyValue":beautyValue, "beautyPer":beautyPer, "fatesValue":fatesValue, "fatesPer":fatesPer,
"heroSelfValue":heroSelfValue, "heroSelfPer":heroSelfPer, "inheritPer":inheritPer, "heroLVValue":heroLVValue, "heroLVPer":heroLVPer,
"lineupHaloValue":lineupHaloValue, "lineupHaloPer":lineupHaloPer, "fetterValue":fetterValue, "fetterPer":fetterPer,
"starTalentValue":starTalentValue, "starTalentPer":starTalentPer, "breakLVValue":breakLVValue, "breakLVPer":breakLVPer,
--
Gitblit v1.8.0