Skip to content

Commit 56f11c1

Browse files
committed
Add Mountain rock critter variant.
1 parent a667330 commit 56f11c1

File tree

49 files changed

+311
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+311
-130
lines changed

UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Ayud.prefab

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@ PrefabInstance:
77
m_Modification:
88
m_TransformParent: {fileID: 0}
99
m_Modifications:
10+
- target: {fileID: -4665973923214971672, guid: 661c491ac76af4b429f8a8c0e6e8c762,
11+
type: 3}
12+
propertyPath: _actor
13+
value:
14+
objectReference: {fileID: 11400000, guid: 5e7bd0eed8324794fad1bc460c565ecb,
15+
type: 2}
16+
- target: {fileID: -4665973923214971672, guid: 661c491ac76af4b429f8a8c0e6e8c762,
17+
type: 3}
18+
propertyPath: _defaultDialogue
19+
value:
20+
objectReference: {fileID: 11400000, guid: 061122e686f54d445b3ace24735e8f88,
21+
type: 2}
1022
- target: {fileID: -4665973923214971672, guid: 661c491ac76af4b429f8a8c0e6e8c762,
1123
type: 3}
1224
propertyPath: _immediateInteractionEvent
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1001 &4034192216683699973
4+
PrefabInstance:
5+
m_ObjectHideFlags: 0
6+
serializedVersion: 2
7+
m_Modification:
8+
m_TransformParent: {fileID: 0}
9+
m_Modifications:
10+
- target: {fileID: 1656796937265893365, guid: 9e5a5074eb4544b4a9550d142ea3a124,
11+
type: 3}
12+
propertyPath: m_RootOrder
13+
value: 0
14+
objectReference: {fileID: 0}
15+
- target: {fileID: 1656796937265893365, guid: 9e5a5074eb4544b4a9550d142ea3a124,
16+
type: 3}
17+
propertyPath: m_LocalPosition.x
18+
value: 4.6938934
19+
objectReference: {fileID: 0}
20+
- target: {fileID: 1656796937265893365, guid: 9e5a5074eb4544b4a9550d142ea3a124,
21+
type: 3}
22+
propertyPath: m_LocalPosition.y
23+
value: 2.2647858
24+
objectReference: {fileID: 0}
25+
- target: {fileID: 1656796937265893365, guid: 9e5a5074eb4544b4a9550d142ea3a124,
26+
type: 3}
27+
propertyPath: m_LocalPosition.z
28+
value: -1.8605194
29+
objectReference: {fileID: 0}
30+
- target: {fileID: 1656796937265893365, guid: 9e5a5074eb4544b4a9550d142ea3a124,
31+
type: 3}
32+
propertyPath: m_LocalRotation.w
33+
value: 1
34+
objectReference: {fileID: 0}
35+
- target: {fileID: 1656796937265893365, guid: 9e5a5074eb4544b4a9550d142ea3a124,
36+
type: 3}
37+
propertyPath: m_LocalRotation.x
38+
value: -0
39+
objectReference: {fileID: 0}
40+
- target: {fileID: 1656796937265893365, guid: 9e5a5074eb4544b4a9550d142ea3a124,
41+
type: 3}
42+
propertyPath: m_LocalRotation.y
43+
value: -0
44+
objectReference: {fileID: 0}
45+
- target: {fileID: 1656796937265893365, guid: 9e5a5074eb4544b4a9550d142ea3a124,
46+
type: 3}
47+
propertyPath: m_LocalRotation.z
48+
value: -0
49+
objectReference: {fileID: 0}
50+
- target: {fileID: 1656796937265893365, guid: 9e5a5074eb4544b4a9550d142ea3a124,
51+
type: 3}
52+
propertyPath: m_LocalEulerAnglesHint.x
53+
value: 0
54+
objectReference: {fileID: 0}
55+
- target: {fileID: 1656796937265893365, guid: 9e5a5074eb4544b4a9550d142ea3a124,
56+
type: 3}
57+
propertyPath: m_LocalEulerAnglesHint.y
58+
value: 0
59+
objectReference: {fileID: 0}
60+
- target: {fileID: 1656796937265893365, guid: 9e5a5074eb4544b4a9550d142ea3a124,
61+
type: 3}
62+
propertyPath: m_LocalEulerAnglesHint.z
63+
value: 0
64+
objectReference: {fileID: 0}
65+
- target: {fileID: 2140881792901584207, guid: 9e5a5074eb4544b4a9550d142ea3a124,
66+
type: 3}
67+
propertyPath: m_Name
68+
value: MountainRockCritter Variant
69+
objectReference: {fileID: 0}
70+
- target: {fileID: 3664912248708928822, guid: 9e5a5074eb4544b4a9550d142ea3a124,
71+
type: 3}
72+
propertyPath: _droppableRewardSO
73+
value:
74+
objectReference: {fileID: 11400000, guid: 5bbd8876e11015c4abb5280e97c1615b,
75+
type: 2}
76+
m_RemovedComponents: []
77+
m_SourcePrefab: {fileID: 100100000, guid: 9e5a5074eb4544b4a9550d142ea3a124, type: 3}

UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/MountainRockCritter Variant.prefab.meta

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

UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Terra.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@ PrefabInstance:
111111
type: 3}
112112
propertyPath: _actor
113113
value:
114-
objectReference: {fileID: 11400000, guid: 5e7bd0eed8324794fad1bc460c565ecb,
114+
objectReference: {fileID: 11400000, guid: b8d80efffb7881e4ebeb39806d2c6d18,
115115
type: 2}
116116
- target: {fileID: 6845122660542475369, guid: 3e6369ee29ebc1444a0da9ff03d7a7dc,
117117
type: 3}
118118
propertyPath: _defaultDialogue
119119
value:
120-
objectReference: {fileID: 11400000, guid: 061122e686f54d445b3ace24735e8f88,
120+
objectReference: {fileID: 11400000, guid: 2fd04d8b4cba82e42809169526c6cee1,
121121
type: 2}
122122
- target: {fileID: 6845122660542475369, guid: 3e6369ee29ebc1444a0da9ff03d7a7dc,
123123
type: 3}

UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Mesh:
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
9-
m_Name: 02a28a9c355f4fac879be8ab591f1a6a
9+
m_Name: pb_Mesh-50002
1010
serializedVersion: 10
1111
m_SubMeshes:
1212
- serializedVersion: 2

UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/0f35a51a6d884c8ab30219b5a3b05de7.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Mesh:
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
9-
m_Name: 0f35a51a6d884c8ab30219b5a3b05de7
9+
m_Name: pb_Mesh-50074
1010
serializedVersion: 10
1111
m_SubMeshes:
1212
- serializedVersion: 2

UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/108b5a6e887748a1875141cf7eefbf8e.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Mesh:
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
9-
m_Name: 108b5a6e887748a1875141cf7eefbf8e
9+
m_Name: pb_Mesh-51572
1010
serializedVersion: 10
1111
m_SubMeshes:
1212
- serializedVersion: 2

UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/177f1a363471462daaaa7e27712e2b77.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Mesh:
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
9-
m_Name: 177f1a363471462daaaa7e27712e2b77
9+
m_Name: pb_Mesh-51122
1010
serializedVersion: 10
1111
m_SubMeshes:
1212
- serializedVersion: 2

UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/17f9a240deb94feb8a71fae200bf7ff1.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Mesh:
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
9-
m_Name: 17f9a240deb94feb8a71fae200bf7ff1
9+
m_Name: pb_Mesh-51648
1010
serializedVersion: 10
1111
m_SubMeshes:
1212
- serializedVersion: 2

UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/26347a43a1d94f6eba6efb6ca3d40208.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Mesh:
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
9-
m_Name: 26347a43a1d94f6eba6efb6ca3d40208
9+
m_Name: pb_Mesh-50436
1010
serializedVersion: 10
1111
m_SubMeshes:
1212
- serializedVersion: 2

0 commit comments

Comments
 (0)