unity版本切换为2021.3.22；修复所有语法报错问题

Assets/Hotfix/Art/da_tao_sha/骨骼动画/bossani/boss_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: boss_Material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Hotfix/Art/da_tao_sha/骨骼动画/playerani/role_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: role_Material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Scripts/BFS/BFS.cs

@@ -4,10 +4,10 @@ using Cysharp.Threading.Tasks;
 using JetBrains.Annotations;
 using UnityEngine;
 
-namespace Game.Pathfinding;
-
-public class Node<T>
+namespace Game.Pathfinding
 {
+    public class Node<T>
+    {
         public int index { get; private set; }
         public T data { get; private set; }
 
@@ -16,10 +16,10 @@ public class Node<T>
             this.index = index;
             this.data = data;
         }
-}
+    }
 
-class Edge<T>
-{
+    class Edge<T>
+    {
         public Node<T> from { get; private set; }
         public Node<T> to { get; private set; }
         public bool canTranslate { get; private set; }
@@ -35,10 +35,10 @@ class Edge<T>
         {
             return node == this.from ? to : to == node ? from : throw new InvalidOperationException();
         }
-}
+    }
 
-public class WayPointGraph : Graph<WayPoint>
-{
+    public class WayPointGraph : Graph<WayPoint>
+    {
         readonly struct UniqueWayPoint : IEquatable<UniqueWayPoint>
         {
             private readonly WayPoint _wayPoint;
@@ -123,10 +123,10 @@ public class WayPointGraph : Graph<WayPoint>
                 }
             }
         }
-}
+    }
 
-public class Graph<T>
-{
+    public class Graph<T>
+    {
         private protected Node<T>[] _nodes;
         private protected List<Edge<T>> _edges;
         private protected Dictionary<Node<T>, List<Edge<T>>> _connection;
@@ -164,10 +164,10 @@ public class Graph<T>
 
             throw new ArgumentException($"GetNeighbours have error ! the id is {node.index}");
         }
-}
+    }
 
-public class BFS<T>
-{
+    public class BFS<T>
+    {
         private Graph<T> _graph;
         private List<int> _closeList = new List<int>();
         private Queue<int> _openList = new Queue<int>();
@@ -267,10 +267,10 @@ public class BFS<T>
                 }
             }
         }
-}
+    }
 
-public class Path<T>
-{
+    public class Path<T>
+    {
         private readonly List<PathNode<T>> _pathNodes = new List<PathNode<T>>();
 
         public void Reverse()
@@ -300,10 +300,10 @@ public class Path<T>
                 result.Add(pathNode.data);
             }
         }
-}
+    }
 
-public class PathNode<T>
-{
+    public class PathNode<T>
+    {
         public int index { get; private set; }
         public T data { get; private set; }
 
@@ -312,4 +312,5 @@ public class PathNode<T>
             this.index = index;
             this.data = data;
         }
+    }
 }

Assets/Scripts/BFS/BFSManager.cs

@@ -4,19 +4,19 @@ using Game.Player;
 using JetBrains.Annotations;
 using UnityEngine;
 
-namespace Game.Pathfinding;
-
-public interface IBFSManager
+namespace Game.Pathfinding
 {
+    public interface IBFSManager
+    {
         List<WayPoint> FindPath(Vector2 startPos, Vector2 endPos);
         List<WayPoint> FindPath(Vector2 endPos);
 
         Node<WayPoint> GetNode(Vector2 position);
 //    void Test(Vector2 position);
-}
+    }
 
-public class BFSManager : ManagerBase, IBFSManager
-{
+    public class BFSManager : ManagerBase, IBFSManager
+    {
         private BFS<WayPoint> bfs;
         private IPlayerManager _playerManager;
 
@@ -125,4 +125,5 @@ public class BFSManager : ManagerBase, IBFSManager
             graph.Initialize(gameGlobalConfig.nodeMaps);
             return graph;
         }
+    }
 }

Assets/Scripts/BFS/WayPoint.cs

@@ -1,13 +1,14 @@
 using UnityEngine;
 
-namespace Game.Pathfinding;
-
-public class WayPoint
+namespace Game.Pathfinding
 {
+    public class WayPoint
+    {
         public Vector3 position { get; private set; }
 
         public WayPoint(Vector3 position)
         {
             this.position = position;
         }
+    }
 }

Assets/Scripts/Boss/BossInfo.cs

@@ -8,11 +8,11 @@ using Game.Spine;
 using Sirenix.OdinInspector;
 using UnityEngine;
 
-namespace Game.Boss;
-
-[RequireComponent(typeof(SpineAnimator))]
-public class BossInfo : MonoBehaviour
+namespace Game.Boss
 {
+    [RequireComponent(typeof(SpineAnimator))]
+    public class BossInfo : MonoBehaviour
+    {
         [SerializeField] [ReadOnly] private IBoss _boss;
         [SerializeField] private float speed = 1f;
         private static readonly int _kill = Animator.StringToHash("Kill");
@@ -105,4 +105,5 @@ public class BossInfo : MonoBehaviour
                 transform.localEulerAngles = new Vector3(0, 0, 0);
             }
         }
+    }
 }

Assets/Scripts/Boss/IBoss.cs

@@ -6,10 +6,10 @@ using Game.Player;
 using Game.Room;
 using UnityEngine;
 
-namespace Game.Boss;
-
-public interface IBoss
+namespace Game.Boss
 {
+    public interface IBoss
+    {
         string name { get; }
         GameObject self { get; }
         BossData data { get; }
@@ -23,14 +23,14 @@ public interface IBoss
 //    UniTask<bool> MoveAsync(List<WayPoint> wayPoint, CancellationToken token);
         void Init();
         void Dispose();
-}
+    }
 
-public class BossData
-{
-}
+    public class BossData
+    {
+    }
 
-public class Boss : IBoss
-{
+    public class Boss : IBoss
+    {
         private string _name;
         private GameObject _self;
         private IRoom _room;
@@ -89,4 +89,5 @@ public class Boss : IBoss
         {
             this._info.Dispose();
         }
+    }
 }

Assets/Scripts/Boss/IBossManager.cs

@@ -4,18 +4,18 @@ using Cysharp.Threading.Tasks;
 using Game.Room;
 using UnityEngine;
 
-namespace Game.Boss;
-
-public interface IBossManager
+namespace Game.Boss
 {
+    public interface IBossManager
+    {
         IReadOnlyList<IBoss> bosses { get; }
 
         UniTask MoveToKillPlayerAsync(IReadOnlyList<IRoom> rooms, CancellationToken token);
         void DeleteBoss();
-}
+    }
 
-public class BossManager : ManagerBase, IBossManager
-{
+    public class BossManager : ManagerBase, IBossManager
+    {
         private List<IBoss> _bosses;
 
         public IReadOnlyList<IBoss> bosses => this._bosses;
@@ -53,4 +53,5 @@ public class BossManager : ManagerBase, IBossManager
 
             this._bosses.Clear();
         }
+    }
 }

Assets/Scripts/Event/Args/BossStartMoveEventArgs.cs

@@ -1,10 +1,10 @@
-namespace Game;
-
-/// <summary>
-/// boss开始行动了
-/// </summary>
-public class BossStartMoveEventArgs : GameEventArgs
+namespace Game
 {
+    /// <summary>
+    /// boss开始行动了
+    /// </summary>
+    public class BossStartMoveEventArgs : GameEventArgs
+    {
         public static readonly int EventId = typeof(BossStartMoveEventArgs).GetHashCode();
         public override int Id => EventId;
 
@@ -14,4 +14,5 @@ public class BossStartMoveEventArgs : GameEventArgs
         {
             this.isMoveing = isMoveing;
         }
+    }
 }

Assets/Scripts/Event/Args/InitCurrentPlayerDataEventArgs.cs

@@ -1,9 +1,9 @@
 using Game.Player;
 
-namespace Game;
-
-public class InitCurrentPlayerDataEventArgs : GameEventArgs
+namespace Game
 {
+    public class InitCurrentPlayerDataEventArgs : GameEventArgs
+    {
         public static readonly int EventId = typeof(InitCurrentPlayerDataEventArgs).GetHashCode();
         public override int Id => EventId;
 
@@ -13,4 +13,5 @@ public class InitCurrentPlayerDataEventArgs : GameEventArgs
         {
             this.player = player;
         }
+    }
 }

Assets/Scripts/Event/Args/InputNameFinishEventArgs.cs

@@ -1,7 +1,7 @@
-namespace Game;
-
-public class InputNameFinishEventArgs : GameEventArgs
+namespace Game
 {
+    public class InputNameFinishEventArgs : GameEventArgs
+    {
         public static readonly int EventId = typeof(InputNameFinishEventArgs).GetHashCode();
         public override int Id => EventId;
 
@@ -11,4 +11,5 @@ public class InputNameFinishEventArgs : GameEventArgs
         {
             this.playerName = name;
         }
+    }
 }

Assets/Scripts/Event/Args/InputObjectFinishEventArgs.cs

@@ -1,7 +1,7 @@
-namespace Game;
-
-public class InputObjectFinishEventArgs : GameEventArgs
+namespace Game
 {
+    public class InputObjectFinishEventArgs : GameEventArgs
+    {
         public static readonly int EventId = typeof(InputObjectFinishEventArgs).GetHashCode();
         public override int Id => EventId;
 
@@ -11,4 +11,5 @@ public class InputObjectFinishEventArgs : GameEventArgs
         {
             this.data = data;
         }
+    }
 }

Assets/Scripts/Event/Args/JinBeiSettlementEventArgs.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using Game.Player;
 
-namespace Game;
-
-public class JinBeiSettlementEventArgs : GameEventArgs
+namespace Game
 {
+    public class JinBeiSettlementEventArgs : GameEventArgs
+    {
         public static readonly int EventId = typeof(JinBeiSettlementEventArgs).GetHashCode();
         public override int Id => EventId;
 
@@ -16,4 +16,5 @@ public class JinBeiSettlementEventArgs : GameEventArgs
             this.players = players;
             this.jinbei = jinbei;
         }
+    }
 }

Assets/Scripts/Event/Args/PlayerJinBeiChange_ToMainUIEventArgs.cs

@@ -1,9 +1,9 @@
 using Game.Player;
 
-namespace Game;
-
-public class PlayerJinBeiChange_ToMainUIEventArgs : GameEventArgs
+namespace Game
 {
+    public class PlayerJinBeiChange_ToMainUIEventArgs : GameEventArgs
+    {
         public static readonly int EventId = typeof(PlayerJinBeiChange_ToMainUIEventArgs).GetHashCode();
         public override int Id => EventId;
 
@@ -13,4 +13,5 @@ public class PlayerJinBeiChange_ToMainUIEventArgs : GameEventArgs
         {
             this.player = player;
         }
+    }
 }

Assets/Scripts/Event/Args/PlayerJinBeiChange_ToPlayerEventArgs.cs

@@ -2,10 +2,10 @@
 using Game.Player;
 using Game.Room;
 
-namespace Game;
-
-public class PlayerJinBeiChange_ToPlayerEventArgs : GameEventArgs
+namespace Game
 {
+    public class PlayerJinBeiChange_ToPlayerEventArgs : GameEventArgs
+    {
         public static readonly int EventId = typeof(PlayerJinBeiChange_ToPlayerEventArgs).GetHashCode();
         public override int Id => EventId;
 
@@ -19,4 +19,5 @@ public class PlayerJinBeiChange_ToPlayerEventArgs : GameEventArgs
             this.jinbei = jinbei;
             this.callback = callback;
         }
+    }
 }

Assets/Scripts/Event/Args/PlayerMoveToRoomEventArgs.cs

@@ -1,10 +1,10 @@
 using Game.Player;
 using Game.Room;
 
-namespace Game;
-
-public class PlayerMoveToRoomEventArgs : GameEventArgs
+namespace Game
 {
+    public class PlayerMoveToRoomEventArgs : GameEventArgs
+    {
         public static readonly int EventId = typeof(PlayerMoveToRoomEventArgs).GetHashCode();
         public override int Id => EventId;
 
@@ -16,4 +16,5 @@ public class PlayerMoveToRoomEventArgs : GameEventArgs
             this.player = player;
             this.room = room;
         }
+    }
 }

Assets/Scripts/Event/Args/PlayerUpdateDataEventArgs.cs

@@ -1,9 +1,9 @@
 using Game.Player;
 
-namespace Game;
-
-public class PlayerUpdateDataEventArgs : GameEventArgs
+namespace Game
 {
+    public class PlayerUpdateDataEventArgs : GameEventArgs
+    {
         public static readonly int EventId = typeof(PlayerUpdateDataEventArgs).GetHashCode();
         public override int Id => EventId;
 
@@ -13,4 +13,5 @@ public class PlayerUpdateDataEventArgs : GameEventArgs
         {
             this.player = player;
         }
+    }
 }

Assets/Scripts/Event/Args/ReturnPlayerJinBeiEventArgs.cs

@@ -1,9 +1,9 @@
 using Game.Player;
 
-namespace Game;
-
-public class ReturnPlayerJinBeiEventArgs : GameEventArgs
+namespace Game
 {
+    public class ReturnPlayerJinBeiEventArgs : GameEventArgs
+    {
         public static readonly int EventId = typeof(ReturnPlayerJinBeiEventArgs).GetHashCode();
         public override int Id => EventId;
 
@@ -15,4 +15,5 @@ public class ReturnPlayerJinBeiEventArgs : GameEventArgs
             this.player = player;
             this.jinBei = jinBei;
         }
+    }
 }

Assets/Scripts/Event/Args/RoomJinBeiChangeEventArgs.cs

@@ -1,10 +1,10 @@
 using Game.Player;
 using Game.Room;
 
-namespace Game;
-
-public class RoomJinBeiChangeEventArgs : GameEventArgs
+namespace Game
 {
+    public class RoomJinBeiChangeEventArgs : GameEventArgs
+    {
         public static readonly int EventId = typeof(RoomJinBeiChangeEventArgs).GetHashCode();
         public override int Id => EventId;
 
@@ -18,4 +18,5 @@ public class RoomJinBeiChangeEventArgs : GameEventArgs
             this.player = player;
             this.jinBei = jinBei;
         }
+    }
 }

Assets/Scripts/Log/Log.cs

@@ -1,10 +1,10 @@
-namespace Game.Log;
-
-/// <summary>
-/// 便于真机上取消log
-/// </summary>
-public static class Log
+namespace Game.Log
 {
+    /// <summary>
+    /// 便于真机上取消log
+    /// </summary>
+    public static class Log
+    {
         public static void Debug(object message)
         {
             UnityEngine.Debug.Log(message);
@@ -19,4 +19,5 @@ public static class Log
         {
             UnityEngine.Debug.LogError(message);
         }
+    }
 }

Assets/Scripts/Player/Player.cs

@@ -5,10 +5,10 @@ using Game.Pathfinding;
 using Game.Room;
 using UnityEngine;
 
-namespace Game.Player;
-
-public interface IPlayer
+namespace Game.Player
 {
+    public interface IPlayer
+    {
         string playerName { get; }
         GameObject self { get; }
         PlayerData playerData { get; }
@@ -20,11 +20,11 @@ public interface IPlayer
         UniTask<bool> MoveAsync(List<WayPoint> wayPoint, CancellationToken token);
         void Init();
         void Dispose();
-}
+    }
 
-[System.Serializable]
-internal class Player : IPlayer
-{
+    [System.Serializable]
+    internal class Player : IPlayer
+    {
         private GameObject _self;
         private PlayerData _playerData;
         private IRoom _room;
@@ -121,4 +121,5 @@ internal class Player : IPlayer
             else
                 args.callback?.Invoke(false);
         }
+    }
 }

Assets/Scripts/Player/PlayerManager.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 
-namespace Game.Player;
-
-public class PlayerManager : ManagerBase, IPlayerManager
+namespace Game.Player
 {
+    public class PlayerManager : ManagerBase, IPlayerManager
+    {
         private Dictionary<string, IPlayer> _players = new Dictionary<string, IPlayer>();
         private IPlayer _currentPlayer;
 
@@ -43,10 +43,10 @@ public class PlayerManager : ManagerBase, IPlayerManager
                 player.Dispose();
             }
         }
-}
+    }
 
-public interface IPlayerManager
-{
+    public interface IPlayerManager
+    {
         IPlayer currentPlayer { get; }
 
         void SetCurrentPlayer(IPlayer player);
@@ -57,4 +57,5 @@ public interface IPlayerManager
         IPlayer GetPlayer(string playerName);
 
         void DeletePlayer(string playerName);
+    }
 }

Assets/Scripts/Procedure/Logic/EnterGameSceneProcedure.cs

@@ -2,11 +2,11 @@
 using Cysharp.Threading.Tasks;
 using Game.Room;
 
-namespace Game;
-
-[Procedure(ProcedureType.EnterGameSceneProcedure)]
-class EnterGameSceneProcedure : ProcedureBase
+namespace Game
 {
+    [Procedure(ProcedureType.EnterGameSceneProcedure)]
+    class EnterGameSceneProcedure : ProcedureBase
+    {
         public override void OnEnter()
         {
             base.OnEnter();
@@ -38,4 +38,5 @@ class EnterGameSceneProcedure : ProcedureBase
         {
             base.OnLeave();
         }
+    }
 }

Assets/Scripts/Procedure/Logic/GameSceneKillPlayerProcedure.cs

@@ -7,11 +7,11 @@ using Game.Room;
 using UnityEngine;
 using Random = UnityEngine.Random;
 
-namespace Game;
-
-[Procedure(ProcedureType.GameSceneKillPlayerProcedure)]
-class GameSceneKillPlayerProcedure : ProcedureBase
+namespace Game
 {
+    [Procedure(ProcedureType.GameSceneKillPlayerProcedure)]
+    class GameSceneKillPlayerProcedure : ProcedureBase
+    {
         private float maxTime = 10f;
         GameSceneMainUI sceneMainUI;
 
@@ -100,4 +100,5 @@ class GameSceneKillPlayerProcedure : ProcedureBase
             base.OnLeave();
             EventManager.Instance.Unsubscribe(InputObjectFinishEventArgs.EventId, this.InputObjectFinishEvent);
         }
+    }
 }

Assets/Scripts/Procedure/Logic/GameSceneSettlementProcedure.cs

@@ -1,11 +1,11 @@
 using System.Threading;
 using Cysharp.Threading.Tasks;
 
-namespace Game;
-
-[Procedure(ProcedureType.GameSceneSettlementProcedure)]
-class GameSceneSettlementProcedure : ProcedureBase
+namespace Game
 {
+    [Procedure(ProcedureType.GameSceneSettlementProcedure)]
+    class GameSceneSettlementProcedure : ProcedureBase
+    {
         public override void OnEnter()
         {
             base.OnEnter();
@@ -22,4 +22,5 @@ class GameSceneSettlementProcedure : ProcedureBase
         {
             base.OnLeave();
         }
+    }
 }

Assets/Scripts/Procedure/ProcedureAttribute.cs

@@ -1,14 +1,15 @@
 using System;
 
-namespace Game;
-
-[AttributeUsage(AttributeTargets.Class)]
-class ProcedureAttribute: Attribute
+namespace Game
 {
+    [AttributeUsage(AttributeTargets.Class)]
+    class ProcedureAttribute: Attribute
+    {
         public ProcedureType ProcedureType { get; set; }
 
         public ProcedureAttribute(ProcedureType type)
         {
             this.ProcedureType = type;
         }
+    }
 }

Assets/Scripts/RayCast/MouseInput.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
 
-namespace Game.RayCast;
-
-public class MouseInput : MonoBehaviour
+namespace Game.RayCast
 {
+    public class MouseInput : MonoBehaviour
+    {
         public RayCastType rayCastType = RayCastType._2D;
 
         MouseInputData mouseInputData = new MouseInputData();
@@ -90,18 +90,19 @@ public class MouseInput : MonoBehaviour
             // 如果所有射线检测到的UI元素都不允许交互或不阻挡射线，返回false
             return false;
         }
-}
+    }
 
-public enum RayCastType
-{
+    public enum RayCastType
+    {
         _3D,
         _2D,
-}
+    }
 
-public class MouseInputData
-{
+    public class MouseInputData
+    {
         public RayCastType rayCastType;
         public bool isPressDown;
         public Vector3 point;
         public GameObject go;
+    }
 }

Assets/Scripts/RayCast/MouseInputManager.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace Game.RayCast;
-
-public class MouseInputManager : ManagerBase, IMouseInputManager
+namespace Game.RayCast
 {
+    public class MouseInputManager : ManagerBase, IMouseInputManager
+    {
         private MouseInput _currentMouseInput;
 
         public MouseInput currentMouseInput => this._currentMouseInput;
@@ -19,10 +19,11 @@ public class MouseInputManager : ManagerBase, IMouseInputManager
             _currentMouseInput ??= Game.self.AddComponent<MouseInput>();
             this._currentMouseInput.rayCastType = rayCastType;
         }
-}
+    }
 
-public interface IMouseInputManager
-{
+    public interface IMouseInputManager
+    {
         MouseInput currentMouseInput { get; }
         void AddMouseInput(RayCastType rayCastType);
+    }
 }

Assets/Scripts/Room/IRoomManager.cs

@@ -5,10 +5,10 @@ using Cysharp.Threading.Tasks;
 using Game.Player;
 using UnityEngine;
 
-namespace Game.Room;
-
-public interface IRoomManager
+namespace Game.Room
 {
+    public interface IRoomManager
+    {
         IRoom currentRoom { get; }
         IRoom CreateRoom(RoomType roomType);
         void SetCurrentRoom(RoomType roomType);
@@ -18,10 +18,10 @@ public interface IRoomManager
         bool QuitRoom(RoomType roomType, IPlayer player);
         UniTask QuitAllRoomAsync(CancellationToken token);
         void DeleteRoom(RoomType roomType);
-}
+    }
 
-public class RoomManager : ManagerBase, IRoomManager
-{
+    public class RoomManager : ManagerBase, IRoomManager
+    {
         private IRoom birthRoom;
         private Dictionary<RoomType, IRoom> _rooms = new Dictionary<RoomType, IRoom>();
         private Dictionary<RoomType, IRoom> tmp = new Dictionary<RoomType, IRoom>();
@@ -185,10 +185,11 @@ public class RoomManager : ManagerBase, IRoomManager
             if (this._rooms.TryGetValue(roomType, out var room))
                 room.Dispose();
         }
-}
+    }
 
-public struct RandomRoomData
-{
+    public struct RandomRoomData
+    {
         public IReadOnlyList<IRoom> killRoom;
         public IReadOnlyList<IRoom> survivorRoom;
+    }
 }

Assets/Scripts/Room/Room.cs

@@ -5,10 +5,10 @@ using Cysharp.Threading.Tasks;
 using Game.Player;
 using UnityEngine;
 
-namespace Game.Room;
-
-public interface IRoom
+namespace Game.Room
 {
+    public interface IRoom
+    {
         string roomName { get; }
         RoomData roomData { get; }
         RoomInfo roomInfo { get; }
@@ -26,11 +26,11 @@ public interface IRoom
         void Dispose();
 
         bool InvestmentJinBei(IPlayer player, float jinbei);
-}
+    }
 
-[System.Serializable]
-public class Room : IRoom
-{
+    [System.Serializable]
+    public class Room : IRoom
+    {
         private GameObject self;
         private RoomInfo _roomInfo;
         private RoomData _roomData;
@@ -127,4 +127,5 @@ public class Room : IRoom
             this._roomData.AddJinBei(player, jinBei);
             return true;
         }
+    }
 }

Assets/Scripts/Spine/SpineAnimator.cs

@@ -4,10 +4,10 @@ using Spine;
 using Spine.Unity;
 using UnityEngine;
 
-namespace Game.Spine;
-
-public interface ISpineAnimator
+namespace Game.Spine
 {
+    public interface ISpineAnimator
+    {
         SkeletonAnimation skeletonAnimation { get; }
         Action<TrackEntry> complete { get; set; }
         void PlayAni(string animaName, bool isLoop);
@@ -23,10 +23,10 @@ public interface ISpineAnimator
         void PlayAniFromPoint(int index, string animaName, bool isLoop);
 
         void StopAni();
-}
+    }
 
-public class SpineAnimator : MonoBehaviour, ISpineAnimator
-{
+    public class SpineAnimator : MonoBehaviour, ISpineAnimator
+    {
         [SerializeField] private SkeletonAnimation _skeletonAnimation;
         private bool _isPlaying;
 
@@ -110,4 +110,5 @@ public class SpineAnimator : MonoBehaviour, ISpineAnimator
         {
             _skeletonAnimation.AnimationName = default;
         }
+    }
 }

Assets/Scripts/UI/AssemblyManager.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using Sirenix.Utilities;
 
-namespace Game;
-
-public static class AssemblyManager
+namespace Game
 {
+    public static class AssemblyManager
+    {
         private static List<Type> _types ;
 
         public static void Initialize()
@@ -26,4 +26,5 @@ public static class AssemblyManager
                 types.Add((type, attribute));
             }
         }
+    }
 }

Assets/Scripts/UI/Logic/GameSceneHelpUI.cs

@@ -1,10 +1,10 @@
 using UnityEngine.UI;
 
-namespace Game;
-
-[UIType(UIType.GameSceneHelpUI)]
-public class GameSceneHelpUI : UIBase
+namespace Game
 {
+    [UIType(UIType.GameSceneHelpUI)]
+    public class GameSceneHelpUI : UIBase
+    {
         private Button btn_Back;
 
         public override void Init()
@@ -25,4 +25,5 @@ public class GameSceneHelpUI : UIBase
         {
             Game.uiManager.CloseLast();
         }
+    }
 }

Assets/Scripts/UI/Logic/GameSceneResultUI.cs

@@ -3,11 +3,11 @@ using Cysharp.Threading.Tasks;
 using TMPro;
 using UnityEngine.UI;
 
-namespace Game;
-
-[UIType(UIType.GameSceneResultUI)]
-public class GameSceneResultUI : UIBase
+namespace Game
 {
+    [UIType(UIType.GameSceneResultUI)]
+    public class GameSceneResultUI : UIBase
+    {
         private Image img_Lose;
         private Image img_Success;
         private TMP_Text txt_LoseContent;
@@ -43,4 +43,5 @@ public class GameSceneResultUI : UIBase
             this.txt_SuccessContent.text = str;
             this.txt_LoseContent.text = str;
         }
+    }
 }

Assets/Scripts/UI/Logic/GlobalLogOnlyAppUI.cs

@@ -1,10 +1,10 @@
 using TMPro;
 
-namespace Game;
-
-[UIType(UIType.GlobalLogOnlyAppUI)]
-public class GlobalLogOnlyAppUI : UIBase
+namespace Game
 {
+    [UIType(UIType.GlobalLogOnlyAppUI)]
+    public class GlobalLogOnlyAppUI : UIBase
+    {
         private TMP_Text txt_Content;
 
         public override void Init()
@@ -22,4 +22,5 @@ public class GlobalLogOnlyAppUI : UIBase
         {
             this.txt_Content.text += message + "\n";
         }
+    }
 }

Assets/Scripts/UI/Logic/InputNameUI.cs

@@ -1,11 +1,11 @@
 using TMPro;
 using UnityEngine.UI;
 
-namespace Game;
-
-[UIType(UIType.InputNameUI)]
-public class InputNameUI : UIBase
+namespace Game
 {
+    [UIType(UIType.InputNameUI)]
+    public class InputNameUI : UIBase
+    {
         private TMP_InputField _inputField;
         private Button _button;
 
@@ -32,4 +32,5 @@ public class InputNameUI : UIBase
 
             EventManager.Instance.FireNow(this, new InputNameFinishEventArgs(inputFieldText));
         }
+    }
 }

Assets/Scripts/WayPointFlag.cs

@@ -1,8 +1,9 @@
 using UnityEngine;
 
-namespace Game;
-
-public class WayPointFlag: MonoBehaviour
+namespace Game
 {
+    public class WayPointFlag: MonoBehaviour
+    {
     
+    }
 }

Assets/Spine Examples/Scripts/Sample Components/Sample VertexEffects/TwoByTwoTransformEffectExample.cs

@@ -98,7 +98,7 @@ public class TwoByTwoTransformEffectExampleEditor : UnityEditor.Editor {
 		Color originalColor = UnityEditor.Handles.color;
 		UnityEditor.Handles.color = color;
 		UnityEditor.Handles.DrawLine(transform.position, transform.TransformPoint(v));
-		var fmh_101_103_638483627229624472 = Quaternion.identity; v = transform.InverseTransformPoint(UnityEditor.Handles.FreeMoveHandle(transform.TransformPoint(v), 0.3f, Vector3.zero, UnityEditor.Handles.CubeHandleCap));
+		var fmh_101_103_638483627229624472 = Quaternion.identity; v = transform.InverseTransformPoint(UnityEditor.Handles.FreeMoveHandle(transform.TransformPoint(v), Quaternion.identity, 0.3f, Vector3.zero, UnityEditor.Handles.CubeHandleCap));
 		UnityEditor.Handles.color = originalColor;
 	}
 }

Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: dragon_dragon
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: dragon_dragon2
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon3.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: dragon_dragon3
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon4.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: dragon_dragon4
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon5.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: dragon_dragon5
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon6.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: dragon_dragon6
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: eyes_Material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Equipment_Material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: FS_White_Material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Gauge_Material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: goblins_Material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: hero-pro_Material
   m_Shader: {fileID: 4800000, guid: 45495790b394f894a967dbf44489b57b, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Raggedy Spineboy_Material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: raptor_Material
   m_Shader: {fileID: 4800000, guid: 522f03282fd79be47b306e2ef4b593fd, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Doi_Material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: stretchyman-diffuse-pma_Material
   m_Shader: {fileID: 4800000, guid: 2ce511398fb980f41b7d316c51534590, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
   - _ALPHAPREMULTIPLY_ON
   - _EMISSION
@@ -28,7 +26,6 @@ Material:
     IGNOREPROJECTOR: true
     RenderType: Transparent
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: mix-and-match-pma_Material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: raptor-pma_Material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: spineboy-pro_Material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: spineboy_Material
   m_Shader: {fileID: 4800000, guid: 522f03282fd79be47b306e2ef4b593fd, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat

@@ -9,8 +9,6 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: whirlyblendmodes_Material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -20,7 +18,6 @@ Material:
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

Assets/csc.rsp

@@ -1 +0,0 @@
--nullable:enable

Assets/csc.rsp.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: d61f4871a540437ab7819672db9d1d03
-timeCreated: 1712415087

Packages/packages-lock.json

@@ -25,91 +25,91 @@
       "dependencies": {
         "com.unity.modules.ai": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.collab-proxy": {
       "version": "2.2.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.editorcoroutines": {
       "version": "1.0.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.feature.development": {
       "version": "1.0.1",
       "depth": 0,
       "source": "builtin",
       "dependencies": {
-        "com.unity.ide.visualstudio": "2.0.18",
-        "com.unity.ide.rider": "3.0.21",
+        "com.unity.ide.visualstudio": "2.0.17",
+        "com.unity.ide.rider": "3.0.18",
         "com.unity.ide.vscode": "1.2.5",
         "com.unity.editorcoroutines": "1.0.0",
         "com.unity.performance.profile-analyzer": "1.2.2",
-        "com.unity.test-framework": "1.1.33",
-        "com.unity.testtools.codecoverage": "1.2.3"
+        "com.unity.test-framework": "1.1.31",
+        "com.unity.testtools.codecoverage": "1.2.2"
       }
     },
     "com.unity.ide.rider": {
-      "version": "3.0.21",
+      "version": "3.0.18",
       "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.ext.nunit": "1.0.6"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.18",
+      "version": "2.0.17",
       "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.test-framework": "1.1.9"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
       "version": "1.2.5",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.performance.profile-analyzer": {
       "version": "1.2.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.scriptablebuildpipeline": {
       "version": "1.21.21",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.settings-manager": {
-      "version": "2.0.1",
+      "version": "1.0.3",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.33",
+      "version": "1.1.31",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -117,17 +117,17 @@
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.testtools.codecoverage": {
-      "version": "1.2.3",
+      "version": "1.2.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.test-framework": "1.0.16",
         "com.unity.settings-manager": "1.0.1"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
       "version": "3.0.6",
@@ -136,7 +136,7 @@
       "dependencies": {
         "com.unity.ugui": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
       "version": "1.7.6",
@@ -148,7 +148,7 @@
         "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.particlesystem": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ugui": {
       "version": "1.0.0",
@@ -291,6 +291,17 @@
       "version": "1.0.0",
       "depth": 0,
       "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.uielementsnative": "1.0.0"
+      }
+    },
+    "com.unity.modules.uielementsnative": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
       "dependencies": {
         "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",

ProjectSettings/PackageManagerSettings.asset

@@ -13,15 +13,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_EnablePreReleasePackages: 0
+  m_EnablePackageDependencies: 0
   m_AdvancedSettingsExpanded: 1
   m_ScopedRegistriesSettingsExpanded: 1
   m_SeeAllPackageVersions: 0
-  m_DismissPreviewPackagesInUse: 0
   oneTimeWarningShown: 0
   m_Registries:
   - m_Id: main
     m_Name: 
-    m_Url: https://packages.unity.cn
+    m_Url: https://packages.unity.com
     m_Scopes: []
     m_IsDefault: 1
     m_Capabilities: 7

ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json

@@ -1,4 +1,6 @@
 {
+    "m_Name": "Settings",
+    "m_Path": "ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json",
     "m_Dictionary": {
         "m_DictionaryValues": []
     }

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.0f1c1
-m_EditorVersionWithRevision: 2022.3.0f1c1 (aad67108fc1f)
+m_EditorVersion: 2021.3.22f1
+m_EditorVersionWithRevision: 2021.3.22f1 (b6c551784ba3)