Skip to content

Commit 6e19a8c

Browse files
tomkailtomkail
committed
Fixes for <Unity 2020
1 parent 54ef43e commit 6e19a8c

File tree

12 files changed

+321
-581
lines changed

12 files changed

+321
-581
lines changed

‎Assets/Ink/Demos/Basic Demo/Basic Demo.unity‎

Lines changed: 160 additions & 108 deletions
Large diffs are not rendered by default.

‎Assets/Ink/Demos/Basic Demo/Prefabs/Text.prefab‎

Lines changed: 73 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -3,60 +3,56 @@
33
--- !u!1 &162960
44
GameObject:
55
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
7-
m_PrefabInternal: {fileID: 100100000}
8-
serializedVersion: 4
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
910
m_Component:
10-
- 224: {fileID: 22481992}
11-
- 222: {fileID: 22265584}
12-
- 114: {fileID: 11456674}
13-
- 114: {fileID: 11422042}
14-
- 114: {fileID: 11400932}
11+
- component: {fileID: 22481992}
12+
- component: {fileID: 22265584}
13+
- component: {fileID: 11456674}
14+
- component: {fileID: 11422042}
15+
- component: {fileID: 11400932}
1516
m_Layer: 5
1617
m_Name: Text
1718
m_TagString: Untagged
1819
m_Icon: {fileID: 0}
1920
m_NavMeshLayer: 0
2021
m_StaticEditorFlags: 0
2122
m_IsActive: 1
22-
--- !u!114 &11400932
23-
MonoBehaviour:
24-
m_ObjectHideFlags: 1
25-
m_PrefabParentObject: {fileID: 0}
26-
m_PrefabInternal: {fileID: 100100000}
23+
--- !u!224 &22481992
24+
RectTransform:
25+
m_ObjectHideFlags: 0
26+
m_CorrespondingSourceObject: {fileID: 0}
27+
m_PrefabInstance: {fileID: 0}
28+
m_PrefabAsset: {fileID: 0}
2729
m_GameObject: {fileID: 162960}
28-
m_Enabled: 1
29-
m_EditorHideFlags: 0
30-
m_Script: {fileID: 1741964061, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
31-
m_Name:
32-
m_EditorClassIdentifier:
33-
m_HorizontalFit: 0
34-
m_VerticalFit: 2
35-
--- !u!114 &11422042
36-
MonoBehaviour:
37-
m_ObjectHideFlags: 1
38-
m_PrefabParentObject: {fileID: 0}
39-
m_PrefabInternal: {fileID: 100100000}
30+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
31+
m_LocalPosition: {x: 0, y: 0, z: 0}
32+
m_LocalScale: {x: 1, y: 1, z: 1}
33+
m_Children: []
34+
m_Father: {fileID: 0}
35+
m_RootOrder: 0
36+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37+
m_AnchorMin: {x: 0.5, y: 0.5}
38+
m_AnchorMax: {x: 0.5, y: 0.5}
39+
m_AnchoredPosition: {x: 0, y: 0}
40+
m_SizeDelta: {x: 160, y: 0}
41+
m_Pivot: {x: 0.5, y: 0.5}
42+
--- !u!222 &22265584
43+
CanvasRenderer:
44+
m_ObjectHideFlags: 0
45+
m_CorrespondingSourceObject: {fileID: 0}
46+
m_PrefabInstance: {fileID: 0}
47+
m_PrefabAsset: {fileID: 0}
4048
m_GameObject: {fileID: 162960}
41-
m_Enabled: 1
42-
m_EditorHideFlags: 0
43-
m_Script: {fileID: -405508275, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
44-
m_Name:
45-
m_EditorClassIdentifier:
46-
m_Padding:
47-
m_Left: 0
48-
m_Right: 0
49-
m_Top: 0
50-
m_Bottom: 0
51-
m_ChildAlignment: 0
52-
m_Spacing: 0
53-
m_ChildForceExpandWidth: 1
54-
m_ChildForceExpandHeight: 1
49+
m_CullTransparentMesh: 0
5550
--- !u!114 &11456674
5651
MonoBehaviour:
57-
m_ObjectHideFlags: 1
58-
m_PrefabParentObject: {fileID: 0}
59-
m_PrefabInternal: {fileID: 100100000}
52+
m_ObjectHideFlags: 0
53+
m_CorrespondingSourceObject: {fileID: 0}
54+
m_PrefabInstance: {fileID: 0}
55+
m_PrefabAsset: {fileID: 0}
6056
m_GameObject: {fileID: 162960}
6157
m_Enabled: 1
6258
m_EditorHideFlags: 0
@@ -69,8 +65,6 @@ MonoBehaviour:
6965
m_OnCullStateChanged:
7066
m_PersistentCalls:
7167
m_Calls: []
72-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
73-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
7468
m_FontData:
7569
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
7670
m_FontSize: 20
@@ -85,58 +79,40 @@ MonoBehaviour:
8579
m_VerticalOverflow: 0
8680
m_LineSpacing: 1
8781
m_Text:
88-
--- !u!222 &22265584
89-
CanvasRenderer:
90-
m_ObjectHideFlags: 1
91-
m_PrefabParentObject: {fileID: 0}
92-
m_PrefabInternal: {fileID: 100100000}
82+
--- !u!114 &11422042
83+
MonoBehaviour:
84+
m_ObjectHideFlags: 0
85+
m_CorrespondingSourceObject: {fileID: 0}
86+
m_PrefabInstance: {fileID: 0}
87+
m_PrefabAsset: {fileID: 0}
9388
m_GameObject: {fileID: 162960}
94-
--- !u!224 &22481992
95-
RectTransform:
96-
m_ObjectHideFlags: 1
97-
m_PrefabParentObject: {fileID: 0}
98-
m_PrefabInternal: {fileID: 100100000}
89+
m_Enabled: 1
90+
m_EditorHideFlags: 0
91+
m_Script: {fileID: -405508275, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
92+
m_Name:
93+
m_EditorClassIdentifier:
94+
m_Padding:
95+
m_Left: 0
96+
m_Right: 0
97+
m_Top: 0
98+
m_Bottom: 0
99+
m_ChildAlignment: 0
100+
m_Spacing: 0
101+
m_ChildForceExpandWidth: 1
102+
m_ChildForceExpandHeight: 1
103+
m_ChildControlWidth: 1
104+
m_ChildControlHeight: 1
105+
--- !u!114 &11400932
106+
MonoBehaviour:
107+
m_ObjectHideFlags: 0
108+
m_CorrespondingSourceObject: {fileID: 0}
109+
m_PrefabInstance: {fileID: 0}
110+
m_PrefabAsset: {fileID: 0}
99111
m_GameObject: {fileID: 162960}
100-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
101-
m_LocalPosition: {x: 0, y: 0, z: 0}
102-
m_LocalScale: {x: 1, y: 1, z: 1}
103-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
104-
m_Children: []
105-
m_Father: {fileID: 0}
106-
m_RootOrder: 0
107-
m_AnchorMin: {x: 0.5, y: 0.5}
108-
m_AnchorMax: {x: 0.5, y: 0.5}
109-
m_AnchoredPosition: {x: 0, y: 0}
110-
m_SizeDelta: {x: 160, y: 30}
111-
m_Pivot: {x: 0.5, y: 0.5}
112-
--- !u!1001 &100100000
113-
Prefab:
114-
m_ObjectHideFlags: 1
115-
serializedVersion: 2
116-
m_Modification:
117-
m_TransformParent: {fileID: 0}
118-
m_Modifications:
119-
- target: {fileID: 0}
120-
propertyPath: m_FontData.m_HorizontalOverflow
121-
value: 0
122-
objectReference: {fileID: 0}
123-
- target: {fileID: 0}
124-
propertyPath: m_FontData.m_Alignment
125-
value: 1
126-
objectReference: {fileID: 0}
127-
- target: {fileID: 0}
128-
propertyPath: m_Text
129-
value:
130-
objectReference: {fileID: 0}
131-
- target: {fileID: 0}
132-
propertyPath: m_HorizontalFit
133-
value: 2
134-
objectReference: {fileID: 0}
135-
- target: {fileID: 0}
136-
propertyPath: m_VerticalFit
137-
value: 2
138-
objectReference: {fileID: 0}
139-
m_RemovedComponents: []
140-
m_ParentPrefab: {fileID: 0}
141-
m_RootGameObject: {fileID: 162960}
142-
m_IsPrefabParent: 1
112+
m_Enabled: 1
113+
m_EditorHideFlags: 0
114+
m_Script: {fileID: 1741964061, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
115+
m_Name:
116+
m_EditorClassIdentifier:
117+
m_HorizontalFit: 0
118+
m_VerticalFit: 2

‎Logs/Packages-Update.log‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,54 @@ The following packages were added:
138138
[email protected]
139139
The following packages were removed:
140140
[email protected]
141+
142+
=== Mon Feb 22 15:42:01 2021
143+
144+
Packages were changed.
145+
Update Mode: updateDependencies
146+
147+
The following packages were added:
148+
[email protected]
149+
150+
=== Mon Feb 22 15:49:50 2021
151+
152+
Packages were changed.
153+
Update Mode: resetToDefaultDependencies
154+
155+
The following packages were added:
156+
[email protected]
157+
[email protected]
158+
[email protected]
159+
[email protected]
160+
[email protected]
161+
[email protected]
162+
[email protected]
163+
[email protected]
164+
[email protected]
165+
[email protected]
166+
[email protected]
167+
[email protected]
168+
[email protected]
169+
[email protected]
170+
[email protected]
171+
[email protected]
172+
[email protected]
173+
[email protected]
174+
[email protected]
175+
[email protected]
176+
[email protected]
177+
[email protected]
178+
[email protected]
179+
[email protected]
180+
[email protected]
181+
[email protected]
182+
[email protected]
183+
[email protected]
184+
[email protected]
185+
[email protected]
186+
[email protected]
187+
[email protected]
188+
[email protected]
189+
[email protected]
190+
[email protected]
191+
[email protected]

‎Packages/Ink/Demos/Basic Demo.unitypackage‎

354 Bytes
Binary file not shown.

‎Packages/Ink/Editor.meta‎

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

‎Packages/Ink/Editor/Core/Ink Library/InkLibrary.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ public static void LoadOrCreateInstance () {
6868
instance = ScriptableObject.CreateInstance<InkLibrary>();
6969
instance.hideFlags = HideFlags.HideAndDontSave;
7070
Rebuild();
71-
Save();
71+
instance.Save(true);
7272
}
7373
}
7474

75-
static void Save () {
75+
public void Save (bool saveAsText) {
7676
if(!created) return;
77-
InternalEditorUtility.SaveToSerializedFileAndForget((Object[]) new InkLibrary[1] {this}, absoluteSavePath, true);
77+
InternalEditorUtility.SaveToSerializedFileAndForget((Object[]) new InkLibrary[1] {instance}, absoluteSavePath, saveAsText);
7878
}
7979

8080
static void EnsureCreated () {
@@ -84,7 +84,7 @@ static void EnsureCreated () {
8484

8585
public class AssetSaver : UnityEditor.AssetModificationProcessor {
8686
static string[] OnWillSaveAssets(string[] paths) {
87-
InkLibrary.instance.Save(true);
87+
instance.Save(true);
8888
return paths;
8989
}
9090
}

‎Packages/Ink/Editor/Core/Ink Settings/InkSettings.cs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static void SaveStatic (bool saveAsText) {
3030
UnityEditorInternal.InternalEditorUtility.SaveToSerializedFileAndForget(new[] { instance }, absoluteSavePath, saveAsText);
3131
}
3232
public void Save (bool saveAsText) {
33-
InternalEditorUtility.SaveToSerializedFileAndForget((UnityEngine.Object[]) new InkSettings[1] {this}, absoluteSavePath, saveAsText);
33+
UnityEditorInternal.InternalEditorUtility.SaveToSerializedFileAndForget((UnityEngine.Object[]) new InkSettings[1] {this}, absoluteSavePath, saveAsText);
3434
}
3535

3636
private static InkSettings _instance;
@@ -51,6 +51,10 @@ public static InkSettings instance {
5151
_instance = value;
5252
}
5353
}
54+
#else
55+
public static void SaveStatic (bool saveAsText) {
56+
instance.Save(saveAsText);
57+
}
5458
#endif
5559

5660
public class AssetSaver : UnityEditor.AssetModificationProcessor {
@@ -59,12 +63,6 @@ static string[] OnWillSaveAssets(string[] paths) {
5963
return paths;
6064
}
6165
}
62-
public static void SaveStatic (bool saveAsText) {
63-
#if !UNITY_2020_1_OR_NEWER
64-
if(!created) return;
65-
#endif
66-
instance.Save(saveAsText);
67-
}
6866

6967

7068

‎Packages/Ink/Extras.meta‎

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

‎Packages/Ink/InkLibs.meta‎

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

‎Packages/manifest.json‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
{
22
"dependencies": {
3-
"com.unity.2d.sprite": "1.0.0",
4-
"com.unity.2d.tilemap": "1.0.0",
5-
"com.unity.ide.rider": "1.2.1",
6-
"com.unity.ide.visualstudio": "2.0.2",
7-
"com.unity.ide.vscode": "1.2.1",
8-
"com.unity.test-framework": "1.1.16",
9-
"com.unity.textmeshpro": "3.0.3",
10-
"com.unity.timeline": "1.2.6",
11-
"com.unity.ugui": "1.0.0",
12-
"com.unity.xr.legacyinputhelpers": "2.1.4",
3+
"com.unity.ads": "2.0.8",
4+
"com.unity.analytics": "3.2.3",
5+
"com.unity.collab-proxy": "1.2.15",
6+
"com.unity.package-manager-ui": "2.0.8",
7+
"com.unity.purchasing": "2.0.3",
8+
"com.unity.textmeshpro": "1.4.1",
139
"com.unity.modules.ai": "1.0.0",
14-
"com.unity.modules.androidjni": "1.0.0",
1510
"com.unity.modules.animation": "1.0.0",
1611
"com.unity.modules.assetbundle": "1.0.0",
1712
"com.unity.modules.audio": "1.0.0",

0 commit comments

Comments
 (0)