cailean
/
beep-final
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fixed prefab and col's

animation-test
Cailean Finn 10 months ago
parent
5d1538f3b7
commit
1b6eb0f832
4 changed files with 117 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      Assets/2_Chair/Chair.prefab
  2. 2
      Assets/2_Chair/Target_Cube.prefab
  3. 139
      Assets/6_Scenes/Beep.unity
  4. 12
      Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset

36
Assets/2_Chair/Chair.prefab
View File

@ -840,6 +840,37 @@ MonoBehaviour:
touchingObject: 0
touchingGround: 0
touchingStairs: 0
--- !u!1 &3028507005537857522
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5430093713008895113}
m_Layer: 0
m_Name: CameraFollow-Target
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5430093713008895113
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3028507005537857522}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0.9856741, z: -0, w: 0.16866145}
m_LocalPosition: {x: 0.5000067, y: 0.5, z: 11.500013}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2722580235232797026}
m_LocalEulerAnglesHint: {x: 0, y: -160.58, z: 0}
--- !u!1 &3324743253852508855
GameObject:
m_ObjectHideFlags: 0
@ -1618,7 +1649,7 @@ SkinnedMeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: ce652c3b013f35f4dbbc7aa7c80caea8, type: 2}
- {fileID: 2100000, guid: 77d8128f072f7b942949019d466cfa87, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -1982,6 +2013,7 @@ Transform:
- {fileID: 5732046185206465305}
- {fileID: 3760912995002528423}
- {fileID: 2606659236387519094}
- {fileID: 5430093713008895113}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3382247266651750635
@ -2625,7 +2657,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
agent: {fileID: 0}
agentDoneOnGroundContact: 1
agentDoneOnGroundContact: 0
penalizeGroundContact: 1
rewardOnContact: 0
isFoot: 0

2
Assets/2_Chair/Target_Cube.prefab
View File

@ -108,7 +108,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 4d29491c440e32a4bae9d730b3b8b57b, type: 2}
- {fileID: 2100000, guid: 55c11eea77334f3469bf2c603d7444c5, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

139
Assets/6_Scenes/Beep.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 11562.574, g: 10846.728, b: 10158.274, a: 1}
m_IndirectSpecularColor: {r: 11543.575, g: 10827.13, b: 10137.556, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -150,7 +150,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 256668360}
serializedVersion: 2
m_LocalRotation: {x: 0.14796992, y: 0.7067936, z: -0.1551344, w: 0.6741521}
m_LocalRotation: {x: -0.056672364, y: 0.9420038, z: -0.20676082, w: -0.25819978}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -211,37 +211,12 @@ MonoBehaviour:
m_Calls: []
m_LegacyBlendHint: 0
m_ComponentOwner: {fileID: 2037229443}
--- !u!1 &259755218
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 259755219}
m_Layer: 0
m_Name: CameraFollow-Target
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &259755219
--- !u!4 &259755219 stripped
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 5430093713008895113, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
m_PrefabInstance: {fileID: 1412792145}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 259755218}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0.9856741, z: -0, w: 0.16866145}
m_LocalPosition: {x: 0.5000067, y: 0.5, z: 11.500013}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1412792146}
m_LocalEulerAnglesHint: {x: 0, y: -160.58, z: 0}
--- !u!1001 &387060609
PrefabInstance:
m_ObjectHideFlags: 0
@ -310,11 +285,6 @@ PrefabInstance:
propertyPath: m_Name
value: Target_Cube
objectReference: {fileID: 0}
- target: {fileID: 9113762406916612572, guid: 263d8cea838224448bdfd0e71bc2dce4,
type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 55c11eea77334f3469bf2c603d7444c5, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@ -714,7 +684,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: -0.000000029802326, y: -0.00000020861627, z: 0.000000037252907,
w: 1}
m_LocalPosition: {x: -234.59502, y: 10.880806, z: 469.74957}
m_LocalPosition: {x: -217.78676, y: 11.480804, z: 480.67487}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -1594,7 +1564,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1041556982}
serializedVersion: 2
m_LocalRotation: {x: 0.022649419, y: 0.29088917, z: -0.0068883626, w: 0.9564639}
m_LocalRotation: {x: 0.021715209, y: 0.29664487, z: -0.0067472397, w: 0.95471716}
m_LocalPosition: {x: -412.26117, y: 23.313618, z: 196.57948}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -1754,7 +1724,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1351068403}
serializedVersion: 2
m_LocalRotation: {x: 0.13734868, y: 0.70914614, z: -0.14399888, w: 0.676396}
m_LocalRotation: {x: -0.052604437, y: 0.94513917, z: -0.19191958, w: -0.25905916}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -1823,15 +1793,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 479999559}
m_Modifications:
- target: {fileID: 939743291063286001, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 77d8128f072f7b942949019d466cfa87, type: 2}
- target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_LocalPosition.x
value: -232.89
value: -222.87
objectReference: {fileID: 0}
- target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
@ -1841,12 +1806,12 @@ PrefabInstance:
- target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_LocalPosition.z
value: 478.61002
value: 473.19
objectReference: {fileID: 0}
- target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.37854
value: 0.89454293
objectReference: {fileID: 0}
- target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
@ -1856,7 +1821,7 @@ PrefabInstance:
- target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.9255849
value: 0.44698197
objectReference: {fileID: 0}
- target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
@ -1871,13 +1836,53 @@ PrefabInstance:
- target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 135.513
value: 53.1
objectReference: {fileID: 0}
- target: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5732046185206465305, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5732046185206465305, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5732046185206465305, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5732046185206465305, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.8976434
objectReference: {fileID: 0}
- target: {fileID: 5732046185206465305, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5732046185206465305, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.4407226
objectReference: {fileID: 0}
- target: {fileID: 5732046185206465305, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5732046185206465305, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -52.3
objectReference: {fileID: 0}
- target: {fileID: 5777259271730693716, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
propertyPath: m_Name
@ -1890,11 +1895,7 @@ PrefabInstance:
objectReference: {fileID: 387060610}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 2722580235232797026, guid: f03606b436da1d94e977c8ffa2825bd9,
type: 3}
insertIndex: -1
addedObject: {fileID: 259755219}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f03606b436da1d94e977c8ffa2825bd9, type: 3}
--- !u!4 &1412792146 stripped
@ -1977,22 +1978,22 @@ PrefabInstance:
- target: {fileID: 933460690407818091, guid: 547378ae4bbaf4b4ba24e3243bcd0838,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.9564639
value: 0.95471716
objectReference: {fileID: 0}
- target: {fileID: 933460690407818091, guid: 547378ae4bbaf4b4ba24e3243bcd0838,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.022649419
value: 0.021715209
objectReference: {fileID: 0}
- target: {fileID: 933460690407818091, guid: 547378ae4bbaf4b4ba24e3243bcd0838,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.29088917
value: 0.29664487
objectReference: {fileID: 0}
- target: {fileID: 933460690407818091, guid: 547378ae4bbaf4b4ba24e3243bcd0838,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.0068883626
value: -0.0067472397
objectReference: {fileID: 0}
- target: {fileID: 933460690407818091, guid: 547378ae4bbaf4b4ba24e3243bcd0838,
type: 3}
@ -2364,7 +2365,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1951028702}
serializedVersion: 2
m_LocalRotation: {x: 0.15857552, y: 0.70426106, z: -0.16625352, w: 0.67173654}
m_LocalRotation: {x: -0.060734317, y: 0.93862844, z: -0.22158025, w: -0.2572746}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -3782,7 +3783,7 @@ Transform:
m_GameObject: {fileID: 459665534628965860}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0.11564778, w: 0.9932903}
m_LocalPosition: {x: -0.9318942, y: 0.5107309, z: 0.642506}
m_LocalPosition: {x: -0.9318942, y: 0.511, z: 0.659}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -4591,7 +4592,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: -0.0000000052276143, y: -0.000000081292434, z: 0.99793875,
w: 0.06417375}
m_LocalPosition: {x: -2.5797234, y: 0.3258443, z: 0.47419578}
m_LocalPosition: {x: -2.5797234, y: 0.3258, z: 0.485}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -6497,7 +6498,7 @@ Transform:
m_GameObject: {fileID: 3846387236656934952}
serializedVersion: 2
m_LocalRotation: {x: -0.0000000106529825, y: -0.00000008076077, z: 0.9914121, w: 0.13077503}
m_LocalPosition: {x: -2.3167768, y: 0.47617462, z: 0.47419578}
m_LocalPosition: {x: -2.3167768, y: 0.4762, z: 0.481}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -10721,7 +10722,7 @@ Transform:
m_GameObject: {fileID: 8664901282889388767}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: -0.000000014901161, w: 1}
m_LocalPosition: {x: -0, y: 0.0000012397766, z: -0.00000015497207}
m_LocalPosition: {x: -0, y: 0, z: 0.019}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -11555,7 +11556,7 @@ Transform:
m_GameObject: {fileID: 1648597676056826935}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: -0.000000014901159, w: 1}
m_LocalPosition: {x: -1.5849341, y: 0.40209302, z: 0.57511556}
m_LocalPosition: {x: -1.5849341, y: 0.402, z: 0.594}
m_LocalScale: {x: 1, y: 1.0000002, z: 1.0000002}
m_ConstrainProportionsScale: 0
m_Children: []
@ -12138,7 +12139,7 @@ Transform:
m_GameObject: {fileID: 8889274975073276998}
serializedVersion: 2
m_LocalRotation: {x: 0.000000029612197, y: -0.00000007588745, z: 0.9315877, w: -0.36351672}
m_LocalPosition: {x: -2.6770496, y: 0.4112909, z: 0.47419578}
m_LocalPosition: {x: -2.6765, y: 0.4677, z: 0.48}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -12429,7 +12430,7 @@ Transform:
m_GameObject: {fileID: 8278835800772535480}
serializedVersion: 2
m_LocalRotation: {x: 0.40603054, y: 0.57891214, z: 0.57891214, w: 0.4060306}
m_LocalPosition: {x: -1.91179, y: 0.55114514, z: 0.11581396}
m_LocalPosition: {x: -1.92, y: 0.551, z: 0.124}
m_LocalScale: {x: 0.99999994, y: 1, z: 0.99999994}
m_ConstrainProportionsScale: 0
m_Children: []
@ -14052,7 +14053,7 @@ Transform:
m_GameObject: {fileID: 6241620533681231364}
serializedVersion: 2
m_LocalRotation: {x: 0.00000003593819, y: -0.00000007310428, z: 0.89742166, w: -0.44117397}
m_LocalPosition: {x: -2.1287942, y: 0.36321858, z: 0.47419578}
m_LocalPosition: {x: -2.1287942, y: 0.3632, z: 0.4773}
m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -14562,7 +14563,7 @@ Transform:
m_GameObject: {fileID: 8847087940103943221}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0.83324677, w: 0.55290127}
m_LocalPosition: {x: -2.0177562, y: 0.5317662, z: 0.5672718}
m_LocalPosition: {x: -2.0177562, y: 0.5318, z: 0.5761}
m_LocalScale: {x: 0.09814002, y: 0.09814002, z: 0.09814003}
m_ConstrainProportionsScale: 0
m_Children: []
@ -16164,7 +16165,7 @@ Transform:
m_GameObject: {fileID: 7623991529506724524}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: -0.35402802, w: 0.9352348}
m_LocalPosition: {x: -2.6698997, y: 0.40518937, z: 0.1979993}
m_LocalPosition: {x: -2.641, y: 0.405, z: 0.212}
m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []

12
Assets/Settings/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset
View File

@ -33,6 +33,18 @@ MonoBehaviour:
maximumIntensity:
m_OverrideState: 1
m_Value: 10
denoising:
m_OverrideState: 0
m_Value: 0
useAOVs:
m_OverrideState: 0
m_Value: 1
temporal:
m_OverrideState: 0
m_Value: 0
asyncDenoising:
m_OverrideState: 0
m_Value: 1
skyImportanceSampling:
m_OverrideState: 1
m_Value: 0

Write Preview
Loading…
Cancel
Save