Skip to content

Commit 3c0cf41

Browse files
authored
Merge pull request #17 from mackysoft/support-package-samples
Fixed some problems with package samples.
2 parents 31f4901 + e2a6600 commit 3c0cf41

File tree

3 files changed

+69
-94
lines changed

3 files changed

+69
-94
lines changed

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Samples~/GetStarted/GetStarted.unity

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,72 @@ Transform:
206206
m_Father: {fileID: 0}
207207
m_RootOrder: 0
208208
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
209+
--- !u!1 &774496582
210+
GameObject:
211+
m_ObjectHideFlags: 0
212+
m_CorrespondingSourceObject: {fileID: 0}
213+
m_PrefabInstance: {fileID: 0}
214+
m_PrefabAsset: {fileID: 0}
215+
serializedVersion: 6
216+
m_Component:
217+
- component: {fileID: 774496584}
218+
- component: {fileID: 774496583}
219+
m_Layer: 0
220+
m_Name: Example
221+
m_TagString: Untagged
222+
m_Icon: {fileID: 0}
223+
m_NavMeshLayer: 0
224+
m_StaticEditorFlags: 0
225+
m_IsActive: 1
226+
--- !u!114 &774496583
227+
MonoBehaviour:
228+
m_ObjectHideFlags: 0
229+
m_CorrespondingSourceObject: {fileID: 0}
230+
m_PrefabInstance: {fileID: 0}
231+
m_PrefabAsset: {fileID: 0}
232+
m_GameObject: {fileID: 774496582}
233+
m_Enabled: 1
234+
m_EditorHideFlags: 0
235+
m_Script: {fileID: 11500000, guid: 2b84d01d3056a974585aa0791b5434f7, type: 3}
236+
m_Name:
237+
m_EditorClassIdentifier:
238+
m_Command:
239+
id: 0
240+
m_Commands:
241+
- id: 1
242+
- id: 2
243+
- id: 3
244+
- id: 4
245+
references:
246+
version: 1
247+
00000000:
248+
type: {class: DebugCommand, ns: MackySoft.SerializeReferenceExtensions.Example, asm: MackySoft.SerializeReferenceExtensions.Example.GetStarted}
249+
data:
250+
m_Message: Hello world
251+
00000001:
252+
type: {class: InstantiateCommand, ns: MackySoft.SerializeReferenceExtensions.Example, asm: MackySoft.SerializeReferenceExtensions.Example.GetStarted}
253+
data:
254+
m_Prefab: {fileID: 111724559944437223, guid: 4f11d1aa1b8a3114a96570cafa19d7c6, type: 3}
255+
00000002:
256+
type: {class: AddTypeMenuCommand, ns: MackySoft.SerializeReferenceExtensions.Example, asm: MackySoft.SerializeReferenceExtensions.Example.GetStarted}
257+
00000003:
258+
type: {class: Example/NestedCommand, ns: MackySoft.SerializeReferenceExtensions.Example, asm: MackySoft.SerializeReferenceExtensions.Example.GetStarted}
259+
00000004:
260+
type: {class: StructCommand, ns: MackySoft.SerializeReferenceExtensions.Example, asm: MackySoft.SerializeReferenceExtensions.Example.GetStarted}
261+
--- !u!4 &774496584
262+
Transform:
263+
m_ObjectHideFlags: 0
264+
m_CorrespondingSourceObject: {fileID: 0}
265+
m_PrefabInstance: {fileID: 0}
266+
m_PrefabAsset: {fileID: 0}
267+
m_GameObject: {fileID: 774496582}
268+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
269+
m_LocalPosition: {x: 0, y: 0, z: 0}
270+
m_LocalScale: {x: 1, y: 1, z: 1}
271+
m_Children: []
272+
m_Father: {fileID: 0}
273+
m_RootOrder: 2
274+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
209275
--- !u!1 &975868111
210276
GameObject:
211277
m_ObjectHideFlags: 0
@@ -299,69 +365,3 @@ Transform:
299365
m_Father: {fileID: 0}
300366
m_RootOrder: 1
301367
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
302-
--- !u!1 &1098750745
303-
GameObject:
304-
m_ObjectHideFlags: 0
305-
m_CorrespondingSourceObject: {fileID: 0}
306-
m_PrefabInstance: {fileID: 0}
307-
m_PrefabAsset: {fileID: 0}
308-
serializedVersion: 6
309-
m_Component:
310-
- component: {fileID: 1098750747}
311-
- component: {fileID: 1098750746}
312-
m_Layer: 0
313-
m_Name: Example
314-
m_TagString: Untagged
315-
m_Icon: {fileID: 0}
316-
m_NavMeshLayer: 0
317-
m_StaticEditorFlags: 0
318-
m_IsActive: 1
319-
--- !u!114 &1098750746
320-
MonoBehaviour:
321-
m_ObjectHideFlags: 0
322-
m_CorrespondingSourceObject: {fileID: 0}
323-
m_PrefabInstance: {fileID: 0}
324-
m_PrefabAsset: {fileID: 0}
325-
m_GameObject: {fileID: 1098750745}
326-
m_Enabled: 1
327-
m_EditorHideFlags: 0
328-
m_Script: {fileID: 11500000, guid: 2b84d01d3056a974585aa0791b5434f7, type: 3}
329-
m_Name:
330-
m_EditorClassIdentifier:
331-
m_Command:
332-
id: 0
333-
m_Commands:
334-
- id: 1
335-
- id: 2
336-
- id: 3
337-
- id: 4
338-
references:
339-
version: 1
340-
00000000:
341-
type: {class: DebugCommand, ns: MackySoft.SerializeReferenceExtensions.Example, asm: Assembly-CSharp}
342-
data:
343-
m_Message: Hello world
344-
00000001:
345-
type: {class: InstantiateCommand, ns: MackySoft.SerializeReferenceExtensions.Example, asm: Assembly-CSharp}
346-
data:
347-
m_Prefab: {fileID: 111724559944437223, guid: 4f11d1aa1b8a3114a96570cafa19d7c6, type: 3}
348-
00000002:
349-
type: {class: Example/NestedCommand, ns: MackySoft.SerializeReferenceExtensions.Example, asm: Assembly-CSharp}
350-
00000003:
351-
type: {class: AddTypeMenuCommand, ns: MackySoft.SerializeReferenceExtensions.Example, asm: Assembly-CSharp}
352-
00000004:
353-
type: {class: StructCommand, ns: MackySoft.SerializeReferenceExtensions.Example, asm: Assembly-CSharp}
354-
--- !u!4 &1098750747
355-
Transform:
356-
m_ObjectHideFlags: 0
357-
m_CorrespondingSourceObject: {fileID: 0}
358-
m_PrefabInstance: {fileID: 0}
359-
m_PrefabAsset: {fileID: 0}
360-
m_GameObject: {fileID: 1098750745}
361-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
362-
m_LocalPosition: {x: 0, y: 0, z: 0}
363-
m_LocalScale: {x: 1, y: 1, z: 1}
364-
m_Children: []
365-
m_Father: {fileID: 0}
366-
m_RootOrder: 2
367-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Samples~/GetStarted/Scripts/Runtime/MackySoft.SerializeReferenceExtensions.Example.GetStarted.asmdef

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
"overrideReferences": false,
1111
"precompiledReferences": [],
1212
"autoReferenced": true,
13-
"defineConstraints": [],
13+
"defineConstraints": [
14+
"UNITY_2019_3_OR_NEWER"
15+
],
1416
"versionDefines": [],
1517
"noEngineReferences": false
1618
}

MackySoft.SerializeReferenceExtensions.Example.GetStarted.csproj

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -281,33 +281,6 @@
281281
<Reference Include="UnityEditor.UnityConnectModule">
282282
<HintPath>C:\Program Files\Unity\Hub\Editor\2020.3.24f1\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll</HintPath>
283283
</Reference>
284-
<Reference Include="UnityEditor.Graphs">
285-
<HintPath>C:\Program Files\Unity\Hub\Editor\2020.3.24f1\Editor\Data\Managed\UnityEditor.Graphs.dll</HintPath>
286-
</Reference>
287-
<Reference Include="UnityEditor.Android.Extensions">
288-
<HintPath>C:\Program Files\Unity\Hub\Editor\2020.3.24f1\Editor\Data\PlaybackEngines\AndroidPlayer\UnityEditor.Android.Extensions.dll</HintPath>
289-
</Reference>
290-
<Reference Include="UnityEditor.iOS.Extensions">
291-
<HintPath>C:\Program Files\Unity\Hub\Editor\2020.3.24f1\Editor\Data\PlaybackEngines\iOSSupport\UnityEditor.iOS.Extensions.dll</HintPath>
292-
</Reference>
293-
<Reference Include="UnityEditor.WindowsStandalone.Extensions">
294-
<HintPath>C:\Program Files\Unity\Hub\Editor\2020.3.24f1\Editor\Data\PlaybackEngines\WindowsStandaloneSupport\UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
295-
</Reference>
296-
<Reference Include="SyntaxTree.VisualStudio.Unity.Bridge">
297-
<HintPath>C:\Program Files (x86)\Microsoft Visual Studio Tools for Unity\16.0\Editor\SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath>
298-
</Reference>
299-
<Reference Include="Unity.Plastic.Newtonsoft.Json">
300-
<HintPath>Library\PackageCache\[email protected]\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll</HintPath>
301-
</Reference>
302-
<Reference Include="Unity.Plastic.Antlr3.Runtime">
303-
<HintPath>Library\PackageCache\[email protected]\Lib\Editor\PlasticSCM\Unity.Plastic.Antlr3.Runtime.dll</HintPath>
304-
</Reference>
305-
<Reference Include="unityplastic">
306-
<HintPath>Library\PackageCache\[email protected]\Lib\Editor\PlasticSCM\unityplastic.dll</HintPath>
307-
</Reference>
308-
<Reference Include="log4netPlastic">
309-
<HintPath>Library\PackageCache\[email protected]\Lib\Editor\PlasticSCM\log4netPlastic.dll</HintPath>
310-
</Reference>
311284
<Reference Include="Newtonsoft.Json">
312285
<HintPath>Library\PackageCache\[email protected]\Runtime\Newtonsoft.Json.dll</HintPath>
313286
</Reference>

0 commit comments

Comments
 (0)