JSON serialization bug fixes

RabiMimi · Jul 22, 2022 · 36a714b · 36a714b
1 parent dfed0d2
commit 36a714b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/Actions/KanAction.cs b/Actions/KanAction.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 
 namespace RabiRiichi.Actions {
-    [RabiPrivate]
     public class KanAction : ChooseTilesAction {
         public override string name => "kan";
         public KanAction(int playerId, List<List<GameTile>> tiles, int priorityDelta = 0) : base(playerId, tiles) {

diff --git a/Actions/PlayerAction.cs b/Actions/PlayerAction.cs
@@ -24,11 +24,12 @@ public interface IPlayerAction : IRabiPlayerMessage {
     }
 
     /// <summary> 等待玩家做出选择 </summary>
+    [RabiMessage]
     [RabiPrivate]
     public abstract class PlayerAction<T> : IPlayerAction {
         [RabiPrivate] public abstract string name { get; }
 
-        [RabiPrivate] public int playerId { get; init; }
+        public int playerId { get; init; }
 
         public int priority { get; protected set; }
 

diff --git a/Actions/SinglePlayerInquiry.cs b/Actions/SinglePlayerInquiry.cs
@@ -4,8 +4,14 @@
 
 namespace RabiRiichi.Actions {
     [RabiMessage]
+    [RabiPrivate]
     public class SinglePlayerInquiry : IRabiPlayerMessage {
-        [RabiBroadcast] public readonly List<IPlayerAction> actions = new();
+        public readonly List<IPlayerAction> actions = new();
+        /// <summary>
+        /// 仅用于Json序列化，不应该被直接使用
+        /// </summary>
+        [RabiBroadcast] private List<object> acts => actions.ConvertAll(a => a as object);
+
         public int playerId { get; init; }
         /// <summary>
         /// 所有操作的最高优先级

diff --git a/Events/InitGameEvent.cs b/Events/InitGameEvent.cs
@@ -1,9 +1,11 @@
+using RabiRiichi.Communication;
 using RabiRiichi.Core;
 using RabiRiichi.Events.InGame;
 using System.Threading.Tasks;
 
 
 namespace RabiRiichi.Events {
+    [RabiIgnore]
     public class InitGameEvent : EventBase {
         public override string name => "init";
         public InitGameEvent(Game game) : base(game) { }

diff --git a/Utils/Graphs/ProducerGraph.cs b/Utils/Graphs/ProducerGraph.cs
@@ -171,11 +171,9 @@ public bool UpdatePredecessor(int index, NodeContext predecessor) {
             }
 
             public IEnumerable<NodeContext> GetPath(int timeStamp) {
-                if (IsInput || IsVisited(timeStamp)) {
+                if (IsInput || !SetVisited(timeStamp)) {
                     yield break;
                 }
-                // Reuse this timestamp, but no need to reset node
-                visitedTimeStamp = timeStamp;
                 foreach (var path in predecessors.SelectMany(x => x.GetPath(timeStamp))) {
                     yield return path;
                 }