Skip to content

Commit 2698dfb

Browse files
author
JunichiEnomoto
committed
update : unity 2021.3.0f1
1 parent f864352 commit 2698dfb

File tree

10 files changed

+397
-167
lines changed

10 files changed

+397
-167
lines changed

.gitignore

Lines changed: 72 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,72 @@
1-
[Ll]ibrary/
2-
[Tt]emp/
3-
[Oo]bj/
4-
[Bb]uild/
5-
[Bb]uilds/
6-
Assets/AssetStoreTools*
7-
8-
# Visual Studio cache directory
9-
.vs/
10-
11-
# Autogenerated VS/MD/Consulo solution and project files
12-
ExportedObj/
13-
.consulo/
14-
*.csproj
15-
*.unityproj
16-
*.sln
17-
*.suo
18-
*.tmp
19-
*.user
20-
*.userprefs
21-
*.pidb
22-
*.booproj
23-
*.svd
24-
*.pdb
25-
*.opendb
26-
27-
# Unity3D generated meta files
28-
*.pidb.meta
29-
*.pdb.meta
30-
31-
# Unity3D Generated File On Crash Reports
32-
sysinfo.txt
33-
34-
# Builds
35-
*.apk
36-
Logs
37-
.idea
1+
# This .gitignore file should be placed at the root of your Unity project directory
2+
#
3+
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
4+
#
5+
/[Ll]ibrary/
6+
/[Tt]emp/
7+
/[Oo]bj/
8+
/[Bb]uild/
9+
/[Bb]uilds/
10+
/[Ll]ogs/
11+
/[Uu]ser[Ss]ettings/
12+
13+
# MemoryCaptures can get excessive in size.
14+
# They also could contain extremely sensitive data
15+
/[Mm]emoryCaptures/
16+
17+
# Recordings can get excessive in size
18+
/[Rr]ecordings/
19+
20+
# Uncomment this line if you wish to ignore the asset store tools plugin
21+
# /[Aa]ssets/AssetStoreTools*
22+
23+
# Autogenerated Jetbrains Rider plugin
24+
/[Aa]ssets/Plugins/Editor/JetBrains*
25+
26+
# Visual Studio cache directory
27+
.vs/
28+
29+
# Gradle cache directory
30+
.gradle/
31+
32+
# Autogenerated VS/MD/Consulo solution and project files
33+
ExportedObj/
34+
.consulo/
35+
*.csproj
36+
*.unityproj
37+
*.sln
38+
*.suo
39+
*.tmp
40+
*.user
41+
*.userprefs
42+
*.pidb
43+
*.booproj
44+
*.svd
45+
*.pdb
46+
*.mdb
47+
*.opendb
48+
*.VC.db
49+
50+
# Unity3D generated meta files
51+
*.pidb.meta
52+
*.pdb.meta
53+
*.mdb.meta
54+
55+
# Unity3D generated file on crash reports
56+
sysinfo.txt
57+
58+
# Builds
59+
*.apk
60+
*.aab
61+
*.unitypackage
62+
*.app
63+
64+
# Crashlytics generated file
65+
crashlytics-build.properties
66+
67+
# Packed Addressables
68+
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
69+
70+
# Temporary auto-generated Android Assets
71+
/[Aa]ssets/[Ss]treamingAssets/aa.meta
72+
/[Aa]ssets/[Ss]treamingAssets/aa/*

.idea/.idea.RubyTextMeshPro/.idea/indexLayout.xml

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

.idea/.idea.RubyTextMeshPro/riderModule.iml

Lines changed: 0 additions & 12 deletions
This file was deleted.

Packages/manifest.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
4-
"com.unity.collab-proxy": "1.9.0",
4+
"com.unity.collab-proxy": "1.15.15",
55
"com.unity.ext.nunit": "1.0.6",
6-
"com.unity.ide.rider": "2.0.7",
7-
"com.unity.ide.visualstudio": "2.0.11",
8-
"com.unity.ide.vscode": "1.2.4",
9-
"com.unity.test-framework": "1.1.29",
6+
"com.unity.ide.rider": "3.0.15",
7+
"com.unity.ide.visualstudio": "2.0.14",
8+
"com.unity.ide.vscode": "1.2.5",
9+
"com.unity.test-framework": "1.1.31",
1010
"com.unity.textmeshpro": "3.0.6",
11-
"com.unity.timeline": "1.4.8",
11+
"com.unity.timeline": "1.6.4",
1212
"com.unity.ugui": "1.0.0",
1313
"com.unity.modules.ai": "1.0.0",
1414
"com.unity.modules.androidjni": "1.0.0",

Packages/packages-lock.json

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
"dependencies": {}
88
},
99
"com.unity.collab-proxy": {
10-
"version": "1.9.0",
10+
"version": "1.15.15",
1111
"depth": 0,
1212
"source": "registry",
13-
"dependencies": {},
13+
"dependencies": {
14+
"com.unity.services.core": "1.0.1"
15+
},
1416
"url": "https://packages.unity.com"
1517
},
1618
"com.unity.ext.nunit": {
@@ -21,16 +23,16 @@
2123
"url": "https://packages.unity.com"
2224
},
2325
"com.unity.ide.rider": {
24-
"version": "2.0.7",
26+
"version": "3.0.15",
2527
"depth": 0,
2628
"source": "registry",
2729
"dependencies": {
28-
"com.unity.test-framework": "1.1.1"
30+
"com.unity.ext.nunit": "1.0.6"
2931
},
3032
"url": "https://packages.unity.com"
3133
},
3234
"com.unity.ide.visualstudio": {
33-
"version": "2.0.11",
35+
"version": "2.0.14",
3436
"depth": 0,
3537
"source": "registry",
3638
"dependencies": {
@@ -39,14 +41,23 @@
3941
"url": "https://packages.unity.com"
4042
},
4143
"com.unity.ide.vscode": {
42-
"version": "1.2.4",
44+
"version": "1.2.5",
4345
"depth": 0,
4446
"source": "registry",
4547
"dependencies": {},
4648
"url": "https://packages.unity.com"
4749
},
50+
"com.unity.services.core": {
51+
"version": "1.0.1",
52+
"depth": 1,
53+
"source": "registry",
54+
"dependencies": {
55+
"com.unity.modules.unitywebrequest": "1.0.0"
56+
},
57+
"url": "https://packages.unity.com"
58+
},
4859
"com.unity.test-framework": {
49-
"version": "1.1.29",
60+
"version": "1.1.31",
5061
"depth": 0,
5162
"source": "registry",
5263
"dependencies": {
@@ -66,7 +77,7 @@
6677
"url": "https://packages.unity.com"
6778
},
6879
"com.unity.timeline": {
69-
"version": "1.4.8",
80+
"version": "1.6.4",
7081
"depth": 0,
7182
"source": "registry",
7283
"dependencies": {
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!387306366 &1
4+
MemorySettings:
5+
m_ObjectHideFlags: 0
6+
m_EditorMemorySettings:
7+
m_MainAllocatorBlockSize: -1
8+
m_ThreadAllocatorBlockSize: -1
9+
m_MainGfxBlockSize: -1
10+
m_ThreadGfxBlockSize: -1
11+
m_CacheBlockSize: -1
12+
m_TypetreeBlockSize: -1
13+
m_ProfilerBlockSize: -1
14+
m_ProfilerEditorBlockSize: -1
15+
m_BucketAllocatorGranularity: -1
16+
m_BucketAllocatorBucketsCount: -1
17+
m_BucketAllocatorBlockSize: -1
18+
m_BucketAllocatorBlockCount: -1
19+
m_ProfilerBucketAllocatorGranularity: -1
20+
m_ProfilerBucketAllocatorBucketsCount: -1
21+
m_ProfilerBucketAllocatorBlockSize: -1
22+
m_ProfilerBucketAllocatorBlockCount: -1
23+
m_TempAllocatorSizeMain: -1
24+
m_JobTempAllocatorBlockSize: -1
25+
m_BackgroundJobTempAllocatorBlockSize: -1
26+
m_JobTempAllocatorReducedBlockSize: -1
27+
m_TempAllocatorSizeGIBakingWorker: -1
28+
m_TempAllocatorSizeNavMeshWorker: -1
29+
m_TempAllocatorSizeAudioWorker: -1
30+
m_TempAllocatorSizeCloudWorker: -1
31+
m_TempAllocatorSizeGfx: -1
32+
m_TempAllocatorSizeJobWorker: -1
33+
m_TempAllocatorSizeBackgroundWorker: -1
34+
m_TempAllocatorSizePreloadManager: -1
35+
m_PlatformMemorySettings: {}

0 commit comments

Comments
 (0)