Merge branch 'master' of https://git.bobsong.cn/Game/Fishing2

# Conflicts: # Fishing2.sln.DotSettings.user # UserSettings/EditorUserSettings.asset
2025-05-30 20:39:20 +08:00
parent d152b5d000 dea58270fa
commit fcf41c3248
60 changed files with 1147 additions and 460 deletions
--- a/Assets/Scripts/Startup/App.cs
+++ b/Assets/Scripts/Startup/App.cs
@@ -106,7 +106,7 @@ namespace NBF
        private void InitService()
        {
            AddService<InputManager>();
-            AddService<GameSettings>();
+            AddService<Settings>();
        }

        #endregion