Skip to content

Commit 320476c

Browse files
committed
Unityを2017.2に更新、RuntimeInitializeOnLoadMethodからDefaultExecuteOrderに変更
1 parent 945dd8a commit 320476c

File tree

7 files changed

+38
-33
lines changed

7 files changed

+38
-33
lines changed

.gitignore

+23-14
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,34 @@
1-
[Ll]ibrary/
2-
[Tt]emp/
3-
[Oo]bj/
4-
[Bb]uild/
5-
[Ll]og/
1+
/[Ll]ibrary/
2+
/[Tt]emp/
3+
/[Oo]bj/
4+
/[Bb]uild/
5+
/[Bb]uilds/
6+
/Assets/AssetStoreTools*
67

7-
UnityVS/
8-
UnityVS.meta
9-
UnityVS.Aries.sln.DotSettings
10-
11-
# Autogenerated VS/MD solution and project files
8+
# Visual Studio 2015 cache directory
9+
/.vs/
10+
11+
# Autogenerated VS/MD/Consulo solution and project files
12+
ExportedObj/
13+
.consulo/
1214
*.csproj
1315
*.unityproj
1416
*.sln
1517
*.suo
18+
*.tmp
1619
*.user
1720
*.userprefs
1821
*.pidb
1922
*.booproj
20-
21-
#Unity3D Generated File On Crash Reports
23+
*.svd
24+
*.pdb
25+
26+
# Unity3D generated meta files
27+
*.pidb.meta
28+
29+
# Unity3D Generated File On Crash Reports
2230
sysinfo.txt
2331

24-
*.log
25-
.DS_Store
32+
# Builds
33+
*.apk
34+
*.unitypackage

Assets/PhysicsLayers/Scripts/LayersManager.cs

+9-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
using System.Collections;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
32
using System.Linq;
4-
using System;
53
using UnityEngine;
64

75
namespace a3geek.PhysicsLayers
86
{
97
using Common;
10-
using Layers.Abstracts;
118
using Components;
129
using Components.InternalManagements;
13-
10+
1411
[DisallowMultipleComponent]
12+
[DefaultExecutionOrder(-3200)]
1513
[AddComponentMenu("a3geek/Physics Layers/Layers Manager")]
1614
public sealed partial class LayersManager : MonoBehaviour
1715
{
@@ -93,22 +91,16 @@ public string[] UnityLayerNames
9391

9492
private CollisionInfosSetter collisionInfosSetter = null;
9593
private IntervalExecutor compactionExecutor = null;
94+
9695

97-
98-
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
99-
private static void Initialize()
96+
private void Awake()
10097
{
101-
var ins = Instance;
102-
if(ins == null)
103-
{
104-
return;
105-
}
106-
DontDestroyOnLoad(ins.gameObject);
98+
DontDestroyOnLoad(gameObject);
10799

108-
ins.compactionExecutor = new IntervalExecutor(ins.compactionInterval);
100+
this.compactionExecutor = new IntervalExecutor(this.compactionInterval);
109101

110-
ins.AllLayerInfos.Initialize();
111-
ins.collisionInfosSetter = new CollisionInfosSetter(ins);
102+
this.AllLayerInfos.Initialize();
103+
this.collisionInfosSetter = new CollisionInfosSetter(this);
112104
}
113105

114106
private void Update()

Assets/PhysicsLayers/Version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.1
1+
3.2.0

ProjectSettings/DynamicsManager.asset

2 Bytes
Binary file not shown.
4 Bytes
Binary file not shown.

ProjectSettings/ProjectVersion.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
m_EditorVersion: 5.6.3f1
1+
m_EditorVersion: 2017.2.0f3

UnityPackageManager/manifest.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"dependencies": {
3+
}
4+
}

0 commit comments

Comments
 (0)