Added skinned mesh collider. Changed Heat Reset from list to event action. Added curve to heat buildup
This commit is contained in:
Thorbjoern
+291
-15
@@ -1881,6 +1881,36 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 344043584}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!21 &344242540
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Custom/EasyColliderShader
|
||||
m_Shader: {fileID: 4800000, guid: 47ca8cc19e520064baecb98dc4e2eb9e, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs: []
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _Size: 0.01
|
||||
m_Colors:
|
||||
- _Color: {r: 0, g: 1, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
--- !u!65 &375640807
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2067,6 +2097,36 @@ Mesh:
|
||||
offset: 0
|
||||
size: 0
|
||||
path:
|
||||
--- !u!21 &457376411
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Custom/EasyColliderShader
|
||||
m_Shader: {fileID: 4800000, guid: 47ca8cc19e520064baecb98dc4e2eb9e, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs: []
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _Size: 0.01
|
||||
m_Colors:
|
||||
- _Color: {r: 0, g: 1, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
--- !u!1001 &503091998
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2582,6 +2642,18 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 547639440}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &547639442 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 4106623381292868567, guid: ce2204ad7743b3445befdd8da95cda27,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 547639440}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!65 &557904168
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2624,6 +2696,36 @@ BoxCollider:
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 0.19999999, y: 2.5, z: 7.5}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!21 &603766378
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Custom/EasyColliderShader
|
||||
m_Shader: {fileID: 4800000, guid: 47ca8cc19e520064baecb98dc4e2eb9e, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs: []
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _Size: 0.01
|
||||
m_Colors:
|
||||
- _Color: {r: 0, g: 1, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
--- !u!1001 &616187895
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -3020,6 +3122,17 @@ MonoBehaviour:
|
||||
furnitures: []
|
||||
portals: []
|
||||
enemies: []
|
||||
targets:
|
||||
- {fileID: 9149237576655738450}
|
||||
- {fileID: 9149237576655738449}
|
||||
- {fileID: 9149237576655738448}
|
||||
- {fileID: 2587706330484868611}
|
||||
- {fileID: 2587706330484868610}
|
||||
- {fileID: 2587706330484868609}
|
||||
- {fileID: 547639442}
|
||||
- {fileID: 1948336779}
|
||||
- {fileID: 939495689}
|
||||
- {fileID: 1831324258}
|
||||
--- !u!1001 &734502157
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -5287,6 +5400,11 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1619790250}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: rubber_duck_toy_2k (1)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5540753397945044693, guid: 21a133bccb7244245a1c90c15ac4066a,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@@ -5337,11 +5455,6 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: rubber_duck_toy_2k (1)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
@@ -5353,6 +5466,18 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 939495687}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &939495689 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: -8380230304484969828, guid: 21a133bccb7244245a1c90c15ac4066a,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 939495687}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!65 &1005788666
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -13364,6 +13489,11 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1619790250}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: rubber_duck_toy_2k (2)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5540753397945044693, guid: 21a133bccb7244245a1c90c15ac4066a,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@@ -13414,11 +13544,6 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: rubber_duck_toy_2k (2)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
@@ -13430,6 +13555,18 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1831324256}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1831324258 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: -8380230304484969828, guid: 21a133bccb7244245a1c90c15ac4066a,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1831324256}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1868152415
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -13767,6 +13904,11 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1619790250}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: rubber_duck_toy_2k
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5540753397945044693, guid: 21a133bccb7244245a1c90c15ac4066a,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@@ -13817,11 +13959,6 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: rubber_duck_toy_2k
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
@@ -13833,6 +13970,18 @@ Transform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1948336777}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1948336779 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: -8380230304484969828, guid: 21a133bccb7244245a1c90c15ac4066a,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1948336777}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1968242169
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -13961,6 +14110,36 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!21 &2007575582
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Custom/EasyColliderShader
|
||||
m_Shader: {fileID: 4800000, guid: 47ca8cc19e520064baecb98dc4e2eb9e, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs: []
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _Size: 0.01
|
||||
m_Colors:
|
||||
- _Color: {r: 0, g: 1, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
--- !u!65 &2010534088
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -14317,6 +14496,42 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 08fea625de5a87b49bd99965874b6462, type: 3}
|
||||
--- !u!114 &2587706330484868609 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 6202332535822784841, guid: 08fea625de5a87b49bd99965874b6462,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2587706330484868608}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &2587706330484868610 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 4459343905502976638, guid: 08fea625de5a87b49bd99965874b6462,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2587706330484868608}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &2587706330484868611 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 6409697334092588290, guid: 08fea625de5a87b49bd99965874b6462,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2587706330484868608}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &9149237576655738447
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -14380,11 +14595,72 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Male Crouch Pose
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 784337179000748581, guid: ee8120ab795dd634c92c812ffffad831,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5659734376508264703, guid: ee8120ab795dd634c92c812ffffad831,
|
||||
type: 3}
|
||||
propertyPath: _HoveredMaterial
|
||||
value:
|
||||
objectReference: {fileID: 603766378}
|
||||
- target: {fileID: 5659734376508264703, guid: ee8120ab795dd634c92c812ffffad831,
|
||||
type: 3}
|
||||
propertyPath: _OverlapMaterial
|
||||
value:
|
||||
objectReference: {fileID: 344242540}
|
||||
- target: {fileID: 5659734376508264703, guid: ee8120ab795dd634c92c812ffffad831,
|
||||
type: 3}
|
||||
propertyPath: _SelectedMaterial
|
||||
value:
|
||||
objectReference: {fileID: 457376411}
|
||||
- target: {fileID: 5659734376508264703, guid: ee8120ab795dd634c92c812ffffad831,
|
||||
type: 3}
|
||||
propertyPath: _DisplayAllMaterial
|
||||
value:
|
||||
objectReference: {fileID: 2007575582}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ee8120ab795dd634c92c812ffffad831, type: 3}
|
||||
--- !u!114 &9149237576655738448 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 177172771931538304, guid: ee8120ab795dd634c92c812ffffad831,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 9149237576655738447}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &9149237576655738449 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 6929469630982117874, guid: ee8120ab795dd634c92c812ffffad831,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 9149237576655738447}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &9149237576655738450 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 937006190045341451, guid: ee8120ab795dd634c92c812ffffad831,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 9149237576655738447}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1660057539 &9223372036854775807
|
||||
SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
Reference in New Issue
Block a user