Skip to content

Commit a28e957

Browse files
Updated to 2019.1.0f2
1 parent 06867ce commit a28e957

File tree

8 files changed

+162
-136
lines changed

8 files changed

+162
-136
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
[Bb]uild/
55
[Bb]uilds/
66
.vscode/
7+
.idea/
8+
Assets/Plugins/Editor/JetBrains.meta
9+
Assets/Plugins/Editor.meta
10+
Assets/Plugins.meta
11+
JetBrains
12+
Logs/
713

814
# Autogenerated VS/MD solution and project files
915
ExportedObj/

Assets/_INTERNAL_/Scripts/Editor/DefaultComponents/GameObjectInspector.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected override void OnHeaderGUI()
9898
GUILayout.EndHorizontal();
9999

100100
//Prefab
101-
Object prefabParent = PrefabUtility.GetPrefabParent(Selection.activeGameObject);
101+
Object prefabParent = PrefabUtility.GetCorrespondingObjectFromSource(Selection.activeGameObject);
102102
if (null != prefabParent) {
103103
GUILayout.Space(5);
104104

@@ -109,10 +109,10 @@ protected override void OnHeaderGUI()
109109
EditorGUIUtility.PingObject(prefabParent);
110110
}
111111
if (GUILayout.Button("Revert", EditorStyles.miniButtonMid)) {
112-
PrefabUtility.RevertPrefabInstance(Selection.activeGameObject);
112+
PrefabUtility.RevertPrefabInstance(Selection.activeGameObject, InteractionMode.UserAction);
113113
}
114114
if (GUILayout.Button("Apply", EditorStyles.miniButtonRight)) {
115-
PrefabUtility.ReplacePrefab(Selection.activeGameObject, PrefabUtility.GetPrefabParent(Selection.activeGameObject), ReplacePrefabOptions.ConnectToPrefab);
115+
PrefabUtility.ApplyPrefabInstance(Selection.activeGameObject, InteractionMode.UserAction);
116116
}
117117

118118
GUILayout.EndHorizontal();

Packages/manifest.json

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,43 @@
11
{
2-
"dependencies": {
3-
}
2+
"dependencies": {
3+
"com.unity.ads": "2.0.8",
4+
"com.unity.analytics": "3.3.2",
5+
"com.unity.collab-proxy": "1.2.16",
6+
"com.unity.multiplayer-hlapi": "1.0.2",
7+
"com.unity.package-manager-ui": "2.1.2",
8+
"com.unity.purchasing": "2.0.6",
9+
"com.unity.textmeshpro": "2.0.0",
10+
"com.unity.timeline": "1.0.0",
11+
"com.unity.xr.legacyinputhelpers": "2.0.2",
12+
"com.unity.modules.ai": "1.0.0",
13+
"com.unity.modules.animation": "1.0.0",
14+
"com.unity.modules.assetbundle": "1.0.0",
15+
"com.unity.modules.audio": "1.0.0",
16+
"com.unity.modules.cloth": "1.0.0",
17+
"com.unity.modules.director": "1.0.0",
18+
"com.unity.modules.imageconversion": "1.0.0",
19+
"com.unity.modules.imgui": "1.0.0",
20+
"com.unity.modules.jsonserialize": "1.0.0",
21+
"com.unity.modules.particlesystem": "1.0.0",
22+
"com.unity.modules.physics": "1.0.0",
23+
"com.unity.modules.physics2d": "1.0.0",
24+
"com.unity.modules.screencapture": "1.0.0",
25+
"com.unity.modules.terrain": "1.0.0",
26+
"com.unity.modules.terrainphysics": "1.0.0",
27+
"com.unity.modules.tilemap": "1.0.0",
28+
"com.unity.modules.ui": "1.0.0",
29+
"com.unity.modules.uielements": "1.0.0",
30+
"com.unity.modules.umbra": "1.0.0",
31+
"com.unity.modules.unityanalytics": "1.0.0",
32+
"com.unity.modules.unitywebrequest": "1.0.0",
33+
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
34+
"com.unity.modules.unitywebrequestaudio": "1.0.0",
35+
"com.unity.modules.unitywebrequesttexture": "1.0.0",
36+
"com.unity.modules.unitywebrequestwww": "1.0.0",
37+
"com.unity.modules.vehicles": "1.0.0",
38+
"com.unity.modules.video": "1.0.0",
39+
"com.unity.modules.vr": "1.0.0",
40+
"com.unity.modules.wind": "1.0.0",
41+
"com.unity.modules.xr": "1.0.0"
42+
}
443
}

ProjectSettings/EditorSettings.asset

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,19 @@
33
--- !u!159 &1
44
EditorSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 3
6+
serializedVersion: 7
77
m_ExternalVersionControlSupport: Hidden Meta Files
88
m_SerializationMode: 2
9-
m_WebSecurityEmulationEnabled: 0
10-
m_WebSecurityEmulationHostUrl: http://www.mydomain.com/mygame.unity3d
9+
m_LineEndingsForNewScripts: 1
1110
m_DefaultBehaviorMode: 1
1211
m_SpritePackerMode: 2
1312
m_SpritePackerPaddingPower: 1
14-
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd
13+
m_EtcTextureCompressorBehavior: 0
14+
m_EtcTextureFastCompressor: 2
15+
m_EtcTextureNormalCompressor: 2
16+
m_EtcTextureBestCompressor: 5
17+
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef
1518
m_ProjectGenerationRootNamespace:
19+
m_UserGeneratedProjectSuffix:
20+
m_CollabEditorSettings:
21+
inProgressEnabled: 1

0 commit comments

Comments
 (0)