Skip to content

Commit 64a528c

Browse files
committed
Adds floating physics to players
1 parent 4de0ae6 commit 64a528c

21 files changed

+511
-266
lines changed

Assets/_Project/Lighting/hotnesseLight.mat renamed to Assets/_Project/Lighting/hotnessLight.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: hotnesseLight
10+
m_Name: hotnessLight
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
1212
m_ShaderKeywords: _EMISSION
1313
m_LightmapFlags: 1
File renamed without changes.

Assets/_Project/Prefabs/Monster.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Transform:
2626
m_PrefabInstance: {fileID: 0}
2727
m_PrefabAsset: {fileID: 0}
2828
m_GameObject: {fileID: 4010505626693846101}
29-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
29+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3030
m_LocalPosition: {x: 0, y: 0, z: 0}
3131
m_LocalScale: {x: 2, y: 2, z: 1}
3232
m_Children:
@@ -97,7 +97,7 @@ MonoBehaviour:
9797
m_Script: {fileID: 11500000, guid: 6a3e6b3d569894df2953e3241731591c, type: 3}
9898
m_Name:
9999
m_EditorClassIdentifier:
100-
mid: 0
100+
mid: 15
101101
--- !u!114 &8692891494969316599
102102
MonoBehaviour:
103103
m_ObjectHideFlags: 0
Lines changed: 143 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,153 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1 &1887075912
3+
--- !u!1 &349759903012646120
44
GameObject:
55
m_ObjectHideFlags: 0
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
99
serializedVersion: 6
1010
m_Component:
11-
- component: {fileID: 1887075913}
12-
- component: {fileID: 1887075916}
13-
- component: {fileID: 1887075915}
14-
- component: {fileID: 1887075914}
15-
- component: {fileID: 1887075918}
16-
- component: {fileID: 1887075917}
11+
- component: {fileID: 3607449455225600338}
12+
- component: {fileID: 5451983697317509880}
13+
- component: {fileID: 6635537576424728573}
14+
- component: {fileID: 7572661742331628315}
1715
m_Layer: 0
18-
m_Name: Sphere
16+
m_Name: Cube
1917
m_TagString: Untagged
2018
m_Icon: {fileID: 0}
2119
m_NavMeshLayer: 0
2220
m_StaticEditorFlags: 0
2321
m_IsActive: 1
24-
--- !u!4 &1887075913
22+
--- !u!4 &3607449455225600338
2523
Transform:
2624
m_ObjectHideFlags: 0
2725
m_CorrespondingSourceObject: {fileID: 0}
2826
m_PrefabInstance: {fileID: 0}
2927
m_PrefabAsset: {fileID: 0}
30-
m_GameObject: {fileID: 1887075912}
28+
m_GameObject: {fileID: 349759903012646120}
3129
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
32-
m_LocalPosition: {x: 26.37, y: 0, z: 0}
30+
m_LocalPosition: {x: 0.01, y: 0, z: 0.21}
31+
m_LocalScale: {x: 0.39, y: 0.2, z: 1}
32+
m_Children: []
33+
m_Father: {fileID: 2887565040518092645}
34+
m_RootOrder: 1
35+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36+
--- !u!33 &5451983697317509880
37+
MeshFilter:
38+
m_ObjectHideFlags: 0
39+
m_CorrespondingSourceObject: {fileID: 0}
40+
m_PrefabInstance: {fileID: 0}
41+
m_PrefabAsset: {fileID: 0}
42+
m_GameObject: {fileID: 349759903012646120}
43+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
44+
--- !u!23 &6635537576424728573
45+
MeshRenderer:
46+
m_ObjectHideFlags: 0
47+
m_CorrespondingSourceObject: {fileID: 0}
48+
m_PrefabInstance: {fileID: 0}
49+
m_PrefabAsset: {fileID: 0}
50+
m_GameObject: {fileID: 349759903012646120}
51+
m_Enabled: 1
52+
m_CastShadows: 1
53+
m_ReceiveShadows: 1
54+
m_DynamicOccludee: 1
55+
m_MotionVectors: 1
56+
m_LightProbeUsage: 1
57+
m_ReflectionProbeUsage: 1
58+
m_RayTracingMode: 2
59+
m_RayTraceProcedural: 0
60+
m_RenderingLayerMask: 1
61+
m_RendererPriority: 0
62+
m_Materials:
63+
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
64+
m_StaticBatchInfo:
65+
firstSubMesh: 0
66+
subMeshCount: 0
67+
m_StaticBatchRoot: {fileID: 0}
68+
m_ProbeAnchor: {fileID: 0}
69+
m_LightProbeVolumeOverride: {fileID: 0}
70+
m_ScaleInLightmap: 1
71+
m_ReceiveGI: 1
72+
m_PreserveUVs: 0
73+
m_IgnoreNormalsForChartDetection: 0
74+
m_ImportantGI: 0
75+
m_StitchLightmapSeams: 1
76+
m_SelectedEditorRenderState: 3
77+
m_MinimumChartSize: 4
78+
m_AutoUVMaxDistance: 0.5
79+
m_AutoUVMaxAngle: 89
80+
m_LightmapParameters: {fileID: 0}
81+
m_SortingLayerID: 0
82+
m_SortingLayer: 0
83+
m_SortingOrder: 0
84+
m_AdditionalVertexStreams: {fileID: 0}
85+
--- !u!65 &7572661742331628315
86+
BoxCollider:
87+
m_ObjectHideFlags: 0
88+
m_CorrespondingSourceObject: {fileID: 0}
89+
m_PrefabInstance: {fileID: 0}
90+
m_PrefabAsset: {fileID: 0}
91+
m_GameObject: {fileID: 349759903012646120}
92+
m_Material: {fileID: 0}
93+
m_IsTrigger: 0
94+
m_Enabled: 1
95+
serializedVersion: 2
96+
m_Size: {x: 1, y: 1, z: 1}
97+
m_Center: {x: 0, y: 0, z: 0}
98+
--- !u!1 &880972579810857675
99+
GameObject:
100+
m_ObjectHideFlags: 0
101+
m_CorrespondingSourceObject: {fileID: 0}
102+
m_PrefabInstance: {fileID: 0}
103+
m_PrefabAsset: {fileID: 0}
104+
serializedVersion: 6
105+
m_Component:
106+
- component: {fileID: 2887565040518092645}
107+
- component: {fileID: 4300578426318380799}
108+
- component: {fileID: 2940189928546569386}
109+
- component: {fileID: 5267410454703225756}
110+
- component: {fileID: 5436602875654152730}
111+
- component: {fileID: 2935389599702650922}
112+
- component: {fileID: 5902187017539983656}
113+
m_Layer: 0
114+
m_Name: Player
115+
m_TagString: Untagged
116+
m_Icon: {fileID: 0}
117+
m_NavMeshLayer: 0
118+
m_StaticEditorFlags: 0
119+
m_IsActive: 1
120+
--- !u!4 &2887565040518092645
121+
Transform:
122+
m_ObjectHideFlags: 0
123+
m_CorrespondingSourceObject: {fileID: 0}
124+
m_PrefabInstance: {fileID: 0}
125+
m_PrefabAsset: {fileID: 0}
126+
m_GameObject: {fileID: 880972579810857675}
127+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
128+
m_LocalPosition: {x: 0, y: 0, z: 0}
33129
m_LocalScale: {x: 5, y: 5, z: 5}
34130
m_Children:
35-
- {fileID: 6335936230366486124}
36-
m_Father: {fileID: 7871910463013693590}
131+
- {fileID: 8419900873976795660}
132+
- {fileID: 3607449455225600338}
133+
m_Father: {fileID: 0}
37134
m_RootOrder: 0
38135
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
39-
--- !u!33 &1887075916
136+
--- !u!33 &4300578426318380799
40137
MeshFilter:
41138
m_ObjectHideFlags: 0
42139
m_CorrespondingSourceObject: {fileID: 0}
43140
m_PrefabInstance: {fileID: 0}
44141
m_PrefabAsset: {fileID: 0}
45-
m_GameObject: {fileID: 1887075912}
142+
m_GameObject: {fileID: 880972579810857675}
46143
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
47-
--- !u!23 &1887075915
144+
--- !u!23 &2940189928546569386
48145
MeshRenderer:
49146
m_ObjectHideFlags: 0
50147
m_CorrespondingSourceObject: {fileID: 0}
51148
m_PrefabInstance: {fileID: 0}
52149
m_PrefabAsset: {fileID: 0}
53-
m_GameObject: {fileID: 1887075912}
150+
m_GameObject: {fileID: 880972579810857675}
54151
m_Enabled: 1
55152
m_CastShadows: 1
56153
m_ReceiveShadows: 1
@@ -85,141 +182,101 @@ MeshRenderer:
85182
m_SortingLayer: 0
86183
m_SortingOrder: 0
87184
m_AdditionalVertexStreams: {fileID: 0}
88-
--- !u!135 &1887075914
185+
--- !u!135 &5267410454703225756
89186
SphereCollider:
90187
m_ObjectHideFlags: 0
91188
m_CorrespondingSourceObject: {fileID: 0}
92189
m_PrefabInstance: {fileID: 0}
93190
m_PrefabAsset: {fileID: 0}
94-
m_GameObject: {fileID: 1887075912}
191+
m_GameObject: {fileID: 880972579810857675}
95192
m_Material: {fileID: 0}
96193
m_IsTrigger: 0
97194
m_Enabled: 1
98195
serializedVersion: 2
99196
m_Radius: 0.5
100197
m_Center: {x: 0, y: 0, z: 0}
101-
--- !u!54 &1887075918
198+
--- !u!54 &5436602875654152730
102199
Rigidbody:
103200
m_ObjectHideFlags: 0
104201
m_CorrespondingSourceObject: {fileID: 0}
105202
m_PrefabInstance: {fileID: 0}
106203
m_PrefabAsset: {fileID: 0}
107-
m_GameObject: {fileID: 1887075912}
204+
m_GameObject: {fileID: 880972579810857675}
108205
serializedVersion: 2
109206
m_Mass: 1
110-
m_Drag: 0
207+
m_Drag: 0.1
111208
m_AngularDrag: 0.05
112209
m_UseGravity: 0
113210
m_IsKinematic: 0
114211
m_Interpolate: 0
115212
m_Constraints: 0
116213
m_CollisionDetection: 0
117-
--- !u!114 &1887075917
214+
--- !u!114 &2935389599702650922
118215
MonoBehaviour:
119216
m_ObjectHideFlags: 0
120217
m_CorrespondingSourceObject: {fileID: 0}
121218
m_PrefabInstance: {fileID: 0}
122219
m_PrefabAsset: {fileID: 0}
123-
m_GameObject: {fileID: 1887075912}
220+
m_GameObject: {fileID: 880972579810857675}
124221
m_Enabled: 1
125222
m_EditorHideFlags: 0
126-
m_Script: {fileID: 11500000, guid: cf888513164944c5a9dd9de0ecd0bbd0, type: 3}
223+
m_Script: {fileID: 11500000, guid: 6a5074ee399f24b0aa75aebac09ead06, type: 3}
127224
m_Name:
128225
m_EditorClassIdentifier:
129-
force: {x: 0, y: 0, z: 0}
130-
mousePos: {x: 0, y: 0, z: 0}
131-
speed: 0
132-
--- !u!1 &907197962646405039
133-
GameObject:
134-
m_ObjectHideFlags: 0
135-
m_CorrespondingSourceObject: {fileID: 0}
136-
m_PrefabInstance: {fileID: 0}
137-
m_PrefabAsset: {fileID: 0}
138-
serializedVersion: 6
139-
m_Component:
140-
- component: {fileID: 7871910463013693590}
141-
- component: {fileID: 6314844593347697327}
142-
m_Layer: 0
143-
m_Name: Player
144-
m_TagString: Untagged
145-
m_Icon: {fileID: 0}
146-
m_NavMeshLayer: 0
147-
m_StaticEditorFlags: 0
148-
m_IsActive: 1
149-
--- !u!4 &7871910463013693590
150-
Transform:
151-
m_ObjectHideFlags: 0
152-
m_CorrespondingSourceObject: {fileID: 0}
153-
m_PrefabInstance: {fileID: 0}
154-
m_PrefabAsset: {fileID: 0}
155-
m_GameObject: {fileID: 907197962646405039}
156-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
157-
m_LocalPosition: {x: 0, y: 0, z: 0}
158-
m_LocalScale: {x: 1, y: 1, z: 1}
159-
m_Children:
160-
- {fileID: 1887075913}
161-
m_Father: {fileID: 0}
162-
m_RootOrder: 0
163-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
164-
--- !u!114 &6314844593347697327
226+
username:
227+
--- !u!114 &5902187017539983656
165228
MonoBehaviour:
166229
m_ObjectHideFlags: 0
167230
m_CorrespondingSourceObject: {fileID: 0}
168231
m_PrefabInstance: {fileID: 0}
169232
m_PrefabAsset: {fileID: 0}
170-
m_GameObject: {fileID: 907197962646405039}
233+
m_GameObject: {fileID: 880972579810857675}
171234
m_Enabled: 1
172235
m_EditorHideFlags: 0
173-
m_Script: {fileID: 11500000, guid: 6a5074ee399f24b0aa75aebac09ead06, type: 3}
236+
m_Script: {fileID: 11500000, guid: cf888513164944c5a9dd9de0ecd0bbd0, type: 3}
174237
m_Name:
175238
m_EditorClassIdentifier:
176-
username:
177-
--- !u!1001 &1053621499259068810
239+
applyNewForce: 0
240+
newForceTime: 0
241+
force: {x: 0, y: 0, z: 0}
242+
forceInfluence: {x: 0, y: 0, z: 0}
243+
maxSpeed: 30
244+
testSpeed: {x: 0, y: 0, z: 0}
245+
facingDirection: {x: 0, y: 0, z: 0}
246+
--- !u!1001 &3290878427680992746
178247
PrefabInstance:
179248
m_ObjectHideFlags: 0
180249
serializedVersion: 2
181250
m_Modification:
182-
m_TransformParent: {fileID: 1887075913}
251+
m_TransformParent: {fileID: 2887565040518092645}
183252
m_Modifications:
184-
- target: {fileID: 324101970306395753, guid: 1edc95efb8d7a4866b149a313687cc5e, type: 3}
185-
propertyPath: m_Controller
186-
value:
187-
objectReference: {fileID: 0}
188-
- target: {fileID: 2736477805894834975, guid: 1edc95efb8d7a4866b149a313687cc5e, type: 3}
189-
propertyPath: m_Materials.Array.data[0]
190-
value:
191-
objectReference: {fileID: 2100000, guid: a4286a2a0b440473fa49e6953572262a, type: 2}
192-
- target: {fileID: 3905223414317444978, guid: 1edc95efb8d7a4866b149a313687cc5e, type: 3}
193-
propertyPath: mid
194-
value: 15
195-
objectReference: {fileID: 0}
196253
- target: {fileID: 4010505626693846101, guid: 1edc95efb8d7a4866b149a313687cc5e, type: 3}
197254
propertyPath: m_Name
198-
value: ProductMonster
255+
value: Monster
199256
objectReference: {fileID: 0}
200257
- target: {fileID: 6445481496505008102, guid: 1edc95efb8d7a4866b149a313687cc5e, type: 3}
201258
propertyPath: m_LocalPosition.x
202-
value: -3.97
259+
value: 5
203260
objectReference: {fileID: 0}
204261
- target: {fileID: 6445481496505008102, guid: 1edc95efb8d7a4866b149a313687cc5e, type: 3}
205262
propertyPath: m_LocalPosition.y
206-
value: 1.8
263+
value: 0
207264
objectReference: {fileID: 0}
208265
- target: {fileID: 6445481496505008102, guid: 1edc95efb8d7a4866b149a313687cc5e, type: 3}
209266
propertyPath: m_LocalPosition.z
210267
value: 0
211268
objectReference: {fileID: 0}
212269
- target: {fileID: 6445481496505008102, guid: 1edc95efb8d7a4866b149a313687cc5e, type: 3}
213270
propertyPath: m_LocalRotation.x
214-
value: -0
271+
value: 0
215272
objectReference: {fileID: 0}
216273
- target: {fileID: 6445481496505008102, guid: 1edc95efb8d7a4866b149a313687cc5e, type: 3}
217274
propertyPath: m_LocalRotation.y
218-
value: -0
275+
value: 0
219276
objectReference: {fileID: 0}
220277
- target: {fileID: 6445481496505008102, guid: 1edc95efb8d7a4866b149a313687cc5e, type: 3}
221278
propertyPath: m_LocalRotation.z
222-
value: -0
279+
value: 0
223280
objectReference: {fileID: 0}
224281
- target: {fileID: 6445481496505008102, guid: 1edc95efb8d7a4866b149a313687cc5e, type: 3}
225282
propertyPath: m_LocalRotation.w
@@ -243,8 +300,8 @@ PrefabInstance:
243300
objectReference: {fileID: 0}
244301
m_RemovedComponents: []
245302
m_SourcePrefab: {fileID: 100100000, guid: 1edc95efb8d7a4866b149a313687cc5e, type: 3}
246-
--- !u!4 &6335936230366486124 stripped
303+
--- !u!4 &8419900873976795660 stripped
247304
Transform:
248305
m_CorrespondingSourceObject: {fileID: 6445481496505008102, guid: 1edc95efb8d7a4866b149a313687cc5e, type: 3}
249-
m_PrefabInstance: {fileID: 1053621499259068810}
306+
m_PrefabInstance: {fileID: 3290878427680992746}
250307
m_PrefabAsset: {fileID: 0}

0 commit comments

Comments
 (0)