Merge branch 'master' of github.com:StopWuyu/DanhengServer-Beta

This commit is contained in:
StopWuyu
2024-11-09 19:30:53 +08:00
2 changed files with 4 additions and 4 deletions

View File

@@ -201,7 +201,7 @@ public class ChallengeInstance
{
var avatar = Player.AvatarManager?.GetAvatar(lineupAvatar.BaseAvatarId);
if (avatar == null) continue;
proto.BossInfo.FirstLineup.Add((uint)avatar.GetAvatarId());
proto.BossInfo.SecondLineup.Add((uint)avatar.GetAvatarId());
var equip = Player.InventoryManager?.GetItem(0, avatar.GetCurPathInfo().EquipId,
ItemMainTypeEnum.Equipment);
if (equip != null)
@@ -448,4 +448,4 @@ public class ChallengeInstance
}
#endregion
}
}

View File

@@ -93,7 +93,7 @@ namespace EggLink.DanhengServer.Proto {
}
/// <summary>Field number for the "pool_refreshed" field.</summary>
public const int PoolRefreshedFieldNumber = 12;
public const int PoolRefreshedFieldNumber = 4;
private bool poolRefreshed_;
/// <summary>
/// 4
@@ -108,7 +108,7 @@ namespace EggLink.DanhengServer.Proto {
}
/// <summary>Field number for the "has_taken_initial_score" field.</summary>
public const int HasTakenInitialScoreFieldNumber = 4;
public const int HasTakenInitialScoreFieldNumber = 12;
private bool hasTakenInitialScore_;
/// <summary>
/// 12