Skip to content

Commit af79f6a

Browse files
ciro-unityciro-unity
committed
Scene work
1 parent 30a404d commit af79f6a

File tree

66 files changed

+5348
-3334
lines changed

Some content is hidden

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

66 files changed

+5348
-3334
lines changed

‎UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare_Market.prefab

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1001 &7051820383874573839
4+
PrefabInstance:
5+
m_ObjectHideFlags: 0
6+
serializedVersion: 2
7+
m_Modification:
8+
m_TransformParent: {fileID: 0}
9+
m_Modifications:
10+
- target: {fileID: 1314178189447185328, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
11+
type: 3}
12+
propertyPath: m_Lens.m_SensorSize.x
13+
value: 1.7782634
14+
objectReference: {fileID: 0}
15+
- target: {fileID: 2723178623857253410, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
16+
type: 3}
17+
propertyPath: m_RootOrder
18+
value: 0
19+
objectReference: {fileID: 0}
20+
- target: {fileID: 2723178623857253410, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
21+
type: 3}
22+
propertyPath: m_LocalPosition.x
23+
value: 60.81254
24+
objectReference: {fileID: 0}
25+
- target: {fileID: 2723178623857253410, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
26+
type: 3}
27+
propertyPath: m_LocalPosition.y
28+
value: 7.6993723
29+
objectReference: {fileID: 0}
30+
- target: {fileID: 2723178623857253410, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
31+
type: 3}
32+
propertyPath: m_LocalPosition.z
33+
value: -8.574175
34+
objectReference: {fileID: 0}
35+
- target: {fileID: 2723178623857253410, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
36+
type: 3}
37+
propertyPath: m_LocalRotation.w
38+
value: 0.8852043
39+
objectReference: {fileID: 0}
40+
- target: {fileID: 2723178623857253410, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
41+
type: 3}
42+
propertyPath: m_LocalRotation.x
43+
value: -0
44+
objectReference: {fileID: 0}
45+
- target: {fileID: 2723178623857253410, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
46+
type: 3}
47+
propertyPath: m_LocalRotation.y
48+
value: -0.46520254
49+
objectReference: {fileID: 0}
50+
- target: {fileID: 2723178623857253410, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
51+
type: 3}
52+
propertyPath: m_LocalRotation.z
53+
value: -0
54+
objectReference: {fileID: 0}
55+
- target: {fileID: 2723178623857253410, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
56+
type: 3}
57+
propertyPath: m_LocalEulerAnglesHint.x
58+
value: 0
59+
objectReference: {fileID: 0}
60+
- target: {fileID: 2723178623857253410, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
61+
type: 3}
62+
propertyPath: m_LocalEulerAnglesHint.y
63+
value: -55.447
64+
objectReference: {fileID: 0}
65+
- target: {fileID: 2723178623857253410, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
66+
type: 3}
67+
propertyPath: m_LocalEulerAnglesHint.z
68+
value: 0
69+
objectReference: {fileID: 0}
70+
- target: {fileID: 3351096123413661336, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
71+
type: 3}
72+
propertyPath: m_Name
73+
value: BardHare
74+
objectReference: {fileID: 0}
75+
- target: {fileID: 6284272932655770289, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
76+
type: 3}
77+
propertyPath: m_LocalPosition.x
78+
value: 0
79+
objectReference: {fileID: 0}
80+
- target: {fileID: 6284272932655770289, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
81+
type: 3}
82+
propertyPath: m_LocalPosition.y
83+
value: 0
84+
objectReference: {fileID: 0}
85+
- target: {fileID: 6284272932655770289, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
86+
type: 3}
87+
propertyPath: m_LocalPosition.z
88+
value: -9.999998
89+
objectReference: {fileID: 0}
90+
- target: {fileID: 6284272932655770289, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
91+
type: 3}
92+
propertyPath: m_LocalRotation.w
93+
value: 0.9989147
94+
objectReference: {fileID: 0}
95+
- target: {fileID: 6284272932655770289, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
96+
type: 3}
97+
propertyPath: m_LocalRotation.x
98+
value: -0.046576776
99+
objectReference: {fileID: 0}
100+
- target: {fileID: 6284272932655770289, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
101+
type: 3}
102+
propertyPath: m_LocalRotation.y
103+
value: -0.000000059604645
104+
objectReference: {fileID: 0}
105+
- target: {fileID: 6284272932655770289, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
106+
type: 3}
107+
propertyPath: m_LocalRotation.z
108+
value: -0.0000000037252903
109+
objectReference: {fileID: 0}
110+
m_RemovedComponents: []
111+
m_SourcePrefab: {fileID: 100100000, guid: 7f3c311f1ca46334ab26b1adfc5be02f, type: 3}

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/1314f5d342ee428cb0153aa4c49da8f7.asset.meta renamed to ‎UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare_Market.prefab.meta

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

‎UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_InnerTown.prefab

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &929921742476629979
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 8398903509786361792}
12+
m_Layer: 0
13+
m_Name: Interactables_InnerTown
14+
m_TagString: Untagged
15+
m_Icon: {fileID: 0}
16+
m_NavMeshLayer: 0
17+
m_StaticEditorFlags: 0
18+
m_IsActive: 1
19+
--- !u!4 &8398903509786361792
20+
Transform:
21+
m_ObjectHideFlags: 0
22+
m_CorrespondingSourceObject: {fileID: 0}
23+
m_PrefabInstance: {fileID: 0}
24+
m_PrefabAsset: {fileID: 0}
25+
m_GameObject: {fileID: 929921742476629979}
26+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
27+
m_LocalPosition: {x: 0, y: 0, z: 0}
28+
m_LocalScale: {x: 1, y: 1, z: 1}
29+
m_Children: []
30+
m_Father: {fileID: 0}
31+
m_RootOrder: 0
32+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

‎UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/7e5cf8be67da414789ae646b55b619eb.asset.meta renamed to ‎UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_InnerTown.prefab.meta

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

‎UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Market.prefab

Lines changed: 188 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,194 @@ Transform:
2626
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2727
m_LocalPosition: {x: 0, y: 0, z: 0}
2828
m_LocalScale: {x: 1, y: 1, z: 1}
29-
m_Children: []
29+
m_Children:
30+
- {fileID: 4812842262826427518}
31+
- {fileID: 7006125438466594598}
3032
m_Father: {fileID: 0}
3133
m_RootOrder: 0
3234
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35+
--- !u!1001 &494572738158042707
36+
PrefabInstance:
37+
m_ObjectHideFlags: 0
38+
serializedVersion: 2
39+
m_Modification:
40+
m_TransformParent: {fileID: 791697371593637568}
41+
m_Modifications:
42+
- target: {fileID: 4906590160352786989, guid: 9bfd1f09306c98f4fae1154e09bb2266,
43+
type: 3}
44+
propertyPath: m_RootOrder
45+
value: 0
46+
objectReference: {fileID: 0}
47+
- target: {fileID: 4906590160352786989, guid: 9bfd1f09306c98f4fae1154e09bb2266,
48+
type: 3}
49+
propertyPath: m_LocalPosition.x
50+
value: 60.81254
51+
objectReference: {fileID: 0}
52+
- target: {fileID: 4906590160352786989, guid: 9bfd1f09306c98f4fae1154e09bb2266,
53+
type: 3}
54+
propertyPath: m_LocalPosition.y
55+
value: 7.6993723
56+
objectReference: {fileID: 0}
57+
- target: {fileID: 4906590160352786989, guid: 9bfd1f09306c98f4fae1154e09bb2266,
58+
type: 3}
59+
propertyPath: m_LocalPosition.z
60+
value: -8.574175
61+
objectReference: {fileID: 0}
62+
- target: {fileID: 4906590160352786989, guid: 9bfd1f09306c98f4fae1154e09bb2266,
63+
type: 3}
64+
propertyPath: m_LocalRotation.w
65+
value: 0.8852043
66+
objectReference: {fileID: 0}
67+
- target: {fileID: 4906590160352786989, guid: 9bfd1f09306c98f4fae1154e09bb2266,
68+
type: 3}
69+
propertyPath: m_LocalRotation.x
70+
value: -0
71+
objectReference: {fileID: 0}
72+
- target: {fileID: 4906590160352786989, guid: 9bfd1f09306c98f4fae1154e09bb2266,
73+
type: 3}
74+
propertyPath: m_LocalRotation.y
75+
value: -0.46520254
76+
objectReference: {fileID: 0}
77+
- target: {fileID: 4906590160352786989, guid: 9bfd1f09306c98f4fae1154e09bb2266,
78+
type: 3}
79+
propertyPath: m_LocalRotation.z
80+
value: -0
81+
objectReference: {fileID: 0}
82+
- target: {fileID: 4906590160352786989, guid: 9bfd1f09306c98f4fae1154e09bb2266,
83+
type: 3}
84+
propertyPath: m_LocalEulerAnglesHint.x
85+
value: 0
86+
objectReference: {fileID: 0}
87+
- target: {fileID: 4906590160352786989, guid: 9bfd1f09306c98f4fae1154e09bb2266,
88+
type: 3}
89+
propertyPath: m_LocalEulerAnglesHint.y
90+
value: -55.447
91+
objectReference: {fileID: 0}
92+
- target: {fileID: 4906590160352786989, guid: 9bfd1f09306c98f4fae1154e09bb2266,
93+
type: 3}
94+
propertyPath: m_LocalEulerAnglesHint.z
95+
value: 0
96+
objectReference: {fileID: 0}
97+
- target: {fileID: 5718557148715245719, guid: 9bfd1f09306c98f4fae1154e09bb2266,
98+
type: 3}
99+
propertyPath: m_Name
100+
value: BardHare_Market
101+
objectReference: {fileID: 0}
102+
m_RemovedComponents: []
103+
m_SourcePrefab: {fileID: 100100000, guid: 9bfd1f09306c98f4fae1154e09bb2266, type: 3}
104+
--- !u!4 &4812842262826427518 stripped
105+
Transform:
106+
m_CorrespondingSourceObject: {fileID: 4906590160352786989, guid: 9bfd1f09306c98f4fae1154e09bb2266,
107+
type: 3}
108+
m_PrefabInstance: {fileID: 494572738158042707}
109+
m_PrefabAsset: {fileID: 0}
110+
--- !u!1001 &7706956762731390748
111+
PrefabInstance:
112+
m_ObjectHideFlags: 0
113+
serializedVersion: 2
114+
m_Modification:
115+
m_TransformParent: {fileID: 791697371593637568}
116+
m_Modifications:
117+
- target: {fileID: 37591256409795200, guid: 14637e42c9f6e5a47a90f54664572a28,
118+
type: 3}
119+
propertyPath: m_Name
120+
value: Felfel
121+
objectReference: {fileID: 0}
122+
- target: {fileID: 850720325527613498, guid: 14637e42c9f6e5a47a90f54664572a28,
123+
type: 3}
124+
propertyPath: m_RootOrder
125+
value: 1
126+
objectReference: {fileID: 0}
127+
- target: {fileID: 850720325527613498, guid: 14637e42c9f6e5a47a90f54664572a28,
128+
type: 3}
129+
propertyPath: m_LocalPosition.x
130+
value: 41.61095
131+
objectReference: {fileID: 0}
132+
- target: {fileID: 850720325527613498, guid: 14637e42c9f6e5a47a90f54664572a28,
133+
type: 3}
134+
propertyPath: m_LocalPosition.y
135+
value: 8.401169
136+
objectReference: {fileID: 0}
137+
- target: {fileID: 850720325527613498, guid: 14637e42c9f6e5a47a90f54664572a28,
138+
type: 3}
139+
propertyPath: m_LocalPosition.z
140+
value: 6.9825506
141+
objectReference: {fileID: 0}
142+
- target: {fileID: 850720325527613498, guid: 14637e42c9f6e5a47a90f54664572a28,
143+
type: 3}
144+
propertyPath: m_LocalRotation.w
145+
value: -0.17048338
146+
objectReference: {fileID: 0}
147+
- target: {fileID: 850720325527613498, guid: 14637e42c9f6e5a47a90f54664572a28,
148+
type: 3}
149+
propertyPath: m_LocalRotation.x
150+
value: -0
151+
objectReference: {fileID: 0}
152+
- target: {fileID: 850720325527613498, guid: 14637e42c9f6e5a47a90f54664572a28,
153+
type: 3}
154+
propertyPath: m_LocalRotation.y
155+
value: -0.98536056
156+
objectReference: {fileID: 0}
157+
- target: {fileID: 850720325527613498, guid: 14637e42c9f6e5a47a90f54664572a28,
158+
type: 3}
159+
propertyPath: m_LocalRotation.z
160+
value: -0
161+
objectReference: {fileID: 0}
162+
- target: {fileID: 850720325527613498, guid: 14637e42c9f6e5a47a90f54664572a28,
163+
type: 3}
164+
propertyPath: m_LocalEulerAnglesHint.x
165+
value: 0
166+
objectReference: {fileID: 0}
167+
- target: {fileID: 850720325527613498, guid: 14637e42c9f6e5a47a90f54664572a28,
168+
type: 3}
169+
propertyPath: m_LocalEulerAnglesHint.y
170+
value: -199.632
171+
objectReference: {fileID: 0}
172+
- target: {fileID: 850720325527613498, guid: 14637e42c9f6e5a47a90f54664572a28,
173+
type: 3}
174+
propertyPath: m_LocalEulerAnglesHint.z
175+
value: 0
176+
objectReference: {fileID: 0}
177+
- target: {fileID: 872615007514310307, guid: 14637e42c9f6e5a47a90f54664572a28,
178+
type: 3}
179+
propertyPath: m_LocalPosition.x
180+
value: 0.00000071525574
181+
objectReference: {fileID: 0}
182+
- target: {fileID: 872615007514310307, guid: 14637e42c9f6e5a47a90f54664572a28,
183+
type: 3}
184+
propertyPath: m_LocalPosition.z
185+
value: -10.000003
186+
objectReference: {fileID: 0}
187+
- target: {fileID: 872615007514310307, guid: 14637e42c9f6e5a47a90f54664572a28,
188+
type: 3}
189+
propertyPath: m_LocalRotation.w
190+
value: -0.9989148
191+
objectReference: {fileID: 0}
192+
- target: {fileID: 872615007514310307, guid: 14637e42c9f6e5a47a90f54664572a28,
193+
type: 3}
194+
propertyPath: m_LocalRotation.x
195+
value: 0.046576764
196+
objectReference: {fileID: 0}
197+
- target: {fileID: 872615007514310307, guid: 14637e42c9f6e5a47a90f54664572a28,
198+
type: 3}
199+
propertyPath: m_LocalRotation.y
200+
value: 0.00000008940697
201+
objectReference: {fileID: 0}
202+
- target: {fileID: 872615007514310307, guid: 14637e42c9f6e5a47a90f54664572a28,
203+
type: 3}
204+
propertyPath: m_LocalRotation.z
205+
value: 0.000000004656613
206+
objectReference: {fileID: 0}
207+
- target: {fileID: 5266669835320614818, guid: 14637e42c9f6e5a47a90f54664572a28,
208+
type: 3}
209+
propertyPath: m_Lens.m_SensorSize.x
210+
value: 1.7782634
211+
objectReference: {fileID: 0}
212+
m_RemovedComponents: []
213+
m_SourcePrefab: {fileID: 100100000, guid: 14637e42c9f6e5a47a90f54664572a28, type: 3}
214+
--- !u!4 &7006125438466594598 stripped
215+
Transform:
216+
m_CorrespondingSourceObject: {fileID: 850720325527613498, guid: 14637e42c9f6e5a47a90f54664572a28,
217+
type: 3}
218+
m_PrefabInstance: {fileID: 7706956762731390748}
219+
m_PrefabAsset: {fileID: 0}

0 commit comments

Comments
 (0)