From 72f065e0d1b9f065542830f7a9a6fb13d111605d Mon Sep 17 00:00:00 2001 From: teascade Date: Fri, 14 Aug 2020 19:00:57 +0300 Subject: [PATCH] Add Teevee, Add TestGun and add RightHandAnchor --- Assets/Items/Raygun.prefab | 3 +- Assets/Items/Teevee.meta | 8 + Assets/Items/Teevee/CoverMat.mat | 91 +++++ Assets/Items/Teevee/CoverMat.mat.meta | 8 + Assets/Items/Teevee/ScreenMat.mat | 91 +++++ Assets/Items/Teevee/ScreenMat.mat.meta | 8 + Assets/Items/Teevee/TeeveeMat.mat | 91 +++++ Assets/Items/Teevee/TeeveeMat.mat.meta | 8 + Assets/Items/Teevee/Telly.fbx | Bin 0 -> 17980 bytes Assets/Items/Teevee/Telly.fbx.meta | 101 +++++ Assets/Items/TestGun2.prefab | 373 ++++++++++++++++++ Assets/Items/TestGun2.prefab.meta | 7 + Assets/Player/Player.prefab | 158 ++++---- Assets/Scenes/Stardust/TestScene.unity | 24 -- .../Animation/SoldierProceduralAnimator.cs | 11 +- Assets/Scripts/Items/Item.cs | 1 + Assets/Scripts/Items/Raygun.cs | 2 + 17 files changed, 872 insertions(+), 113 deletions(-) create mode 100644 Assets/Items/Teevee.meta create mode 100644 Assets/Items/Teevee/CoverMat.mat create mode 100644 Assets/Items/Teevee/CoverMat.mat.meta create mode 100644 Assets/Items/Teevee/ScreenMat.mat create mode 100644 Assets/Items/Teevee/ScreenMat.mat.meta create mode 100644 Assets/Items/Teevee/TeeveeMat.mat create mode 100644 Assets/Items/Teevee/TeeveeMat.mat.meta create mode 100644 Assets/Items/Teevee/Telly.fbx create mode 100644 Assets/Items/Teevee/Telly.fbx.meta create mode 100644 Assets/Items/TestGun2.prefab create mode 100644 Assets/Items/TestGun2.prefab.meta diff --git a/Assets/Items/Raygun.prefab b/Assets/Items/Raygun.prefab index 53e8935..8cfdca6 100644 --- a/Assets/Items/Raygun.prefab +++ b/Assets/Items/Raygun.prefab @@ -198,7 +198,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5022353220472231776} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.15, y: -0.271, z: 0.309} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1605033999665909937} @@ -219,6 +219,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: RaygunCooldown: 1 + Handle: {fileID: 1605033999665909937} LaserPrefab: {fileID: 8009551885746485900, guid: 5c99da0361d098646b319a35fcc80095, type: 3} RaygunAnimator: {fileID: 823779526010534736} BulletSourcePoint: {fileID: 9048980524933835922} diff --git a/Assets/Items/Teevee.meta b/Assets/Items/Teevee.meta new file mode 100644 index 0000000..a2ab847 --- /dev/null +++ b/Assets/Items/Teevee.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 529d57fc3d0c9b54e922af2bdaa52ab7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/Teevee/CoverMat.mat b/Assets/Items/Teevee/CoverMat.mat new file mode 100644 index 0000000..8e85152 --- /dev/null +++ b/Assets/Items/Teevee/CoverMat.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-9045154936689046649 +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: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CoverMat + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + 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} + - _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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 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/Items/Teevee/CoverMat.mat.meta b/Assets/Items/Teevee/CoverMat.mat.meta new file mode 100644 index 0000000..5ebfcba --- /dev/null +++ b/Assets/Items/Teevee/CoverMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: adeaa37240b39674981c795dbd106297 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/Teevee/ScreenMat.mat b/Assets/Items/Teevee/ScreenMat.mat new file mode 100644 index 0000000..8b390c7 --- /dev/null +++ b/Assets/Items/Teevee/ScreenMat.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-9045154936689046649 +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: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ScreenMat + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + 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} + - _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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 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/Items/Teevee/ScreenMat.mat.meta b/Assets/Items/Teevee/ScreenMat.mat.meta new file mode 100644 index 0000000..581fb7f --- /dev/null +++ b/Assets/Items/Teevee/ScreenMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77c8ce291da54e44a95aab36478f4dad +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/Teevee/TeeveeMat.mat b/Assets/Items/Teevee/TeeveeMat.mat new file mode 100644 index 0000000..02a5577 --- /dev/null +++ b/Assets/Items/Teevee/TeeveeMat.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-9045154936689046649 +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: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TeeveeMat + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + 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} + - _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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 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/Items/Teevee/TeeveeMat.mat.meta b/Assets/Items/Teevee/TeeveeMat.mat.meta new file mode 100644 index 0000000..8823346 --- /dev/null +++ b/Assets/Items/Teevee/TeeveeMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1ed5c6a3278058b41963bdc24ba2271b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/Teevee/Telly.fbx b/Assets/Items/Teevee/Telly.fbx new file mode 100644 index 0000000000000000000000000000000000000000..87519764a0094c7a9bab82e0f1b79638da61d1d0 GIT binary patch literal 17980 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 GZTo+FId4S( literal 0 HcmV?d00001 diff --git a/Assets/Items/Teevee/Telly.fbx.meta b/Assets/Items/Teevee/Telly.fbx.meta new file mode 100644 index 0000000..cdeb08d --- /dev/null +++ b/Assets/Items/Teevee/Telly.fbx.meta @@ -0,0 +1,101 @@ +fileFormatVersion: 2 +guid: 6a5fc221f07cc47409a6118dbbb9258a +ModelImporter: + serializedVersion: 20101 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/TestGun2.prefab b/Assets/Items/TestGun2.prefab new file mode 100644 index 0000000..ea8d454 --- /dev/null +++ b/Assets/Items/TestGun2.prefab @@ -0,0 +1,373 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4140220380674628973 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 606707962148492301} + - component: {fileID: 7648489415013749098} + m_Layer: 0 + m_Name: GunshotSfx + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &606707962148492301 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4140220380674628973} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 9048980524933835922} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &7648489415013749098 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4140220380674628973} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: -1410552352759146441, guid: ff7bf5284859d9f45a64971a67bb173a, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 0 + MinDistance: 2 + MaxDistance: 1000 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &4278392104837948798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1605033999665909937} + m_Layer: 0 + m_Name: GunHandle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1605033999665909937 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4278392104837948798} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.112, z: -0.173} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4677107243738498813} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5022353220472231776 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4677107243738498813} + - component: {fileID: 5603130069753505478} + m_Layer: 0 + m_Name: TestGun2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4677107243738498813 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5022353220472231776} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_Children: + - {fileID: 1605033999665909937} + - {fileID: 264070833573311472} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!114 &5603130069753505478 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5022353220472231776} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 65eee2dbd7da6664dbbe31e2c926fdba, type: 3} + m_Name: + m_EditorClassIdentifier: + RaygunCooldown: 1 + LaserPrefab: {fileID: 8009551885746485900, guid: 5c99da0361d098646b319a35fcc80095, type: 3} + RaygunAnimator: {fileID: 823779526010534736} + BulletSourcePoint: {fileID: 9048980524933835922} + BulletHitLayer: + serializedVersion: 2 + m_Bits: 768 + BulletPassLayer: + serializedVersion: 2 + m_Bits: 8192 + GunShotAudioSource: {fileID: 7648489415013749098} + RaygunClip: {fileID: 8300000, guid: 643f2f841d3577649b254780ae82bfcf, type: 3} +--- !u!1 &6228136265624521654 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 264070833573311472} + - component: {fileID: 823779526010534736} + m_Layer: 0 + m_Name: GunAnimator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &264070833573311472 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6228136265624521654} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7863868536358904304} + - {fileID: 9048980524933835922} + m_Father: {fileID: 4677107243738498813} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &823779526010534736 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6228136265624521654} + m_Enabled: 0 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8468d9a1f10314a4c998349493611489, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6649619388343910146 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9048980524933835922} + m_Layer: 0 + m_Name: GunShootPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9048980524933835922 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6649619388343910146} + m_LocalRotation: {x: -0.000000014901156, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.121, z: 0.7509999} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 606707962148492301} + m_Father: {fileID: 264070833573311472} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &7685581577592915483 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 264070833573311472} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_LocalPosition.y + value: 0.445 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_LocalRotation.x + value: -0.27051878 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_LocalRotation.y + value: 0.6533145 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_LocalRotation.z + value: 0.653314 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_LocalRotation.w + value: 0.27051932 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 135.014 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 1ed5c6a3278058b41963bdc24ba2271b, type: 2} + - target: {fileID: -7511558181221131132, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 77c8ce291da54e44a95aab36478f4dad, type: 2} + - target: {fileID: -7511558181221131132, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: adeaa37240b39674981c795dbd106297, type: 2} + - target: {fileID: 919132149155446097, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + propertyPath: m_Name + value: Telly + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} +--- !u!4 &7863868536358904304 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6a5fc221f07cc47409a6118dbbb9258a, type: 3} + m_PrefabInstance: {fileID: 7685581577592915483} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Items/TestGun2.prefab.meta b/Assets/Items/TestGun2.prefab.meta new file mode 100644 index 0000000..5d38dc1 --- /dev/null +++ b/Assets/Items/TestGun2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b19fafdda1bd1f947b8806693d78dc1c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Player/Player.prefab b/Assets/Player/Player.prefab index f65c037..37200a1 100644 --- a/Assets/Player/Player.prefab +++ b/Assets/Player/Player.prefab @@ -279,8 +279,7 @@ MonoBehaviour: HeadCollider: {fileID: 7391558913556166742} Ragdolling: 0 GunGluedToHand: 1 - Gun: {fileID: 1865991757674780053} - GunHandle: {fileID: 5713660789478474713} + Gun: {fileID: 1499532377406584238} --- !u!114 &6585337033203946896 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1216,7 +1215,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6689431852042077044} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0.15, y: -0.271, z: 0.309} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1865991757674780053} @@ -2907,39 +2906,39 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} ---- !u!1 &378181050955954659 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2313131607479007952, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} - m_PrefabInstance: {fileID: 2676956051575718707} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5585551264296828372 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -1682754096888168729, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} - m_PrefabInstance: {fileID: 2676956051575718707} - m_PrefabAsset: {fileID: 0} --- !u!1 &4058563969374220487 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2122496377756791796, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} ---- !u!1 &8744249650485362980 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6665228367387902487, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} - m_PrefabInstance: {fileID: 2676956051575718707} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4604321914683741605 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1928564536991127190, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} - m_PrefabInstance: {fileID: 2676956051575718707} - m_PrefabAsset: {fileID: 0} --- !u!1 &5591340088261064748 stripped GameObject: m_CorrespondingSourceObject: {fileID: -1675871812770890977, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} ---- !u!4 &2498596356784760024 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} +--- !u!1 &2909126165159328361 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 970877069575420250, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + m_PrefabInstance: {fileID: 2676956051575718707} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4604321914683741605 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1928564536991127190, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + m_PrefabInstance: {fileID: 2676956051575718707} + m_PrefabAsset: {fileID: 0} +--- !u!1 &378181050955954659 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2313131607479007952, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + m_PrefabInstance: {fileID: 2676956051575718707} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8020497713614398660 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5361814037758830583, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + m_PrefabInstance: {fileID: 2676956051575718707} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8744249650485362980 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6665228367387902487, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} --- !u!1 &5615618764339399952 stripped @@ -2947,9 +2946,14 @@ GameObject: m_CorrespondingSourceObject: {fileID: -1672846623409500637, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} ---- !u!1 &2976767849567766614 stripped +--- !u!4 &2498596356784760024 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + m_PrefabInstance: {fileID: 2676956051575718707} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5585551264296828372 stripped GameObject: - m_CorrespondingSourceObject: {fileID: -8328862363880354971, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + m_CorrespondingSourceObject: {fileID: -1682754096888168729, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} --- !u!95 &8380320334439546530 stripped @@ -2962,14 +2966,9 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4996979199693665407, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} ---- !u!1 &2909126165159328361 stripped +--- !u!1 &2976767849567766614 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 970877069575420250, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} - m_PrefabInstance: {fileID: 2676956051575718707} - m_PrefabAsset: {fileID: 0} ---- !u!1 &8020497713614398660 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5361814037758830583, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} + m_CorrespondingSourceObject: {fileID: -8328862363880354971, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3} m_PrefabInstance: {fileID: 2676956051575718707} m_PrefabAsset: {fileID: 0} --- !u!1001 &4574503883554023504 @@ -3685,14 +3684,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} ---- !u!1 &8134722540108977799 stripped +--- !u!1 &7078895688717378999 stripped GameObject: - m_CorrespondingSourceObject: {fileID: -3485874040580669737, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} - m_PrefabInstance: {fileID: 4574503883554023504} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4799245472480801387 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 9070741543337286203, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_CorrespondingSourceObject: {fileID: -2502122241363620377, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} m_PrefabInstance: {fileID: 4574503883554023504} m_PrefabAsset: {fileID: 0} --- !u!1 &5143876166499415354 stripped @@ -3700,56 +3694,61 @@ GameObject: m_CorrespondingSourceObject: {fileID: 8654052703341272426, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} m_PrefabInstance: {fileID: 4574503883554023504} m_PrefabAsset: {fileID: 0} ---- !u!1 &3404627525641887855 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1172147262814881855, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} - m_PrefabInstance: {fileID: 4574503883554023504} - m_PrefabAsset: {fileID: 0} ---- !u!1 &439248789966776954 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -5088115977802186198, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} - m_PrefabInstance: {fileID: 4574503883554023504} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5077275728796870648 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8722905492793823144, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} - m_PrefabInstance: {fileID: 4574503883554023504} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7078895688717378999 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -2502122241363620377, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} - m_PrefabInstance: {fileID: 4574503883554023504} - m_PrefabAsset: {fileID: 0} --- !u!1 &4420112016416942592 stripped GameObject: m_CorrespondingSourceObject: {fileID: 156644665701319248, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} m_PrefabInstance: {fileID: 4574503883554023504} m_PrefabAsset: {fileID: 0} ---- !u!1 &1328534562678190810 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3248221432074918538, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} - m_PrefabInstance: {fileID: 4574503883554023504} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7861152345155936203 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -3286630041556977765, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} - m_PrefabInstance: {fileID: 4574503883554023504} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4103164600241655739 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} - m_PrefabInstance: {fileID: 4574503883554023504} - m_PrefabAsset: {fileID: 0} --- !u!1 &8167146500820978587 stripped GameObject: m_CorrespondingSourceObject: {fileID: -3590372263194287157, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} m_PrefabInstance: {fileID: 4574503883554023504} m_PrefabAsset: {fileID: 0} +--- !u!4 &4103164600241655739 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_PrefabInstance: {fileID: 4574503883554023504} + m_PrefabAsset: {fileID: 0} +--- !u!1 &439248789966776954 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5088115977802186198, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_PrefabInstance: {fileID: 4574503883554023504} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7861152345155936203 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -3286630041556977765, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_PrefabInstance: {fileID: 4574503883554023504} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5077275728796870648 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8722905492793823144, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_PrefabInstance: {fileID: 4574503883554023504} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4799245472480801387 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9070741543337286203, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_PrefabInstance: {fileID: 4574503883554023504} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3404627525641887855 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1172147262814881855, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_PrefabInstance: {fileID: 4574503883554023504} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8134722540108977799 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -3485874040580669737, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_PrefabInstance: {fileID: 4574503883554023504} + m_PrefabAsset: {fileID: 0} --- !u!95 &7931246460515997121 stripped Animator: m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} m_PrefabInstance: {fileID: 4574503883554023504} m_PrefabAsset: {fileID: 0} +--- !u!1 &1328534562678190810 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3248221432074918538, guid: bb45094e64c7170458884eea0a4f4c68, type: 3} + m_PrefabInstance: {fileID: 4574503883554023504} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6416848661152764776 PrefabInstance: m_ObjectHideFlags: 0 @@ -3815,8 +3814,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 65eee2dbd7da6664dbbe31e2c926fdba, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &5713660789478474713 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1605033999665909937, guid: 5e86b3797a8a43e48abf11dc89da8b00, type: 3} - m_PrefabInstance: {fileID: 6416848661152764776} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Stardust/TestScene.unity b/Assets/Scenes/Stardust/TestScene.unity index 8970bfc..3df448d 100644 --- a/Assets/Scenes/Stardust/TestScene.unity +++ b/Assets/Scenes/Stardust/TestScene.unity @@ -1879,18 +1879,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1564403007931083473, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1564403007931083473, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1564403007931083473, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1618967478166023428, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1939,18 +1927,6 @@ PrefabInstance: propertyPath: m_Name value: LocalPlayer objectReference: {fileID: 0} - - target: {fileID: 7568009320490465417, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} - propertyPath: m_LocalPosition.x - value: 0.15 - objectReference: {fileID: 0} - - target: {fileID: 7568009320490465417, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} - propertyPath: m_LocalPosition.y - value: -0.271 - objectReference: {fileID: 0} - - target: {fileID: 7568009320490465417, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} - propertyPath: m_LocalPosition.z - value: 0.309 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3} --- !u!1 &1002460576 diff --git a/Assets/Scripts/Animation/SoldierProceduralAnimator.cs b/Assets/Scripts/Animation/SoldierProceduralAnimator.cs index 2a07e6c..75736d1 100644 --- a/Assets/Scripts/Animation/SoldierProceduralAnimator.cs +++ b/Assets/Scripts/Animation/SoldierProceduralAnimator.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using UnityEngine; using NeonTea.Quakeball.Players; +using NeonTea.Quakeball.Items; using NeonTea.Quakeball.Util; namespace NeonTea.Quakeball.Animation { @@ -21,8 +22,6 @@ namespace NeonTea.Quakeball.Animation { [Header("Gun holding")] public bool GunGluedToHand = true; - public Transform Gun; - public Transform GunHandle; private Animator Animator; private Transform BehindHand; @@ -60,7 +59,7 @@ namespace NeonTea.Quakeball.Animation { BehindHand = TransformUtil.FindChildWithName(Animator.transform, "HAND.R"); FrontHand = TransformUtil.FindChildWithName(Animator.transform, "HAND.L"); if (GunGluedToHand) { - Gun.parent = Animator.transform; + Player.Gun.transform.parent = Animator.transform; } AddRigidbodyToRagdoll(Animator.transform); StopRagdoll(); @@ -102,10 +101,10 @@ namespace NeonTea.Quakeball.Animation { HeadCollider.eulerAngles = Head.eulerAngles; if (GunGluedToHand) { - Vector3 GunOffset = GunHandle.position - Gun.position; + Vector3 GunOffset = Player.Gun.RightHandAnchor.position - Player.Gun.transform.position; Vector3 GunDirection = (FrontHand.position - BehindHand.position).normalized; - Gun.position = BehindHand.position - GunOffset; - Gun.LookAt(Gun.position + GunDirection); + Player.Gun.transform.position = BehindHand.position - GunOffset; + Player.Gun.transform.LookAt(Player.Gun.transform.position + GunDirection); } } } diff --git a/Assets/Scripts/Items/Item.cs b/Assets/Scripts/Items/Item.cs index a009b8f..b34a4e7 100644 --- a/Assets/Scripts/Items/Item.cs +++ b/Assets/Scripts/Items/Item.cs @@ -7,6 +7,7 @@ namespace NeonTea.Quakeball.Items { public abstract float Cooldown { get; } public abstract Animator Animator { get; } + public abstract Transform RightHandAnchor { get; } public abstract void Shoot(Player source); public abstract void OnSwitched(); diff --git a/Assets/Scripts/Items/Raygun.cs b/Assets/Scripts/Items/Raygun.cs index be95a89..f038368 100644 --- a/Assets/Scripts/Items/Raygun.cs +++ b/Assets/Scripts/Items/Raygun.cs @@ -11,8 +11,10 @@ namespace NeonTea.Quakeball.Items { public override float Cooldown => RaygunCooldown; public override Animator Animator => RaygunAnimator; + public override Transform RightHandAnchor => Handle; public float RaygunCooldown = 1; + public Transform Handle; [Header("Visuals")] public GameObject LaserPrefab;