This commit is contained in:
wuwenbo 2026-05-08 17:03:23 +08:00
parent 7693081ce1
commit 41a77ab922
2 changed files with 14 additions and 7 deletions

View File

@ -811,6 +811,7 @@ namespace RuntimeData
pA.GetCountryDiplomacyInfo(pidB,out var dipInfo);
return dipInfo.DiplomacyState == DiplomacyState.League;
}
public bool SameUnionByUnitId(uint uidA, uint uidB)
{
if (!GetPlayerDataByUnitId(uidA, out var pA)) return false;
@ -1393,7 +1394,7 @@ namespace RuntimeData
}
}
// 当场小兵死上有亡时
// 当场上有小兵死亡时
public void OnAnyUnitDie(MapData map, UnitData dieUnit)
{
var unitListCopy = new List<UnitData>(UnitMap.UnitList);

View File

@ -53,11 +53,11 @@ namespace RuntimeData
// 外交关系枚举
public enum DiplomacyState
{
NoDiplomacy,
Neutral,
League,
War,
LeagueRupture,
NoDiplomacy, // 未建交
Neutral, // 中立的
League, // 联盟
War, // 战争
LeagueRupture, // 联盟破裂
}
@ -1318,7 +1318,7 @@ namespace RuntimeData
}
// 主动攻击我的敌人信息
// 外交信息
[MemoryPackable]
public partial class DiplomacyData
{
@ -1453,6 +1453,9 @@ namespace RuntimeData
// 冷静期标记
[MemoryPackIgnore]
public int IsCalm;
// PlayerId 是我的队友 (逻辑相当于同盟)
public bool IsTeammate;
[MemoryPackConstructor]
public CountryDiplomacyInfo()
@ -1462,6 +1465,7 @@ namespace RuntimeData
IsEmbassy = false;
IsLeagueRupture = false;
IsLeagueRequest = false;
IsTeammate = false;
FeelingStrategyList = new List<FeelingStrategy>();
}
@ -1478,6 +1482,7 @@ namespace RuntimeData
IsLeagueRupture = copyData.IsLeagueRupture;
IsLeagueRequest = copyData.IsLeagueRequest;
IsCalm = copyData.IsCalm;
IsTeammate = copyData.IsTeammate;
}
public void DeepCopy(CountryDiplomacyInfo copyData)
@ -1493,6 +1498,7 @@ namespace RuntimeData
IsLeagueRupture = copyData.IsLeagueRupture;
IsLeagueRequest = copyData.IsLeagueRequest;
IsCalm = copyData.IsCalm;
IsTeammate = copyData.IsTeammate;
}
}