Skip to content
This repository was archived by the owner on Jul 11, 2023. It is now read-only.

Commit 41797b7

Browse files
committed
merge
2 parents bbacd7a + 644d61b commit 41797b7

32 files changed

+3092
-1345
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Assets/AssetStoreTools*
77

88
# Visual Studio cache directory
99
.vs/
10+
.vscode/
11+
.idea/
1012

1113
# Autogenerated VS/MD/Consulo solution and project files
1214
ExportedObj/

.idea/.idea.UnityGameFramework/.idea/contentModel.xml

Lines changed: 193 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.idea.UnityGameFramework/.idea/indexLayout.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.idea.UnityGameFramework/.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.idea.UnityGameFramework/.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)