diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 0f0934f3a..0351385c5 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -138,6 +138,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 5e50b5a1c5542da46b92f4cf7bbd5043 + m_Address: Assets/Throwing Knife + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 819d03717e2ae4f4a8216ff1ba94ff77, type: 2} m_SchemaSet: diff --git a/Assets/Artists/Arts/Backgrounds/BITFALL_Menu_Welcome2.png b/Assets/Artists/Arts/Backgrounds/BITFALL_Menu_Welcome2.png index 10ab0235f..ba58acc9d 100644 Binary files a/Assets/Artists/Arts/Backgrounds/BITFALL_Menu_Welcome2.png and b/Assets/Artists/Arts/Backgrounds/BITFALL_Menu_Welcome2.png differ diff --git a/Assets/Artists/Arts/Icons/Items/ICON_ThrowingKnife.png b/Assets/Artists/Arts/Icons/Items/ICON_ThrowingKnife.png new file mode 100644 index 000000000..9802e7a66 Binary files /dev/null and b/Assets/Artists/Arts/Icons/Items/ICON_ThrowingKnife.png differ diff --git a/Assets/Artists/Configs/Items/Grenade.asset b/Assets/Artists/Configs/Items/Grenade.asset index 3d387572e..429b40179 100644 --- a/Assets/Artists/Configs/Items/Grenade.asset +++ b/Assets/Artists/Configs/Items/Grenade.asset @@ -21,7 +21,7 @@ MonoBehaviour: quality: 0 factoryProperties: - rid: 806583526086934675 - instance: {fileID: 5322756313667207077, guid: 6c561c5784df77f4aa248f741584c96f, + instance: {fileID: 5322756313667207077, guid: 2c021b0fb224edb47a64a22e6736d50c, type: 3} references: version: 2 diff --git a/Assets/Artists/Configs/Items/Throwing Knife.asset b/Assets/Artists/Configs/Items/Throwing Knife.asset new file mode 100644 index 000000000..e580cddff --- /dev/null +++ b/Assets/Artists/Configs/Items/Throwing Knife.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e85133da5368bfe4b845d18f4e7def30, type: 3} + m_Name: Throwing Knife + m_EditorClassIdentifier: + displayName: "\u98DE\u5200" + description: "\u5FEB\u5207\u5B89\u9759,\u81F4\u547D" + addressablePath: Assets/Throwing Knife + prefab: {fileID: 944092592603409112, guid: 1f4b86271ef90774495a3444f525ca20, type: 3} + squareIcon: {fileID: 2800000, guid: 8b7801fa09bb3cc47a85b7e2d329eab7, type: 3} + rectangleIcon: {fileID: 0} + quality: 3 + factoryProperties: + - rid: 806583611772633090 + instance: {fileID: 2322573603674746577, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + references: + version: 2 + RefIds: + - rid: 806583611772633090 + type: {class: EquipmentAsSlot, ns: BITFALL, asm: BITFALL.Entities.Equipment} + data: + slot: + rid: 806583611772633091 + - rid: 806583611772633091 + type: {class: EquipmentAsThrow, ns: BITFALL, asm: BITFALL.Entities.Equipment} + data: diff --git a/Assets/Artists/Models/Guns/ThrowingKnife/ThrowKnifeController.overrideController b/Assets/Artists/Models/Guns/ThrowingKnife/ThrowKnifeController.overrideController new file mode 100644 index 000000000..55dd06076 --- /dev/null +++ b/Assets/Artists/Models/Guns/ThrowingKnife/ThrowKnifeController.overrideController @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!221 &22100000 +AnimatorOverrideController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ThrowKnifeController + m_Controller: {fileID: 9100000, guid: fb4196238dafc7d4d82517684cd52530, type: 2} + m_Clips: + - m_OriginalClip: {fileID: 7400000, guid: 46f6bba0b7dfc524c814da620942f888, type: 2} + m_OverrideClip: {fileID: -3064973872704187395, guid: 1ff0237e9622de84988e8f0bdf68f4d6, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 73f4040677932bd4eb75341b67350857, type: 2} + m_OverrideClip: {fileID: 7365072474967213234, guid: 1ff0237e9622de84988e8f0bdf68f4d6, + type: 3} + - m_OriginalClip: {fileID: 7400000, guid: 68182865c01bbae4fb3027ea32634e3f, type: 2} + m_OverrideClip: {fileID: 2902082503132113307, guid: 1ff0237e9622de84988e8f0bdf68f4d6, + type: 3} diff --git a/Assets/Artists/Models/Guns/ThrowingKnife/ThrowingKnife_DrawAndrThrow.fbx b/Assets/Artists/Models/Guns/ThrowingKnife/ThrowingKnife_DrawAndrThrow.fbx new file mode 100644 index 000000000..085ed1b63 Binary files /dev/null and b/Assets/Artists/Models/Guns/ThrowingKnife/ThrowingKnife_DrawAndrThrow.fbx differ diff --git a/Assets/Artists/Models/Guns/ThrowingKnife/Weapon_ThrowingKnife.fbx b/Assets/Artists/Models/Guns/ThrowingKnife/Weapon_ThrowingKnife.fbx new file mode 100644 index 000000000..52acabcce Binary files /dev/null and b/Assets/Artists/Models/Guns/ThrowingKnife/Weapon_ThrowingKnife.fbx differ diff --git a/Assets/Artists/Models/Props/Knife/Prop_Throwing Knife.fbx b/Assets/Artists/Models/Props/Knife/Prop_Throwing Knife.fbx new file mode 100644 index 000000000..8fc6785de Binary files /dev/null and b/Assets/Artists/Models/Props/Knife/Prop_Throwing Knife.fbx differ diff --git a/Assets/Artists/Models/Props/Knife/ThrowingKnife_BaseColor.mat b/Assets/Artists/Models/Props/Knife/ThrowingKnife_BaseColor.mat new file mode 100644 index 000000000..77340e9ff --- /dev/null +++ b/Assets/Artists/Models/Props/Knife/ThrowingKnife_BaseColor.mat @@ -0,0 +1,135 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ThrowingKnife_BaseColor + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, 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: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.59999996 + - _GlossyReflections: 1 + - _Metallic: 0.133 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.03773582, g: 0.03773582, b: 0.03773582, a: 1} + - _Color: {r: 0.03773582, g: 0.03773582, b: 0.03773582, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &1189962668262198536 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/Artists/Models/Props/Knife/ThrowingKnife_BlackGloss.mat b/Assets/Artists/Models/Props/Knife/ThrowingKnife_BlackGloss.mat new file mode 100644 index 000000000..3a3c3c970 --- /dev/null +++ b/Assets/Artists/Models/Props/Knife/ThrowingKnife_BlackGloss.mat @@ -0,0 +1,135 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ThrowingKnife_BlackGloss + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, 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: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.939759 + - _GlossyReflections: 1 + - _Metallic: 1 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.939759 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.0999927, g: 0.0999927, b: 0.0999927, a: 1} + - _Color: {r: 0.09999267, g: 0.09999267, b: 0.09999267, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &5498279817427653980 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/Artists/Models/Props/Knife/ThrowingKnife_BladeColor.mat b/Assets/Artists/Models/Props/Knife/ThrowingKnife_BladeColor.mat new file mode 100644 index 000000000..64ad18e53 --- /dev/null +++ b/Assets/Artists/Models/Props/Knife/ThrowingKnife_BladeColor.mat @@ -0,0 +1,135 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3279616786578298441 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ThrowingKnife_BladeColor + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, 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: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.89698803 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.89698803 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Artists/Models/Props/Knife/ThrowingKnife_Red.mat b/Assets/Artists/Models/Props/Knife/ThrowingKnife_Red.mat new file mode 100644 index 000000000..5eab17346 --- /dev/null +++ b/Assets/Artists/Models/Props/Knife/ThrowingKnife_Red.mat @@ -0,0 +1,135 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ThrowingKnife_Red + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, 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: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.87349397 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.87349397 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 0, b: 0.041134827, a: 1} + - _Color: {r: 1, g: 0, b: 0.041134797, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &8155839787953355811 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/Artists/Prefabs/Loot/Throwing Knife Variant.prefab b/Assets/Artists/Prefabs/Loot/Throwing Knife Variant.prefab new file mode 100644 index 000000000..3197be276 --- /dev/null +++ b/Assets/Artists/Prefabs/Loot/Throwing Knife Variant.prefab @@ -0,0 +1,225 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &93883969787178225 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3894949043146936249} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.00000086426724 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5568371526223589888, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_Name + value: Static_Throwing Knife + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8513859187771203891, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + insertIndex: -1 + addedObject: {fileID: 37206092563123207} + m_SourcePrefab: {fileID: 100100000, guid: a5afe13492c9acf478def44319cb3619, type: 3} +--- !u!4 &488415728299002650 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + m_PrefabInstance: {fileID: 93883969787178225} + m_PrefabAsset: {fileID: 0} +--- !u!1 &976404984353100192 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + m_PrefabInstance: {fileID: 93883969787178225} + m_PrefabAsset: {fileID: 0} +--- !u!65 &37206092563123207 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 976404984353100192} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.06720734, y: 0.015033718, z: 0.35746002} + m_Center: {x: -0.0017528534, y: -0.005294976, z: 0.15318671} +--- !u!1001 &944092594687977695 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2084569607, guid: d8b5a76c92d6b3a4592b14e21ad018c0, type: 3} + propertyPath: asset + value: + objectReference: {fileID: 11400000, guid: 5e50b5a1c5542da46b92f4cf7bbd5043, + type: 2} + - target: {fileID: 4258070652695701351, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: rmsCount + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4258070652695701351, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: outlineColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4258070652695701351, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: outlineColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797568, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 2800000, guid: 8b7801fa09bb3cc47a85b7e2d329eab7, type: 3} + - target: {fileID: 4258070653194797568, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_Name + value: Throwing Knife Variant + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalPosition.x + value: 29.227583 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.054 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalPosition.z + value: -31.572662 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4258070652695701350, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 488415728299002650} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d8b5a76c92d6b3a4592b14e21ad018c0, type: 3} +--- !u!4 &3894949043146936249 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4258070652695701350, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + m_PrefabInstance: {fileID: 944092594687977695} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Artists/Prefabs/Loot/Weapon_TacticalKnife Variant.prefab b/Assets/Artists/Prefabs/Loot/Weapon_TacticalKnife Variant.prefab index ded334339..6763fce7b 100644 --- a/Assets/Artists/Prefabs/Loot/Weapon_TacticalKnife Variant.prefab +++ b/Assets/Artists/Prefabs/Loot/Weapon_TacticalKnife Variant.prefab @@ -33,6 +33,16 @@ PrefabInstance: propertyPath: m_Name value: Weapon_TacticalKnife Variant objectReference: {fileID: 0} + - target: {fileID: 4258070653194797574, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_Mass + value: 0.255 + objectReference: {fileID: 0} + - target: {fileID: 4258070653194797574, guid: d8b5a76c92d6b3a4592b14e21ad018c0, + type: 3} + propertyPath: m_AngularDrag + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4258070653194797575, guid: d8b5a76c92d6b3a4592b14e21ad018c0, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Artists/Prefabs/Player.prefab b/Assets/Artists/Prefabs/Player.prefab index ac8229836..92a072ed6 100644 --- a/Assets/Artists/Prefabs/Player.prefab +++ b/Assets/Artists/Prefabs/Player.prefab @@ -1362,6 +1362,7 @@ MonoBehaviour: - {fileID: 8789266898436862045} - {fileID: 1506499515248164262} - {fileID: 4913029694326725564} + joints: [] rigidbody: {fileID: 650759566046424193} --- !u!114 &300229368 MonoBehaviour: @@ -2511,6 +2512,7 @@ Transform: - {fileID: 4138942853584030110} - {fileID: 1074771797319587490} - {fileID: 9120422628210139297} + - {fileID: 5165649342843401771} - {fileID: 3989134628387755881} m_Father: {fileID: 2648601869858448235} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3088,6 +3090,79 @@ Transform: m_Children: [] m_Father: {fileID: 2019605867538852436} m_LocalEulerAnglesHint: {x: -10, y: 0, z: 0} +--- !u!1 &8325772932023106936 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8778599738524981189} + - component: {fileID: 3138050711118661386} + - component: {fileID: 295134024824408557} + m_Layer: 7 + m_Name: CameraRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8778599738524981189 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8325772932023106936} + serializedVersion: 2 + m_LocalRotation: {x: -0.00017264773, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5165649342843401771} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1773428102 &3138050711118661386 +ParentConstraint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8325772932023106936} + m_Enabled: 1 + serializedVersion: 2 + m_Weight: 1 + m_TranslationAtRest: {x: 0, y: 0, z: 0} + m_RotationAtRest: {x: -0.019783963, y: 0, z: 0} + m_TranslationOffsets: + - {x: 0, y: 0, z: 0} + m_RotationOffsets: + - {x: -90, y: 0, z: -180} + m_AffectTranslationX: 1 + m_AffectTranslationY: 1 + m_AffectTranslationZ: 1 + m_AffectRotationX: 1 + m_AffectRotationY: 1 + m_AffectRotationZ: 1 + m_Active: 1 + m_IsLocked: 0 + m_Sources: + - sourceTransform: {fileID: 2054254639170952763} + weight: 1 +--- !u!114 &295134024824408557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8325772932023106936} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 98ce129373beee341b6f0723f3fb2ce7, type: 3} + m_Name: + m_EditorClassIdentifier: + locationAdditive: {fileID: 843716438194269699} --- !u!1 &8587898794680105710 GameObject: m_ObjectHideFlags: 0 @@ -6159,6 +6234,365 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4192940043719826356} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4628200443042091456 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2019605867538852436} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8483079287735800029, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -7982445368288305232, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -7805527542236588859, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -7083826889706597962, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6761239244867884074, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6565134293425240629, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6179275997006789232, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -5568371526223589888, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3799896878483850562, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3686551328258449376, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -2853424563086286810, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -2853424563086286810, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2107066420424512121, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -1800213932466231045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1800213932466231045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1745863489998566550, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -457497680185661411, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 422738843169862328, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Name + value: Weapon_ThrowingKnife + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2192180338147824518, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2192180338147824518, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2192180338147824518, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0bdc17ca1b76bc640b010f622a6886c3, type: 2} + - target: {fileID: 4387719810744567721, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4824860256124165047, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5074512353664290214, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5074512353664290214, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6003611815629638046, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8153101253863224186, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8153101253863224186, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8260868571131455172, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8315903294366468851, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8513859187771203891, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8778599738524981189} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6304939419498623454} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2269618926873949942} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3269250633790738649} + m_SourcePrefab: {fileID: 100100000, guid: 2457bdeea68be7942b83d81070b7e9b5, type: 3} +--- !u!137 &456800702483242086 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 5074512353664290214, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + m_PrefabInstance: {fileID: 4628200443042091456} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2054254639170952763 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2542134114980474885, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + m_PrefabInstance: {fileID: 4628200443042091456} + m_PrefabAsset: {fileID: 0} +--- !u!137 &2827962871058561339 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -1800213932466231045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + m_PrefabInstance: {fileID: 4628200443042091456} + m_PrefabAsset: {fileID: 0} +--- !u!137 &3539558469337834170 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 8153101253863224186, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + m_PrefabInstance: {fileID: 4628200443042091456} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5165649342843401771 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + m_PrefabInstance: {fileID: 4628200443042091456} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5547240782841867409 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + m_PrefabInstance: {fileID: 4628200443042091456} + m_PrefabAsset: {fileID: 0} +--- !u!95 &6304939419498623454 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5547240782841867409} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: 644cb63bc5228d44e901a3251d09e8cd, type: 3} + m_Controller: {fileID: 22100000, guid: 30a50c33877c30d48a67402cc09c1029, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &2269618926873949942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5547240782841867409} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6ac57edc8fc02840a5887fc4ad996e1, type: 3} + m_Name: + m_EditorClassIdentifier: + debug: 0 + animator: {fileID: 6304939419498623454} + layerInfos: [] +--- !u!114 &3269250633790738649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5547240782841867409} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9f1e70fb5667ce84ab5295a61fa76234, type: 3} + m_Name: + m_EditorClassIdentifier: + stateMachine: + states: [] + _currentStateName: + debug: 0 + transitionOnNextFrame: 0 + item: {fileID: 11400000, guid: 5e50b5a1c5542da46b92f4cf7bbd5043, type: 2} + animator: {fileID: 2269618926873949942} + renderers: + - {fileID: 456800702483242086} + - {fileID: 3539558469337834170} + - {fileID: 6797791864527372870} + - {fileID: 2827962871058561339} + cameraTransform: {fileID: 2054254639170952763} + meleeService: + rid: 806583611772633088 + throwPoint: {fileID: 5165649342843401771} + throwForce: 16 + throwAction: {fileID: 2849415906997320802, guid: e0e9267cab824e8489fc27d83f1d07b7, + type: 3} + references: + version: 2 + RefIds: + - rid: 806583611772633088 + type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime} + data: +--- !u!137 &6797791864527372870 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 2192180338147824518, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + m_PrefabInstance: {fileID: 4628200443042091456} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4960656506693216971 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Artists/Prefabs/Props/Bouncing Betty.prefab b/Assets/Artists/Prefabs/Props/Prop Bouncing Betty.prefab similarity index 99% rename from Assets/Artists/Prefabs/Props/Bouncing Betty.prefab rename to Assets/Artists/Prefabs/Props/Prop Bouncing Betty.prefab index 604c22fe9..1a0545640 100644 --- a/Assets/Artists/Prefabs/Props/Bouncing Betty.prefab +++ b/Assets/Artists/Prefabs/Props/Prop Bouncing Betty.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 1303898904214839384} - component: {fileID: 7713224582118482445} m_Layer: 16 - m_Name: Bouncing Betty + m_Name: Prop Bouncing Betty m_TagString: Untagged m_Icon: {fileID: 2974397684917235467, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 diff --git a/Assets/Artists/Prefabs/Props/Grenade.prefab b/Assets/Artists/Prefabs/Props/Prop Grenade.prefab similarity index 99% rename from Assets/Artists/Prefabs/Props/Grenade.prefab rename to Assets/Artists/Prefabs/Props/Prop Grenade.prefab index 06e13ae7c..ff1fccf95 100644 --- a/Assets/Artists/Prefabs/Props/Grenade.prefab +++ b/Assets/Artists/Prefabs/Props/Prop Grenade.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 2790648435517538154} - component: {fileID: 6550306330222230957} m_Layer: 16 - m_Name: Grenade + m_Name: Prop Grenade m_TagString: Untagged m_Icon: {fileID: 2974397684917235467, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 diff --git a/Assets/Artists/Prefabs/Props/Prop Throwing Knife.prefab b/Assets/Artists/Prefabs/Props/Prop Throwing Knife.prefab new file mode 100644 index 000000000..759caabaa --- /dev/null +++ b/Assets/Artists/Prefabs/Props/Prop Throwing Knife.prefab @@ -0,0 +1,192 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2860288370872289594 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalPosition.x + value: 24.532635 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.429 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalPosition.z + value: -31.00585 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5568371526223589888, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 2800000, guid: 8b7801fa09bb3cc47a85b7e2d329eab7, type: 3} + - target: {fileID: 919132149155446097, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_Name + value: Prop Throwing Knife + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 8513859187771203891, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + propertyPath: m_Layer + value: 16 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1326478578008943497} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1162520792426995438} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1059363781722993272} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + insertIndex: -1 + addedObject: {fileID: 626853534020189990} + m_SourcePrefab: {fileID: 100100000, guid: a5afe13492c9acf478def44319cb3619, type: 3} +--- !u!1 &3130178554240382059 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + m_PrefabInstance: {fileID: 2860288370872289594} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1326478578008943497 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3130178554240382059} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 2 + m_Constraints: 0 + m_CollisionDetection: 3 +--- !u!65 &1162520792426995438 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3130178554240382059} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.07580185, y: 0.077313334, z: 0.35261536} + m_Center: {x: -0.002090454, y: -0.005558327, z: -0.15432549} +--- !u!114 &1059363781722993272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3130178554240382059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f5706f4e6c5bdac4eb8decf5c7b3a4ba, type: 3} + m_Name: + m_EditorClassIdentifier: + prefab: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, type: 3} + rigidbody: {fileID: 1326478578008943497} +--- !u!114 &626853534020189990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3130178554240382059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ddbd9772dd26e3048a27118849c3b7a2, type: 3} + m_Name: + m_EditorClassIdentifier: + rigidbody: {fileID: 1326478578008943497} + damage: 100 + force: 512 + layerMask: + serializedVersion: 2 + m_Bits: 513 diff --git a/Assets/Artists/Prefabs/Rig/Hitbox.prefab b/Assets/Artists/Prefabs/Rig/Hitbox.prefab index 09bab411d..0a63dc1e9 100644 --- a/Assets/Artists/Prefabs/Rig/Hitbox.prefab +++ b/Assets/Artists/Prefabs/Rig/Hitbox.prefab @@ -12,7 +12,7 @@ GameObject: m_Layer: 9 m_Name: Hitbox m_TagString: Untagged - m_Icon: {fileID: 0} + m_Icon: {fileID: 2974397684917235467, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 diff --git a/Assets/Artists/Prefabs/Rig/Physics Variant.prefab b/Assets/Artists/Prefabs/Rig/Physics Variant.prefab index 4de088381..4097edf88 100644 --- a/Assets/Artists/Prefabs/Rig/Physics Variant.prefab +++ b/Assets/Artists/Prefabs/Rig/Physics Variant.prefab @@ -989,22 +989,22 @@ ConfigurableJoint: spring: 0 damper: 0 m_LowAngularXLimit: - limit: 0 + limit: -177 bounciness: 0 contactDistance: 0 m_HighAngularXLimit: - limit: 0 + limit: -1.3722992 bounciness: 0 contactDistance: 0 m_AngularYZLimitSpring: spring: 0 damper: 0 m_AngularYLimit: - limit: 0 + limit: 36.547386 bounciness: 0 contactDistance: 0 m_AngularZLimit: - limit: 0 + limit: 45.004425 bounciness: 0 contactDistance: 0 m_TargetPosition: {x: 0, y: 0, z: 0} @@ -2502,22 +2502,22 @@ ConfigurableJoint: spring: 0 damper: 0 m_LowAngularXLimit: - limit: 0 + limit: -177 bounciness: 0 contactDistance: 0 m_HighAngularXLimit: - limit: 0 + limit: -0.08393097 bounciness: 0 contactDistance: 0 m_AngularYZLimitSpring: spring: 0 damper: 0 m_AngularYLimit: - limit: 0 + limit: 83.52953 bounciness: 0 contactDistance: 0 m_AngularZLimit: - limit: 0 + limit: 75.923065 bounciness: 0 contactDistance: 0 m_TargetPosition: {x: 0, y: 0, z: 0} diff --git a/Assets/Artists/Scenes/DMZ.unity b/Assets/Artists/Scenes/DMZ.unity index 04db7e378..48fcb0c6c 100644 --- a/Assets/Artists/Scenes/DMZ.unity +++ b/Assets/Artists/Scenes/DMZ.unity @@ -1147,22 +1147,22 @@ PrefabInstance: - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e, type: 3} propertyPath: m_LocalPosition.x - value: 53.821 + value: 22.661001 objectReference: {fileID: 0} - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e, type: 3} propertyPath: m_LocalPosition.y - value: 1.4299991 + value: 2.1051528 objectReference: {fileID: 0} - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e, type: 3} propertyPath: m_LocalPosition.z - value: -62.513924 + value: 21.766075 objectReference: {fileID: 0} - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e, type: 3} @@ -1172,7 +1172,7 @@ PrefabInstance: - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e, type: 3} @@ -6101,6 +6101,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 999499001} m_Modifications: + - target: {fileID: 1630585989029977934, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 2800000, guid: d22a905659f1ea943b37b1497da7ce44, type: 3} - target: {fileID: 1630585989029977934, guid: 5f9e9216c9925af4bafec02dca8c438e, type: 3} propertyPath: m_Name @@ -6298,14 +6303,14 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 928805569} - - targetCorrespondingSourceObject: {fileID: 1503221912631104856, guid: 5f9e9216c9925af4bafec02dca8c438e, + - targetCorrespondingSourceObject: {fileID: 7036148079364461546, guid: 5f9e9216c9925af4bafec02dca8c438e, type: 3} insertIndex: -1 - addedObject: {fileID: 1703397500} - - targetCorrespondingSourceObject: {fileID: 744031168225087838, guid: 5f9e9216c9925af4bafec02dca8c438e, + addedObject: {fileID: 1594314425} + - targetCorrespondingSourceObject: {fileID: 4498669756109410294, guid: 5f9e9216c9925af4bafec02dca8c438e, type: 3} insertIndex: -1 - addedObject: {fileID: 913705234} + addedObject: {fileID: 1831403506} m_SourcePrefab: {fileID: 100100000, guid: 5f9e9216c9925af4bafec02dca8c438e, type: 3} --- !u!54 &125219455 stripped Rigidbody: @@ -7586,57 +7591,57 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2924693015492943149, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 2924693015492943149, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_Name - value: Bouncing Betty (1) + value: Prop Bouncing Betty (1) objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalPosition.x value: 37.809998 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalPosition.z value: -32.03 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 @@ -7645,7 +7650,7 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: fb120cc0b5f76434da0fe379afda7f28, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: c428ece331627314182ac8c2dadcb051, type: 3} --- !u!1001 &166710438 PrefabInstance: m_ObjectHideFlags: 0 @@ -24309,7 +24314,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh36382 + m_Name: pb_Mesh36434 serializedVersion: 11 m_SubMeshes: - serializedVersion: 2 @@ -25573,6 +25578,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 538094450} m_PrefabAsset: {fileID: 0} +--- !u!1 &539757292 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4498669756109410294, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} --- !u!1001 &540354597 PrefabInstance: m_ObjectHideFlags: 0 @@ -25836,6 +25847,74 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2096711820} m_PrefabAsset: {fileID: 0} +--- !u!1001 &546975967 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.x + value: 29.727583 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.054 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.z + value: -31.572662 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695775, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_Name + value: Throwing Knife (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1f4b86271ef90774495a3444f525ca20, type: 3} --- !u!1001 &549755845 PrefabInstance: m_ObjectHideFlags: 0 @@ -36581,6 +36660,74 @@ Transform: type: 3} m_PrefabInstance: {fileID: 738277549} m_PrefabAsset: {fileID: 0} +--- !u!1001 &738588375 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.x + value: 30.227583 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.054 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.z + value: -31.572662 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695775, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_Name + value: Throwing Knife (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1f4b86271ef90774495a3444f525ca20, type: 3} --- !u!1001 &738940357 PrefabInstance: m_ObjectHideFlags: 0 @@ -45157,12 +45304,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 913402460} m_PrefabAsset: {fileID: 0} ---- !u!1 &913705229 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 744031168225087838, guid: 5f9e9216c9925af4bafec02dca8c438e, - type: 3} - m_PrefabInstance: {fileID: 125219454} - m_PrefabAsset: {fileID: 0} --- !u!4 &913705230 stripped Transform: m_CorrespondingSourceObject: {fileID: 2582995021366606041, guid: 5f9e9216c9925af4bafec02dca8c438e, @@ -45175,108 +45316,6 @@ Rigidbody: type: 3} m_PrefabInstance: {fileID: 125219454} m_PrefabAsset: {fileID: 0} ---- !u!153 &913705234 -ConfigurableJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 913705229} - m_ConnectedBody: {fileID: 1803569864} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: 0, z: 0} - m_Axis: {x: 1, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -0.00000028469233, y: 0.0000007450581, z: -0.000000106891676} - serializedVersion: 3 - m_SecondaryAxis: {x: 0, y: 1, z: 0} - m_XMotion: 1 - m_YMotion: 1 - m_ZMotion: 1 - m_AngularXMotion: 2 - m_AngularYMotion: 2 - m_AngularZMotion: 2 - m_LinearLimitSpring: - spring: 0 - damper: 0 - m_LinearLimit: - limit: 0 - bounciness: 0 - contactDistance: 0 - m_AngularXLimitSpring: - spring: 0 - damper: 0 - m_LowAngularXLimit: - limit: 0 - bounciness: 0 - contactDistance: 0 - m_HighAngularXLimit: - limit: 0 - bounciness: 0 - contactDistance: 0 - m_AngularYZLimitSpring: - spring: 0 - damper: 0 - m_AngularYLimit: - limit: 0 - bounciness: 0 - contactDistance: 0 - m_AngularZLimit: - limit: 0 - bounciness: 0 - contactDistance: 0 - m_TargetPosition: {x: 0, y: 0, z: 0} - m_TargetVelocity: {x: 0, y: 0, z: 0} - m_XDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_YDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_ZDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} - m_TargetAngularVelocity: {x: 0, y: 0, z: 0} - m_RotationDriveMode: 0 - m_AngularXDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_AngularYZDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_SlerpDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_ProjectionMode: 0 - m_ProjectionDistance: 0.1 - m_ProjectionAngle: 180 - m_ConfiguredInWorldSpace: 0 - m_SwapBodies: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 --- !u!1001 &917218663 PrefabInstance: m_ObjectHideFlags: 0 @@ -50145,6 +50184,7 @@ GameObject: - component: {fileID: 999499002} - component: {fileID: 999499008} - component: {fileID: 999499009} + - component: {fileID: 999499010} m_Layer: 6 m_Name: Physics Zombie m_TagString: Untagged @@ -50161,7 +50201,7 @@ Transform: m_GameObject: {fileID: 999499000} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 23.98, y: 0, z: -34.22} + m_LocalPosition: {x: 23.98, y: 0, z: -35.615} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -50250,7 +50290,10 @@ MonoBehaviour: animator: {fileID: 0} rigidbodies: [] ragdollColliders: [] - joint: {fileID: 928805569} + joints: + - {fileID: 928805569} + - {fileID: 1594314425} + - {fileID: 1831403506} rigidbody: {fileID: 125219455} --- !u!114 &999499006 MonoBehaviour: @@ -50264,8 +50307,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 085a82cd092152541adfdf24c9f42394, type: 3} m_Name: m_EditorClassIdentifier: - healthPoint: 100 - maxHealthPoint: 100 + healthPoint: 250 + maxHealthPoint: 250 --- !u!114 &999499007 MonoBehaviour: m_ObjectHideFlags: 0 @@ -50286,7 +50329,7 @@ Rigidbody: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 999499000} serializedVersion: 4 - m_Mass: 1 + m_Mass: 75 m_Drag: 0 m_AngularDrag: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} @@ -50327,6 +50370,20 @@ MonoBehaviour: references: version: 2 RefIds: [] +--- !u!114 &999499010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999499000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 06de94b4999fff4439ec97306407e472, type: 3} + m_Name: + m_EditorClassIdentifier: + respawnInterval: + Interval: 5 --- !u!1001 &1001131830 PrefabInstance: m_ObjectHideFlags: 0 @@ -71538,6 +71595,11 @@ PrefabInstance: propertyPath: m_Sources.Array.data[0].sourceTransform value: objectReference: {fileID: 2048394489} + - target: {fileID: 150634226952185381, guid: d6020a576e13b6d43bd1143a33ff7f8e, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 0} - target: {fileID: 150634226952185381, guid: d6020a576e13b6d43bd1143a33ff7f8e, type: 3} propertyPath: m_Name @@ -77803,6 +77865,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1580999911} m_PrefabAsset: {fileID: 0} +--- !u!1 &1587622263 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7036148079364461546, guid: 5f9e9216c9925af4bafec02dca8c438e, + type: 3} + m_PrefabInstance: {fileID: 125219454} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1590485126 PrefabInstance: m_ObjectHideFlags: 0 @@ -77870,6 +77938,108 @@ Rigidbody: type: 3} m_PrefabInstance: {fileID: 125219454} m_PrefabAsset: {fileID: 0} +--- !u!153 &1594314425 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587622263} + m_ConnectedBody: {fileID: 1192066506} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: -0.00000051409006, y: 0.000000029802443, z: -0.00000008583148} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 1 + m_YMotion: 1 + m_ZMotion: 1 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &1595874953 PrefabInstance: m_ObjectHideFlags: 0 @@ -82577,6 +82747,74 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1688641687} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1690082177 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.x + value: 29.477583 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.054 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.z + value: -31.572662 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695775, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_Name + value: Throwing Knife (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1f4b86271ef90774495a3444f525ca20, type: 3} --- !u!1001 &1701514085 PrefabInstance: m_ObjectHideFlags: 0 @@ -82675,12 +82913,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1701514085} m_PrefabAsset: {fileID: 0} ---- !u!1 &1703397495 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1503221912631104856, guid: 5f9e9216c9925af4bafec02dca8c438e, - type: 3} - m_PrefabInstance: {fileID: 125219454} - m_PrefabAsset: {fileID: 0} --- !u!4 &1703397496 stripped Transform: m_CorrespondingSourceObject: {fileID: 4160932145006727695, guid: 5f9e9216c9925af4bafec02dca8c438e, @@ -82693,108 +82925,6 @@ Rigidbody: type: 3} m_PrefabInstance: {fileID: 125219454} m_PrefabAsset: {fileID: 0} ---- !u!153 &1703397500 -ConfigurableJoint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1703397495} - m_ConnectedBody: {fileID: 589450236} - m_ConnectedArticulationBody: {fileID: 0} - m_Anchor: {x: 0, y: 0, z: 0} - m_Axis: {x: 1, y: 0, z: 0} - m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0.00000028469216, y: 0.00000055134296, z: -0.0000000719226} - serializedVersion: 3 - m_SecondaryAxis: {x: 0, y: 1, z: 0} - m_XMotion: 1 - m_YMotion: 1 - m_ZMotion: 1 - m_AngularXMotion: 2 - m_AngularYMotion: 2 - m_AngularZMotion: 2 - m_LinearLimitSpring: - spring: 0 - damper: 0 - m_LinearLimit: - limit: 0 - bounciness: 0 - contactDistance: 0 - m_AngularXLimitSpring: - spring: 0 - damper: 0 - m_LowAngularXLimit: - limit: 0 - bounciness: 0 - contactDistance: 0 - m_HighAngularXLimit: - limit: 0 - bounciness: 0 - contactDistance: 0 - m_AngularYZLimitSpring: - spring: 0 - damper: 0 - m_AngularYLimit: - limit: 0 - bounciness: 0 - contactDistance: 0 - m_AngularZLimit: - limit: 0 - bounciness: 0 - contactDistance: 0 - m_TargetPosition: {x: 0, y: 0, z: 0} - m_TargetVelocity: {x: 0, y: 0, z: 0} - m_XDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_YDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_ZDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} - m_TargetAngularVelocity: {x: 0, y: 0, z: 0} - m_RotationDriveMode: 0 - m_AngularXDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_AngularYZDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_SlerpDrive: - serializedVersion: 4 - positionSpring: 0 - positionDamper: 0 - maximumForce: 3.4028233e+38 - useAcceleration: 0 - m_ProjectionMode: 0 - m_ProjectionDistance: 0.1 - m_ProjectionAngle: 180 - m_ConfiguredInWorldSpace: 0 - m_SwapBodies: 0 - m_BreakForce: Infinity - m_BreakTorque: Infinity - m_EnableCollision: 0 - m_EnablePreprocessing: 1 - m_MassScale: 1 - m_ConnectedMassScale: 1 --- !u!1001 &1705219438 PrefabInstance: m_ObjectHideFlags: 0 @@ -87123,6 +87253,74 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1001 &1808263179 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.x + value: 29.977583 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.054 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.z + value: -31.572662 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695775, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_Name + value: Throwing Knife (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1f4b86271ef90774495a3444f525ca20, type: 3} --- !u!1001 &1809707989 PrefabInstance: m_ObjectHideFlags: 0 @@ -88056,6 +88254,108 @@ Rigidbody: type: 3} m_PrefabInstance: {fileID: 125219454} m_PrefabAsset: {fileID: 0} +--- !u!153 &1831403506 +ConfigurableJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 539757292} + m_ConnectedBody: {fileID: 61786858} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0, y: 0, z: 0} + m_Axis: {x: 1, y: 0, z: 0} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: 0.0000005736947, y: 0.000000029802457, z: -0.00000008583149} + serializedVersion: 3 + m_SecondaryAxis: {x: 0, y: 1, z: 0} + m_XMotion: 1 + m_YMotion: 1 + m_ZMotion: 1 + m_AngularXMotion: 1 + m_AngularYMotion: 1 + m_AngularZMotion: 1 + m_LinearLimitSpring: + spring: 0 + damper: 0 + m_LinearLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularXLimitSpring: + spring: 0 + damper: 0 + m_LowAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_HighAngularXLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularYZLimitSpring: + spring: 0 + damper: 0 + m_AngularYLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_AngularZLimit: + limit: 0 + bounciness: 0 + contactDistance: 0 + m_TargetPosition: {x: 0, y: 0, z: 0} + m_TargetVelocity: {x: 0, y: 0, z: 0} + m_XDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_YDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_TargetRotation: {x: 0, y: 0, z: 0, w: 1} + m_TargetAngularVelocity: {x: 0, y: 0, z: 0} + m_RotationDriveMode: 0 + m_AngularXDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_AngularYZDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_SlerpDrive: + serializedVersion: 4 + positionSpring: 0 + positionDamper: 0 + maximumForce: 3.4028233e+38 + useAcceleration: 0 + m_ProjectionMode: 0 + m_ProjectionDistance: 0.1 + m_ProjectionAngle: 180 + m_ConfiguredInWorldSpace: 0 + m_SwapBodies: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1001 &1833093002 PrefabInstance: m_ObjectHideFlags: 0 @@ -101495,8 +101795,7 @@ PrefabInstance: type: 3} propertyPath: m_Icon value: - objectReference: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, - type: 0} + objectReference: {fileID: 2800000, guid: 8488d765ec5d03d41bf712726444696f, type: 3} - target: {fileID: 919132149155446097, guid: b805b0f643b3776478b9ea3e6701ebb8, type: 3} propertyPath: m_Name @@ -127357,57 +127656,57 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2924693015492943149, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 2924693015492943149, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_Name - value: Bouncing Betty + value: Prop Bouncing Betty objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalPosition.x value: 31.56 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalPosition.z value: -35.78 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7265850983360665320, guid: fb120cc0b5f76434da0fe379afda7f28, + - target: {fileID: 7265850983360665320, guid: c428ece331627314182ac8c2dadcb051, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 @@ -127416,7 +127715,7 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: fb120cc0b5f76434da0fe379afda7f28, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: c428ece331627314182ac8c2dadcb051, type: 3} --- !u!1001 &1188891078137991118 PrefabInstance: m_ObjectHideFlags: 0 @@ -128375,6 +128674,74 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a8bd7b6ce1ab58d41866f47f7768e6d6, type: 3} +--- !u!1001 &5442734665859925508 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.x + value: 29.227583 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.054 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalPosition.z + value: -31.572662 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695768, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3894949042580695775, guid: 1f4b86271ef90774495a3444f525ca20, + type: 3} + propertyPath: m_Name + value: Throwing Knife + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1f4b86271ef90774495a3444f525ca20, type: 3} --- !u!1001 &5728103306521437659 PrefabInstance: m_ObjectHideFlags: 0 @@ -128443,6 +128810,79 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc75a0fddbed3cd449eeb3c41a63dafa, type: 3} +--- !u!1001 &8152371715330544400 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1162520792426995438, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: m_Center.z + value: 0.1543255 + objectReference: {fileID: 0} + - target: {fileID: 2322573603674746577, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: m_LocalPosition.x + value: 24.532635 + objectReference: {fileID: 0} + - target: {fileID: 2322573603674746577, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.429 + objectReference: {fileID: 0} + - target: {fileID: 2322573603674746577, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: m_LocalPosition.z + value: -31.00585 + objectReference: {fileID: 0} + - target: {fileID: 2322573603674746577, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2322573603674746577, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2322573603674746577, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2322573603674746577, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2322573603674746577, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2322573603674746577, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2322573603674746577, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3130178554240382059, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: m_Name + value: Prop_Throwing Knife + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2317f3177236a6d4d9bc28b8d669fca2, type: 3} --- !u!1001 &8235205982781951058 PrefabInstance: m_ObjectHideFlags: 0 @@ -128584,3 +129024,9 @@ SceneRoots: - {fileID: 1368139029} - {fileID: 8235205982781951058} - {fileID: 138017611848021903} + - {fileID: 5442734665859925508} + - {fileID: 738588375} + - {fileID: 1808263179} + - {fileID: 546975967} + - {fileID: 1690082177} + - {fileID: 8152371715330544400} diff --git a/Assets/Artists/Scripts/Equip/ThrowController.cs b/Assets/Artists/Scripts/Equip/ThrowController.cs index 902a12743..ab1847c13 100644 --- a/Assets/Artists/Scripts/Equip/ThrowController.cs +++ b/Assets/Artists/Scripts/Equip/ThrowController.cs @@ -51,7 +51,7 @@ namespace BITFALL.Throws { isHolding = false; base.Entry(); - animator.Play(BITConstant.Player.Draw); + animator.Play(BITConstant.Player.Draw); } private void OnThrow(InputAction.CallbackContext obj) @@ -82,6 +82,7 @@ namespace BITFALL.Throws if (!_equipmentContainer.TryUseEquip()) return; var instance = _assetableThrow.GetInstance(); if (!instance.TryGetComponent(out var _rigidbody)) return; + _rigidbody.rotation = throwPoint.rotation; _rigidbody.position = throwPoint.position; _rigidbody.AddForce(throwPoint.forward * throwForce, ForceMode.VelocityChange); } diff --git a/Assets/Artists/Scripts/Props/Prop_ReplaceOnSleep.cs b/Assets/Artists/Scripts/Props/Prop_ReplaceOnSleep.cs new file mode 100644 index 000000000..ad5bd4b06 --- /dev/null +++ b/Assets/Artists/Scripts/Props/Prop_ReplaceOnSleep.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using BITKit; +using UnityEngine; +using UnityEngine.Animations; + +namespace BITFALL.Props +{ + public class Prop_ReplaceOnSleep : MonoBehaviour + { + [SerializeField] private Transform prefab; + [SerializeField] private new Rigidbody rigidbody; + private readonly IntervalUpdate _interval = new(0.16f); + private Collider _collider; + private void FixedUpdate() + { + if (rigidbody.IsSleeping() && _interval.AllowUpdate) + { + ReplaceImmediate(_collider.transform); + } + } + + public void ReplaceImmediate(Transform root=null) + { + var _transform = transform; + var instance = Instantiate(prefab); + instance.SetPositionAndRotation(_transform.position, _transform.rotation); + + if (root is not null) + { + instance.SetParentConstraint(root); + if (instance.TryGetComponent(out var _rigidbody)) + { + //_rigidbody.isKinematic = true; + _rigidbody.isKinematic = true; + } + } + Destroy(gameObject); + } + + private void OnCollisionEnter(Collision other) + { + _collider = other.collider; + } + + private void OnCollisionStay(Collision other) + { + _collider = other.collider; + } + } +} diff --git a/Assets/Artists/Scripts/Props/Prop_Throw.cs b/Assets/Artists/Scripts/Props/Prop_Throw.cs new file mode 100644 index 000000000..18b245190 --- /dev/null +++ b/Assets/Artists/Scripts/Props/Prop_Throw.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using BITKit; +using BITKit.Entities; +using Cysharp.Threading.Tasks; +using UnityEngine; + +namespace BITFALL.Props +{ + public class Prop_Throw : MonoBehaviour + { + [SerializeField] private new Rigidbody rigidbody; + [SerializeField] private int damage; + [SerializeField] private int force; + [SerializeField] private LayerMask layerMask; + private void FixedUpdate() + { + if (Physics.Linecast(rigidbody.position, rigidbody.position + rigidbody.velocity * Time.fixedDeltaTime, + out var hit, + layerMask + )) + { + var _rigidbody = hit.rigidbody; + if(hit.collider.transform.TryGetComponent(out var damagable)) + { + damagable.GiveDamage(new DamageMessage() + { + Target = damagable.Entity, + Damage = damage, + Location = new Location() + { + position = hit.point, + rotation = Quaternion.LookRotation(hit.normal), + forward = hit.normal, + } + }); + if(damagable.Rigidbody is not null) + { + _rigidbody = damagable.Rigidbody; + } + } + if (_rigidbody) + { + _rigidbody.AddForceAtPositionAsync((hit.point-rigidbody.position).normalized * force, hit.point, ForceMode.Impulse).Forget(); + } + rigidbody.Sleep(); + + if (TryGetComponent(out var replace)) + { + replace.ReplaceImmediate(hit.collider.transform); + } + } + } + } + +} diff --git a/Assets/BITKit/Unity/Scripts/Entity/Components/EntityMovement/RigidbodyBasedMovement.cs b/Assets/BITKit/Unity/Scripts/Entity/Components/EntityMovement/RigidbodyBasedMovement.cs index 9aa67954a..5a46b8884 100644 --- a/Assets/BITKit/Unity/Scripts/Entity/Components/EntityMovement/RigidbodyBasedMovement.cs +++ b/Assets/BITKit/Unity/Scripts/Entity/Components/EntityMovement/RigidbodyBasedMovement.cs @@ -20,6 +20,11 @@ namespace BITKit.Entities.Movement public Vector3 GroundVelocity { get; } public Vector3 AngularVelocity { get; } public bool IsGrounded { get; } + + [Inject(true)] + private IHealth health; + + public void SyncMovement(Vector3 velocity, Vector3 position, Quaternion rotation, bool isGrounded) { } @@ -37,6 +42,20 @@ namespace BITKit.Entities.Movement } public event Action OnCommand; + public override void OnAwake() + { + base.OnAwake(); + if (health is not null) + { + health.OnSetAlive += OnSetAlive; + } + } + + private void OnSetAlive(bool obj) + { + rigidbody.isKinematic = !obj; + } + public override void OnFixedUpdate(float deltaTime) { rigidbody.MovePosition(rigidbody.position + Velocity * deltaTime diff --git a/Assets/BITKit/Unity/Scripts/Entity/Components/Health/AutoRespawnComponent.cs b/Assets/BITKit/Unity/Scripts/Entity/Components/Health/AutoRespawnComponent.cs index cfa303245..c5ae31694 100644 --- a/Assets/BITKit/Unity/Scripts/Entity/Components/Health/AutoRespawnComponent.cs +++ b/Assets/BITKit/Unity/Scripts/Entity/Components/Health/AutoRespawnComponent.cs @@ -1,5 +1,8 @@ +using System; using System.Collections; using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; using BITKit.Entities; using UnityEngine; @@ -10,44 +13,37 @@ namespace BITKit [SerializeField] private IntervalUpdate respawnInterval; private bool requestRespawn; [Inject] private IHealth _health; + private int _initialHp; + + private CancellationTokenSource _cancellationTokenSource; public override void OnAwake() { + _initialHp=_health.HealthPoint; _health.OnSetAlive += OnSetAlive; - _health.OnSetHealthPoint += OnSetHP; } - - public override void OnUpdate(float deltaTime) - { - if (requestRespawn && respawnInterval.AllowUpdate) - { - requestRespawn = false; - Execute(); - } - } - - public void OnSetAlive(bool alive) + private async void OnSetAlive(bool alive) { if (alive) { - requestRespawn = false; + _cancellationTokenSource?.Cancel(); } else { - respawnInterval.Reset(); - requestRespawn = true; + _cancellationTokenSource?.Cancel(); + _cancellationTokenSource = new CancellationTokenSource(); + try + { + await Task.Delay(TimeSpan.FromSeconds(respawnInterval.Interval), _cancellationTokenSource.Token); + destroyCancellationToken.ThrowIfCancellationRequested(); + Execute(); + } + catch (OperationCanceledException){} } } - public void OnSetHP(int hp) - { - - } - public void Execute() { - if (TryGetComponent(out var health)) - { - health.HealthPoint = 100; - } + if (_health.IsAlive is false) + _health.HealthPoint = _initialHp; } } diff --git a/Assets/BITKit/Unity/Scripts/Entity/Components/Physics/EntityPhysics.cs b/Assets/BITKit/Unity/Scripts/Entity/Components/Physics/EntityPhysics.cs index 1f963a527..bb8baf0f1 100644 --- a/Assets/BITKit/Unity/Scripts/Entity/Components/Physics/EntityPhysics.cs +++ b/Assets/BITKit/Unity/Scripts/Entity/Components/Physics/EntityPhysics.cs @@ -13,18 +13,40 @@ namespace BITKit.Entities [SerializeField] private Animator animator; [SerializeField] private Rigidbody[] rigidbodies; [SerializeField] private Collider[] ragdollColliders; - [SerializeField] private Joint joint; + [SerializeField] private Joint[] joints; [SerializeField] private new Rigidbody rigidbody; private CancellationToken _cancellationToken; [Inject] private IHealth _health; + private readonly Dictionary _jointXMotions=new(); + private readonly Dictionary _jointYMotions=new(); + private readonly Dictionary _jointZMotions=new(); + private readonly Dictionary _jointAngularXMotions=new(); + private readonly Dictionary _jointAngularYMotions=new(); + private readonly Dictionary _jointAngularZMotions=new(); + public override void OnAwake() { _health.OnSetAlive += OnSetAlive; _health.OnSetHealthPoint += OnSetHP; _cancellationToken = entity.Get(); + foreach (var x in joints) + { + switch (x) + { + case ConfigurableJoint configurableJoint: + _jointXMotions.Add(configurableJoint,configurableJoint.xMotion); + _jointYMotions.Add(configurableJoint,configurableJoint.yMotion); + _jointZMotions.Add(configurableJoint,configurableJoint.zMotion); + _jointAngularXMotions.Add(configurableJoint,configurableJoint.angularXMotion); + _jointAngularYMotions.Add(configurableJoint,configurableJoint.angularYMotion); + _jointAngularZMotions.Add(configurableJoint,configurableJoint.angularZMotion); + break; + } + } } - private async void OnSetAlive(bool alive) + + private async void OnSetAlive(bool alive) { IsPhysics = !alive; if (animator) @@ -38,15 +60,29 @@ namespace BITKit.Entities } catch (OperationCanceledException) { - + } - if (alive is false && joint is not null) + foreach (var joint in joints) { - Destroy(joint); + switch (joint) + { + case ConfigurableJoint configurableJoint: + configurableJoint.xMotion = alive ? _jointXMotions[joint] : ConfigurableJointMotion.Free; + configurableJoint.yMotion = alive ? _jointYMotions[joint] : ConfigurableJointMotion.Free; + configurableJoint.zMotion = alive ? _jointZMotions[joint] : ConfigurableJointMotion.Free; + configurableJoint.angularXMotion = + alive ? _jointAngularXMotions[joint] : ConfigurableJointMotion.Free; + configurableJoint.angularYMotion = + alive ? _jointAngularYMotions[joint] : ConfigurableJointMotion.Free; + configurableJoint.angularZMotion = + alive ? _jointAngularZMotions[joint] : ConfigurableJointMotion.Free; + break; + } } - + } + public void OnSetHP(int hp) { } diff --git a/Assets/BITKit/Unity/Scripts/Entity/Core/Entity.cs b/Assets/BITKit/Unity/Scripts/Entity/Core/Entity.cs index 33dcaa85c..f678d224a 100644 --- a/Assets/BITKit/Unity/Scripts/Entity/Core/Entity.cs +++ b/Assets/BITKit/Unity/Scripts/Entity/Core/Entity.cs @@ -61,7 +61,7 @@ namespace BITKit.Entities } else if(attribute?.CanBeNull is false) { - BIT4Log.Warning($"{name}未找到{type.FullName}"); + BIT4Log.Warning($"{name}未找到{obj.GetType().Name}需要的{type.FullName}"); BIT4Log.Warning(genericEvent.GetDiagnostics()); } } diff --git a/Assets/BITKit/Unity/Scripts/Extensions/ConstraintExtensions.cs b/Assets/BITKit/Unity/Scripts/Extensions/ConstraintExtensions.cs new file mode 100644 index 000000000..a3bf6b25b --- /dev/null +++ b/Assets/BITKit/Unity/Scripts/Extensions/ConstraintExtensions.cs @@ -0,0 +1,56 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Animations; +using UnityEngine.Assertions; + +namespace BITKit +{ + public static class ConstraintExtensions + { + public static ParentConstraint SetParentConstraint(this Transform target, Transform parentSource, + ParentConstraint constraint = null) + { + Assert.IsTrue(!constraint || target == constraint.transform); + + if (!constraint) + { + if (!parentSource) return null; + constraint = target.gameObject.AddComponent(); + } + + // 清空已有约束 + constraint.constraintActive = false; + for (int i = constraint.sourceCount - 1; i >= 0; i--) + { + constraint.RemoveSource(i); + } + + // 无约束 + if (!parentSource) return constraint; + + // 设置新约束 + constraint.AddSource(new ConstraintSource + { + sourceTransform = parentSource, + weight = 1, + }); + + // 设置 Position offset + var positionOffset = parentSource.InverseTransformPoint(target.position); + constraint.SetTranslationOffset(0, positionOffset); + + // 设置 Rotation offset + var localForward = parentSource.InverseTransformDirection(target.forward); + var localUpward = parentSource.InverseTransformDirection(target.up); + var rotationOffset = Quaternion.LookRotation(localForward, localUpward).eulerAngles; + constraint.SetRotationOffset(0, rotationOffset); + + // 激活约束 + constraint.constraintActive = true; + + return constraint; + } + } + +} diff --git a/Assets/BITKit/Unity/Scripts/Physics/PhysicsBasedAnimation.cs b/Assets/BITKit/Unity/Scripts/Physics/PhysicsBasedAnimation.cs index f9ef95f28..79ba474af 100644 --- a/Assets/BITKit/Unity/Scripts/Physics/PhysicsBasedAnimation.cs +++ b/Assets/BITKit/Unity/Scripts/Physics/PhysicsBasedAnimation.cs @@ -24,7 +24,6 @@ namespace BITKit.Physics [SerializeField] private Optional overrideMotion; [SerializeField] private Optional overrideAngularMotion; - private void Start() { foreach (var x in jointConfigures) @@ -45,12 +44,10 @@ namespace BITKit.Physics { jointConfigure.joint.angularXDrive = drive; jointConfigure.joint.angularYZDrive = drive; - // jointConfigure.joint.targetRotation = - // Quaternion.Lerp( - // Quaternion.identity, - // Quaternion.Inverse(jointConfigure.animate.localRotation) * jointConfigure.InitialRotation, - // Blend - // ); + jointConfigure.joint.xDrive = drive; + jointConfigure.joint.yDrive = drive; + jointConfigure.joint.zDrive = drive; + jointConfigure.joint.targetRotation = Quaternion.Inverse(jointConfigure.animate.localRotation) * jointConfigure.InitialRotation; jointConfigure.joint.targetPosition = jointConfigure.animate.localPosition;