9624@DESKTOP-RCIPNUP MINGW64 ~/Project (master)
$ git init
Reinitialized existing Git repository in C:/Users/9624/Project/.git/
9624@DESKTOP-RCIPNUP MINGW64 ~/Project (master)
$ cd KanTuCaiChengYu
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git status
On branch master
Your branch is up to date with 'origin/master'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
modified: Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
modified: Library/ScriptAssemblies/Assembly-CSharp.dll
modified: Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
modified: Library/ScriptAssemblies/BuiltinAssemblies.stamp
modified: Library/assetDatabase3
modified: Library/metadata/00/00000000000000002000000000000000
modified: Library/metadata/00/00000000000000003000000000000000
modified: Library/metadata/00/00000000000000004000000000000000
modified: Library/metadata/00/00000000000000004100000000000000
modified: Library/metadata/00/00000000000000005000000000000000
modified: Library/metadata/00/00000000000000005100000000000000
modified: Library/metadata/00/00000000000000006000000000000000
modified: Library/metadata/00/00000000000000006100000000000000
modified: Library/metadata/00/00000000000000007000000000000000
modified: Library/metadata/00/00000000000000007100000000000000
modified: Library/metadata/00/00000000000000008000000000000000
modified: Library/metadata/00/00000000000000008100000000000000
modified: Library/metadata/00/00000000000000009000000000000000
modified: Library/metadata/00/0000000000000000a000000000000000
modified: Library/metadata/00/0000000000000000a100000000000000
modified: Library/metadata/00/0000000000000000b000000000000000
modified: Library/metadata/00/0000000000000000c000000000000000
modified: Library/shadercompiler-UnityShaderCompiler.exe0.log
Untracked files:
(use "git add <file>..." to include in what will be committed)
ProjectSettings/
Temp/
no changes added to commit (use "git add" and/or "git commit -a")
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull
remote: Enumerating objects: 148, done.
remote: Counting objects: 100% (148/148), done.
remote: Compressing objects: 100% (112/112), done.
remote: Total 115 (delta 84), reused 0 (delta 0)
Receiving objects: 100% (115/115), 252.76 KiB | 1.04 MiB/s, done.
Resolving deltas: 100% (84/84), completed with 28 local objects.
From https://gitee.com/9624/KanTuCaiChengYu
6c9ec76..9fe9f31 master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
Library/ScriptAssemblies/Assembly-CSharp.dll
Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Library/assetDatabase3
Library/metadata/00/00000000000000002000000000000000
Library/metadata/00/00000000000000003000000000000000
Library/metadata/00/00000000000000004000000000000000
Library/metadata/00/00000000000000004100000000000000
Library/metadata/00/00000000000000005100000000000000
Library/metadata/00/00000000000000006000000000000000
Library/metadata/00/00000000000000006100000000000000
Library/metadata/00/00000000000000007000000000000000
Library/metadata/00/00000000000000007100000000000000
Library/metadata/00/00000000000000008000000000000000
Library/metadata/00/00000000000000008100000000000000
Library/metadata/00/00000000000000009000000000000000
Library/metadata/00/0000000000000000a000000000000000
Library/metadata/00/0000000000000000a100000000000000
Library/metadata/00/0000000000000000b000000000000000
Library/metadata/00/0000000000000000c000000000000000
Library/shadercompiler-UnityShaderCompiler.exe0.log
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
ProjectSettings/AudioManager.asset
ProjectSettings/ClusterInputManager.asset
ProjectSettings/DynamicsManager.asset
ProjectSettings/EditorBuildSettings.asset
ProjectSettings/EditorSettings.asset
ProjectSettings/GraphicsSettings.asset
ProjectSettings/InputManager.asset
ProjectSettings/NavMeshAreas.asset
ProjectSettings/NetworkManager.asset
ProjectSettings/Physics2DSettings.asset
ProjectSettings/ProjectSettings.asset
ProjectSettings/ProjectVersion.txt
ProjectSettings/QualitySettings.asset
ProjectSettings/TagManager.asset
ProjectSettings/TimeManager.asset
ProjectSettings/UnityAdsSettings.asset
ProjectSettings/UnityConnectSettings.asset
Please move or remove them before you merge.
Aborting
Updating 6c9ec76..9fe9f31
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git fetch
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull
error: Your local changes to the following files would be overwritten by merge:
Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
Library/ScriptAssemblies/Assembly-CSharp.dll
Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Library/assetDatabase3
Library/metadata/00/00000000000000002000000000000000
Library/metadata/00/00000000000000003000000000000000
Library/metadata/00/00000000000000004000000000000000
Library/metadata/00/00000000000000004100000000000000
Library/metadata/00/00000000000000005100000000000000
Library/metadata/00/00000000000000006000000000000000
Library/metadata/00/00000000000000006100000000000000
Library/metadata/00/00000000000000007000000000000000
Library/metadata/00/00000000000000007100000000000000
Library/metadata/00/00000000000000008000000000000000
Library/metadata/00/00000000000000008100000000000000
Library/metadata/00/00000000000000009000000000000000
Library/metadata/00/0000000000000000a000000000000000
Library/metadata/00/0000000000000000a100000000000000
Library/metadata/00/0000000000000000b000000000000000
Library/metadata/00/0000000000000000c000000000000000
Library/shadercompiler-UnityShaderCompiler.exe0.log
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
ProjectSettings/AudioManager.asset
ProjectSettings/ClusterInputManager.asset
ProjectSettings/DynamicsManager.asset
ProjectSettings/EditorBuildSettings.asset
ProjectSettings/EditorSettings.asset
ProjectSettings/GraphicsSettings.asset
ProjectSettings/InputManager.asset
ProjectSettings/NavMeshAreas.asset
ProjectSettings/NetworkManager.asset
ProjectSettings/Physics2DSettings.asset
ProjectSettings/ProjectSettings.asset
ProjectSettings/ProjectVersion.txt
ProjectSettings/QualitySettings.asset
ProjectSettings/TagManager.asset
ProjectSettings/TimeManager.asset
ProjectSettings/UnityAdsSettings.asset
ProjectSettings/UnityConnectSettings.asset
Please move or remove them before you merge.
Aborting
Updating 6c9ec76..9fe9f31
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git fetch origin
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull --no-ff
error: Your local changes to the following files would be overwritten by merge:
Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
Library/ScriptAssemblies/Assembly-CSharp.dll
Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Library/assetDatabase3
Library/metadata/00/00000000000000002000000000000000
Library/metadata/00/00000000000000003000000000000000
Library/metadata/00/00000000000000004000000000000000
Library/metadata/00/00000000000000004100000000000000
Library/metadata/00/00000000000000005100000000000000
Library/metadata/00/00000000000000006000000000000000
Library/metadata/00/00000000000000006100000000000000
Library/metadata/00/00000000000000007000000000000000
Library/metadata/00/00000000000000007100000000000000
Library/metadata/00/00000000000000008000000000000000
Library/metadata/00/00000000000000008100000000000000
Library/metadata/00/00000000000000009000000000000000
Library/metadata/00/0000000000000000a000000000000000
Library/metadata/00/0000000000000000a100000000000000
Library/metadata/00/0000000000000000b000000000000000
Library/metadata/00/0000000000000000c000000000000000
Library/shadercompiler-UnityShaderCompiler.exe0.log
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
ProjectSettings/AudioManager.asset
ProjectSettings/ClusterInputManager.asset
ProjectSettings/DynamicsManager.asset
ProjectSettings/EditorBuildSettings.asset
ProjectSettings/EditorSettings.asset
ProjectSettings/GraphicsSettings.asset
ProjectSettings/InputManager.asset
ProjectSettings/NavMeshAreas.asset
ProjectSettings/NetworkManager.asset
ProjectSettings/Physics2DSettings.asset
ProjectSettings/ProjectSettings.asset
ProjectSettings/ProjectVersion.txt
ProjectSettings/QualitySettings.asset
ProjectSettings/TagManager.asset
ProjectSettings/TimeManager.asset
ProjectSettings/UnityAdsSettings.asset
ProjectSettings/UnityConnectSettings.asset
Please move or remove them before you merge.
Aborting
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ ^C
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull --no-ff
error: Your local changes to the following files would be overwritten by merge:
Library/CurrentLayout.dwlt
Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
Library/ScriptAssemblies/Assembly-CSharp.dll
Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Library/assetDatabase3
Library/expandedItems
Library/metadata/00/00000000000000002000000000000000
Library/metadata/00/00000000000000003000000000000000
Library/metadata/00/00000000000000004000000000000000
Library/metadata/00/00000000000000004100000000000000
Library/metadata/00/00000000000000005100000000000000
Library/metadata/00/00000000000000006000000000000000
Library/metadata/00/00000000000000006100000000000000
Library/metadata/00/00000000000000007000000000000000
Library/metadata/00/00000000000000007100000000000000
Library/metadata/00/00000000000000008000000000000000
Library/metadata/00/00000000000000008100000000000000
Library/metadata/00/00000000000000009000000000000000
Library/metadata/00/0000000000000000a000000000000000
Library/metadata/00/0000000000000000a100000000000000
Library/metadata/00/0000000000000000b000000000000000
Library/metadata/00/0000000000000000c000000000000000
Library/shadercompiler-UnityShaderCompiler.exe0.log
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
Library/ProjectSettings.asset
ProjectSettings/AudioManager.asset
ProjectSettings/ClusterInputManager.asset
ProjectSettings/DynamicsManager.asset
ProjectSettings/EditorBuildSettings.asset
ProjectSettings/EditorSettings.asset
ProjectSettings/GraphicsSettings.asset
ProjectSettings/InputManager.asset
ProjectSettings/NavMeshAreas.asset
ProjectSettings/NetworkManager.asset
ProjectSettings/Physics2DSettings.asset
ProjectSettings/ProjectSettings.asset
ProjectSettings/ProjectVersion.txt
ProjectSettings/QualitySettings.asset
ProjectSettings/TagManager.asset
ProjectSettings/TimeManager.asset
ProjectSettings/UnityAdsSettings.asset
ProjectSettings/UnityConnectSettings.asset
Please move or remove them before you merge.
Aborting
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git clean -d -f
Removing Assets/Scripts/Font/
Removing Assets/plugins/
Removing Library/ProjectSettings.asset
Removing Library/metadata/32/
Removing Library/metadata/38/
Removing Library/metadata/4a/
Removing Library/metadata/4f/
Removing Library/metadata/58/
Removing ProjectSettings/
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull origin master
From https://gitee.com/9624/KanTuCaiChengYu
* branch master -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
Library/CurrentLayout.dwlt
Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
Library/ScriptAssemblies/Assembly-CSharp.dll
Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Library/assetDatabase3
Library/expandedItems
Library/metadata/00/00000000000000002000000000000000
Library/metadata/00/00000000000000003000000000000000
Library/metadata/00/00000000000000004000000000000000
Library/metadata/00/00000000000000004100000000000000
Library/metadata/00/00000000000000005100000000000000
Library/metadata/00/00000000000000006000000000000000
Library/metadata/00/00000000000000006100000000000000
Library/metadata/00/00000000000000007000000000000000
Library/metadata/00/00000000000000007100000000000000
Library/metadata/00/00000000000000008000000000000000
Library/metadata/00/00000000000000008100000000000000
Library/metadata/00/00000000000000009000000000000000
Library/metadata/00/0000000000000000a000000000000000
Library/metadata/00/0000000000000000a100000000000000
Library/metadata/00/0000000000000000b000000000000000
Library/metadata/00/0000000000000000c000000000000000
Library/shadercompiler-UnityShaderCompiler.exe0.log
Please commit your changes or stash them before you merge.
Aborting
Updating 6c9ec76..9fe9f31
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git reset --hard
HEAD is now at 6c9ec76 first
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull
error: Your local changes to the following files would be overwritten by merge:
Library/CurrentLayout.dwlt
Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Library/shadercompiler-UnityShaderCompiler.exe0.log
Please commit your changes or stash them before you merge.
Aborting
Updating 6c9ec76..9fe9f31
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git reset --hard
HEAD is now at 6c9ec76 first
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull <br><br><br><br><br><br>
bash: syntax error near unexpected token `<'
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$ git pull origin master
From https://gitee.com/9624/KanTuCaiChengYu
* branch master -> FETCH_HEAD
Updating 6c9ec76..9fe9f31
Fast-forward
.vs/KanTuCaiChengYu/v14/.suo | Bin 0 -> 27648 bytes
Assets/Resources/chengyu/prefabs/TypeItem.prefab | Bin 0 -> 15764 bytes
.../Resources/chengyu/prefabs/TypeItem.prefab.meta | 8 +
Assets/Resources/chengyu/prefabs/answerItem.prefab | Bin 0 -> 16444 bytes
.../chengyu/prefabs/answerItem.prefab.meta | 8 +
Assets/Resources/config/typePanel.csv | Bin 0 -> 10210 bytes
Assets/Resources/config/typePanel.csv.meta | 8 +
Assets/Scene/chengyu.unity | Bin 129532 -> 141876 bytes
Assets/Scripts/chengyu/LevelPanelManager.cs | 31 +++
Assets/Scripts/chengyu/LevelPanelManager.cs.meta | 12 +
Assets/Scripts/chengyu/MainPanelManager.cs | 33 ++-
Assets/Scripts/chengyu/chengyuManager.cs | 153 +++++++++--
KanTuCaiChengYu.CSharp.Editor.csproj | 262 +++++++++++++++++++
KanTuCaiChengYu.CSharp.csproj | 269 +++++++++++++++++++
KanTuCaiChengYu.sln | 26 ++
Library/CurrentLayout.dwlt | Bin 38972 -> 39044 bytes
Library/InspectorExpandedItems.asset | Bin 4664 -> 4664 bytes
Library/ProjectSettings.asset | Bin 0 -> 37201 bytes
.../ScriptAssemblies/Assembly-CSharp-Editor.dll | Bin 310784 -> 310784 bytes
.../Assembly-CSharp-Editor.dll.mdb | Bin 101541 -> 99976 bytes
Library/ScriptAssemblies/Assembly-CSharp.dll | Bin 387072 -> 388608 bytes
Library/ScriptAssemblies/Assembly-CSharp.dll.mdb | Bin 165498 -> 163850 bytes
Library/assetDatabase3 | Bin 1902632 -> 1903964 bytes
Library/expandedItems | Bin 4404 -> 4764 bytes
.../metadata/00/00000000000000002000000000000000 | Bin 4321 -> 4321 bytes
.../metadata/00/00000000000000003000000000000000 | Bin 4313 -> 4313 bytes
.../metadata/00/00000000000000004000000000000000 | Bin 4325 -> 4325 bytes
.../metadata/00/00000000000000004100000000000000 | Bin 4321 -> 4321 bytes
.../metadata/00/00000000000000005100000000000000 | Bin 4329 -> 4329 bytes
.../metadata/00/00000000000000006000000000000000 | Bin 4321 -> 4321 bytes
.../metadata/00/00000000000000006100000000000000 | Bin 4325 -> 4325 bytes
.../metadata/00/00000000000000007000000000000000 | Bin 4321 -> 4321 bytes
.../metadata/00/00000000000000007100000000000000 | Bin 4337 -> 4337 bytes
.../metadata/00/00000000000000008000000000000000 | Bin 4325 -> 4325 bytes
.../metadata/00/00000000000000008100000000000000 | Bin 4325 -> 4325 bytes
.../metadata/00/00000000000000009000000000000000 | Bin 4325 -> 4325 bytes
.../metadata/00/0000000000000000a000000000000000 | Bin 4325 -> 4325 bytes
.../metadata/00/0000000000000000a100000000000000 | Bin 4337 -> 4337 bytes
.../metadata/00/0000000000000000b000000000000000 | Bin 4337 -> 4337 bytes
.../metadata/00/0000000000000000c000000000000000 | Bin 4325 -> 4325 bytes
.../metadata/05/052d5486bc8058241be83db49f7d9c12 | Bin 0 -> 5233 bytes
.../05/052d5486bc8058241be83db49f7d9c12.info | Bin 0 -> 625 bytes
.../metadata/1b/1b6f172e686d5cb4bbacda32e2e50bf5 | Bin 0 -> 14536 bytes
.../1b/1b6f172e686d5cb4bbacda32e2e50bf5.info | Bin 0 -> 592 bytes
.../metadata/ad/adcc0648a89f2eb458e52ecebd06aa1a | Bin 0 -> 4276 bytes
.../ad/adcc0648a89f2eb458e52ecebd06aa1a.info | Bin 0 -> 1172 bytes
.../metadata/b0/b05fb7379fb67e940b4aee1f2c198909 | Bin 6537 -> 7317 bytes
.../metadata/e6/e63ac16e139ff474d84c31c08622d2da | Bin 0 -> 4284 bytes
.../e6/e63ac16e139ff474d84c31c08622d2da.info | Bin 0 -> 888 bytes
.../metadata/e9/e9c4b5f50114d3f46a38611952659dec | Bin 15405 -> 19153 bytes
.../shadercompiler-UnityShaderCompiler.exe0.log | 290 ---------------------
ProjectSettings/AudioManager.asset | Bin 0 -> 4140 bytes
ProjectSettings/ClusterInputManager.asset | Bin 0 -> 4104 bytes
ProjectSettings/DynamicsManager.asset | Bin 0 -> 4276 bytes
ProjectSettings/EditorBuildSettings.asset | Bin 0 -> 4104 bytes
ProjectSettings/EditorSettings.asset | Bin 0 -> 4212 bytes
ProjectSettings/GraphicsSettings.asset | Bin 0 -> 4256 bytes
ProjectSettings/InputManager.asset | Bin 0 -> 5520 bytes
ProjectSettings/NavMeshAreas.asset | Bin 0 -> 4384 bytes
ProjectSettings/NetworkManager.asset | Bin 0 -> 4112 bytes
ProjectSettings/Physics2DSettings.asset | Bin 0 -> 4308 bytes
ProjectSettings/ProjectSettings.asset | Bin 0 -> 37201 bytes
ProjectSettings/ProjectVersion.txt | 2 +
ProjectSettings/QualitySettings.asset | Bin 0 -> 5060 bytes
ProjectSettings/TagManager.asset | Bin 0 -> 4324 bytes
ProjectSettings/TimeManager.asset | Bin 0 -> 4112 bytes
ProjectSettings/UnityAdsSettings.asset | Bin 0 -> 4116 bytes
ProjectSettings/UnityConnectSettings.asset | Bin 0 -> 4116 bytes
68 files changed, 783 insertions(+), 319 deletions(-)
create mode 100644 .vs/KanTuCaiChengYu/v14/.suo
create mode 100644 Assets/Resources/chengyu/prefabs/TypeItem.prefab
create mode 100644 Assets/Resources/chengyu/prefabs/TypeItem.prefab.meta
create mode 100644 Assets/Resources/chengyu/prefabs/answerItem.prefab
create mode 100644 Assets/Resources/chengyu/prefabs/answerItem.prefab.meta
create mode 100644 Assets/Resources/config/typePanel.csv
create mode 100644 Assets/Resources/config/typePanel.csv.meta
create mode 100644 Assets/Scripts/chengyu/LevelPanelManager.cs
create mode 100644 Assets/Scripts/chengyu/LevelPanelManager.cs.meta
create mode 100644 KanTuCaiChengYu.CSharp.Editor.csproj
create mode 100644 KanTuCaiChengYu.CSharp.csproj
create mode 100644 KanTuCaiChengYu.sln
create mode 100644 Library/ProjectSettings.asset
create mode 100644 Library/metadata/05/052d5486bc8058241be83db49f7d9c12
create mode 100644 Library/metadata/05/052d5486bc8058241be83db49f7d9c12.info
create mode 100644 Library/metadata/1b/1b6f172e686d5cb4bbacda32e2e50bf5
create mode 100644 Library/metadata/1b/1b6f172e686d5cb4bbacda32e2e50bf5.info
create mode 100644 Library/metadata/ad/adcc0648a89f2eb458e52ecebd06aa1a
create mode 100644 Library/metadata/ad/adcc0648a89f2eb458e52ecebd06aa1a.info
create mode 100644 Library/metadata/e6/e63ac16e139ff474d84c31c08622d2da
create mode 100644 Library/metadata/e6/e63ac16e139ff474d84c31c08622d2da.info
create mode 100644 ProjectSettings/AudioManager.asset
create mode 100644 ProjectSettings/ClusterInputManager.asset
create mode 100644 ProjectSettings/DynamicsManager.asset
create mode 100644 ProjectSettings/EditorBuildSettings.asset
create mode 100644 ProjectSettings/EditorSettings.asset
create mode 100644 ProjectSettings/GraphicsSettings.asset
create mode 100644 ProjectSettings/InputManager.asset
create mode 100644 ProjectSettings/NavMeshAreas.asset
create mode 100644 ProjectSettings/NetworkManager.asset
create mode 100644 ProjectSettings/Physics2DSettings.asset
create mode 100644 ProjectSettings/ProjectSettings.asset
create mode 100644 ProjectSettings/ProjectVersion.txt
create mode 100644 ProjectSettings/QualitySettings.asset
create mode 100644 ProjectSettings/TagManager.asset
create mode 100644 ProjectSettings/TimeManager.asset
create mode 100644 ProjectSettings/UnityAdsSettings.asset
create mode 100644 ProjectSettings/UnityConnectSettings.asset
9624@DESKTOP-RCIPNUP MINGW64 ~/Project/KanTuCaiChengYu (master)
$