From 6e928c09df9d294e2f90cd91189a3c9abb7b007f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 31 十月 2025 17:58:33 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（词条技能1014 ~ 1019：增加技能初始CD支持，优化技能CD；优化技能属性、buff属性计算；修复纯buff怒技没有同步技能的bug；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 2 deletions(-)
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 3c568d1..935a97b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
@@ -38,6 +38,7 @@
def OnPlayerLogin(curPlayer):
Sync_HeroInfo(curPlayer)
Sync_PlayerHeroInfo(curPlayer)
+ Sync_LineupRecommendInfo(curPlayer)
return
def OnPlayerFirstLogin(curPlayer):
@@ -1415,7 +1416,7 @@
for syncItem in syncItemDict.values():
syncItem.Sync_Item()
- lineup = PlayerOnline.GetOnlinePlayer(curPlayer).GetLineup(lineupID)
+ lineup = PlayerOnline.GetOnlinePlayer(curPlayer).GetLineup(lineupID, False)
lineup.UpdLineup(heroItemDict, shapeType)
return
@@ -1431,6 +1432,41 @@
# curPlayer.SetResetItemTick(0)
# ItemControler.ResetItem(curPlayer, ShareDefine.rptHero, 0, 0, tick)
# return
+
+def GetLineupRecommendAward(curPlayer, recommendID, index):
+ ## 领取阵容推荐奖励
+ index = GameWorld.ToIntDef(index)
+ awardState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HeroRecommend % recommendID)
+ if awardState & pow(2, index):
+ GameWorld.DebugLog("阵容推荐奖励已领取! recommendID=%s,index=%s" % (recommendID, index))
+ return
+ ipyData = IpyGameDataPY.GetIpyGameData("LineupRecommend", recommendID)
+ if not ipyData:
+ return
+ heroIDList = ipyData.GetHeroIDList()
+ if index >= len(heroIDList):
+ return
+ heroID = heroIDList[index]
+ heroIpyData = IpyGameDataPY.GetIpyGameData("Hero", heroID)
+ if not heroIpyData:
+ return
+ quality = heroIpyData.GetQuality()
+ qualityIpyData = IpyGameDataPY.GetIpyGameData("HeroQuality", quality)
+ if not qualityIpyData:
+ return
+ awardMoneyInfo = qualityIpyData.GetRecommendAwardMoney()
+ if not awardMoneyInfo or len(awardMoneyInfo) != 2:
+ return
+ moneyType, moneyValue = awardMoneyInfo
+ if GetHeroActivite(curPlayer, heroID) != 1:
+ GameWorld.DebugLog("武将未获得过，不可激活阵容推荐! heroID=%s" % (heroID))
+ return
+ awardState |= pow(2, index)
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_HeroRecommend % recommendID, awardState)
+ GameWorld.DebugLog("阵容推荐领奖! recommendID=%s,index=%s,heroID=%s,awardState=%s" % (recommendID, index, heroID, awardState))
+ PlayerControl.GiveMoney(curPlayer, moneyType, moneyValue, "LineupRecommend", notifyAward=True)
+ Sync_LineupRecommendInfo(curPlayer, [recommendID])
+ return
def RefreshLordAttr(curPlayer):
## 刷新主公属性
@@ -1522,7 +1558,7 @@
lineupList = []
olPlayer = PlayerOnline.GetOnlinePlayer(curPlayer)
for lineupID in syncIDList:
- lineup = olPlayer.GetLineup(lineupID)
+ lineup = olPlayer.GetLineup(lineupID, False)
if not lineup:
continue
@@ -1555,3 +1591,30 @@
clientPack.AwakeRebirthCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HeroAwakeRebirthCnt)
NetPackCommon.SendFakePack(curPlayer, clientPack)
return
+
+def Sync_LineupRecommendInfo(curPlayer, syncIDList=None):
+
+ recommendList = []
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ for index in range(ipyDataMgr.GetLineupRecommendCount()):
+ ipyData = ipyDataMgr.GetLineupRecommendByIndex(index)
+ recommendID = ipyData.GetRecommendID()
+ awardState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HeroRecommend % recommendID)
+ if syncIDList != None:
+ if recommendID not in syncIDList:
+ continue
+ elif not awardState:
+ continue
+ recommend = ChPyNetSendPack.tagSCLineupRecommend()
+ recommend.RecommendID = recommendID
+ recommend.AwardState = awardState
+ recommendList.append(recommend)
+
+ if not recommendList:
+ return
+
+ clientPack = ChPyNetSendPack.tagSCLineupRecommendInfo()
+ clientPack.RecommendList = recommendList
+ clientPack.Count = len(clientPack.RecommendList)
+ NetPackCommon.SendFakePack(curPlayer, clientPack)
+ return
--
Gitblit v1.8.0