mirror of
				https://github.com/DerTyp7/defrain-shooter-unity.git
				synced 2025-10-29 20:52:10 +01:00 
			
		
		
		
	Gun holding with inverse kinematics
This commit is contained in:
		| @@ -47,7 +47,7 @@ ModelImporter: | ||||
|       cycleOffset: 0 | ||||
|       loop: 0 | ||||
|       hasAdditiveReferencePose: 0 | ||||
|       loopTime: 1 | ||||
|       loopTime: 0 | ||||
|       loopBlend: 0 | ||||
|       loopBlendOrientation: 0 | ||||
|       loopBlendPositionY: 0 | ||||
|   | ||||
							
								
								
									
										8
									
								
								Assets/Prefabs/Networing.meta
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								Assets/Prefabs/Networing.meta
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,8 @@ | ||||
| fileFormatVersion: 2 | ||||
| guid: c8a065d12eb72f14eb0cd83ccd9258fd | ||||
| folderAsset: yes | ||||
| DefaultImporter: | ||||
|   externalObjects: {} | ||||
|   userData:  | ||||
|   assetBundleName:  | ||||
|   assetBundleVariant:  | ||||
							
								
								
									
										8
									
								
								Assets/Prefabs/Player.meta
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								Assets/Prefabs/Player.meta
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,8 @@ | ||||
| fileFormatVersion: 2 | ||||
| guid: e9503bb9b0dcaf34097c8a469fd53dc0 | ||||
| folderAsset: yes | ||||
| DefaultImporter: | ||||
|   externalObjects: {} | ||||
|   userData:  | ||||
|   assetBundleName:  | ||||
|   assetBundleVariant:  | ||||
| @@ -9,6 +9,7 @@ GameObject: | ||||
|   serializedVersion: 6 | ||||
|   m_Component: | ||||
|   - component: {fileID: 65959153} | ||||
|   - component: {fileID: 291279326086681984} | ||||
|   m_Layer: 0 | ||||
|   m_Name: LeftHand | ||||
|   m_TagString: Untagged | ||||
| @@ -31,6 +32,30 @@ Transform: | ||||
|   m_Father: {fileID: 1197111049} | ||||
|   m_RootOrder: 1 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
| --- !u!114 &291279326086681984 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 65959152} | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 11500000, guid: aeda7bfbf984f2a4da5ab4b8967b115d, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
|   m_Weight: 1 | ||||
|   m_Data: | ||||
|     m_Root: {fileID: 8334588817950881727} | ||||
|     m_Mid: {fileID: 5739201115059209923} | ||||
|     m_Tip: {fileID: 1706812538552309319} | ||||
|     m_Target: {fileID: 2781132594439880980} | ||||
|     m_Hint: {fileID: 0} | ||||
|     m_TargetPositionWeight: 1 | ||||
|     m_TargetRotationWeight: 1 | ||||
|     m_HintWeight: 1 | ||||
|     m_MaintainTargetPositionOffset: 0 | ||||
|     m_MaintainTargetRotationOffset: 0 | ||||
| --- !u!1 &357599823 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
| @@ -59,8 +84,7 @@ Transform: | ||||
|   m_LocalPosition: {x: 0.023, y: -0.035, z: -0.066} | ||||
|   m_LocalScale: {x: 1, y: 1, z: 1} | ||||
|   m_ConstrainProportionsScale: 0 | ||||
|   m_Children: | ||||
|   - {fileID: 1893374244} | ||||
|   m_Children: [] | ||||
|   m_Father: {fileID: 1197111049} | ||||
|   m_RootOrder: 0 | ||||
|   m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180} | ||||
| @@ -120,7 +144,7 @@ Transform: | ||||
|   - {fileID: 357599824} | ||||
|   - {fileID: 65959153} | ||||
|   m_Father: {fileID: 6272346181302961296} | ||||
|   m_RootOrder: 4 | ||||
|   m_RootOrder: 3 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
| --- !u!114 &8865635171929772803 | ||||
| MonoBehaviour: | ||||
| @@ -136,37 +160,6 @@ MonoBehaviour: | ||||
|   m_EditorClassIdentifier:  | ||||
|   m_Weight: 1 | ||||
|   m_Effectors: [] | ||||
| --- !u!1 &1893374243 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   serializedVersion: 6 | ||||
|   m_Component: | ||||
|   - component: {fileID: 1893374244} | ||||
|   m_Layer: 0 | ||||
|   m_Name: RightHint | ||||
|   m_TagString: Untagged | ||||
|   m_Icon: {fileID: 0} | ||||
|   m_NavMeshLayer: 0 | ||||
|   m_StaticEditorFlags: 0 | ||||
|   m_IsActive: 1 | ||||
| --- !u!4 &1893374244 | ||||
| Transform: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1893374243} | ||||
|   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||||
|   m_LocalPosition: {x: 0.934, y: 0, z: -0.306} | ||||
|   m_LocalScale: {x: 1, y: 1, z: 1} | ||||
|   m_ConstrainProportionsScale: 0 | ||||
|   m_Children: [] | ||||
|   m_Father: {fileID: 357599824} | ||||
|   m_RootOrder: 0 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
| --- !u!1 &1749713556945343754 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
| @@ -190,14 +183,45 @@ Transform: | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1749713556945343754} | ||||
|   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} | ||||
|   m_LocalPosition: {x: 0, y: 0, z: 0} | ||||
|   m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} | ||||
|   m_LocalPosition: {x: 0.09, y: -0.05, z: 0.03} | ||||
|   m_LocalScale: {x: 1, y: 1, z: 1} | ||||
|   m_ConstrainProportionsScale: 0 | ||||
|   m_Children: [] | ||||
|   m_Father: {fileID: 4058555163434875561} | ||||
|   m_RootOrder: 2 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
|   m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} | ||||
| --- !u!1 &2221492823855642591 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   serializedVersion: 6 | ||||
|   m_Component: | ||||
|   - component: {fileID: 2781132594439880980} | ||||
|   m_Layer: 0 | ||||
|   m_Name: Left_Hand_REF | ||||
|   m_TagString: Untagged | ||||
|   m_Icon: {fileID: 0} | ||||
|   m_NavMeshLayer: 0 | ||||
|   m_StaticEditorFlags: 0 | ||||
|   m_IsActive: 1 | ||||
| --- !u!4 &2781132594439880980 | ||||
| Transform: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 2221492823855642591} | ||||
|   m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} | ||||
|   m_LocalPosition: {x: 0.09, y: -0.06, z: -0.03} | ||||
|   m_LocalScale: {x: 1, y: 1, z: 1} | ||||
|   m_ConstrainProportionsScale: 0 | ||||
|   m_Children: [] | ||||
|   m_Father: {fileID: 4058555163434875561} | ||||
|   m_RootOrder: 3 | ||||
|   m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} | ||||
| --- !u!1 &3649358604728444914 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
| @@ -229,6 +253,18 @@ Transform: | ||||
|   m_Father: {fileID: 6272346181657429396} | ||||
|   m_RootOrder: 0 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
| --- !u!114 &2425026116520232903 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 3682030003239559187} | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
| --- !u!1 &4824770690127859843 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
| @@ -424,6 +460,7 @@ GameObject: | ||||
|   - component: {fileID: 1509131218531316230} | ||||
|   - component: {fileID: 8957579265169979397} | ||||
|   - component: {fileID: 3965891812990671158} | ||||
|   - component: {fileID: 4276885029697240453} | ||||
|   m_Layer: 0 | ||||
|   m_Name: Player Animation Test | ||||
|   m_TagString: Player | ||||
| @@ -446,8 +483,8 @@ Transform: | ||||
|   - {fileID: 5844730607706440515} | ||||
|   - {fileID: 6272346182417644039} | ||||
|   - {fileID: 981273033772084037} | ||||
|   - {fileID: 5767109144009335573} | ||||
|   - {fileID: 1197111049} | ||||
|   - {fileID: 5767109144009335573} | ||||
|   m_Father: {fileID: 0} | ||||
|   m_RootOrder: 0 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
| @@ -517,7 +554,7 @@ MonoBehaviour: | ||||
|   walkSpeed: 6 | ||||
|   sprintSpeed: 8 | ||||
|   moveSmoothTime: 0.05 | ||||
|   gravity: 0 | ||||
|   gravity: -10 | ||||
|   jumpHeight: 1.2 | ||||
|   groundCheck: {fileID: 6272346182417644039} | ||||
|   groundMask: | ||||
| @@ -649,6 +686,8 @@ MonoBehaviour: | ||||
|   syncMode: 0 | ||||
|   syncInterval: 0.1 | ||||
|   muzzle: {fileID: 3649358604728444914} | ||||
|   shootAnim: {fileID: 0} | ||||
|   fireRate: 120 | ||||
| --- !u!114 &6207632454083444980 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
| @@ -745,6 +784,19 @@ MonoBehaviour: | ||||
|   - m_Rig: {fileID: 8865635171929772803} | ||||
|     m_Active: 1 | ||||
|   m_Effectors: [] | ||||
| --- !u!114 &4276885029697240453 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 6272346181302961293} | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 11500000, guid: b366149a1bdd3ad4884ac2afe0fe11a1, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
|   gun: {fileID: 3682030003239559187} | ||||
| --- !u!1 &6272346181657429393 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
| @@ -755,6 +807,7 @@ GameObject: | ||||
|   m_Component: | ||||
|   - component: {fileID: 6272346181657429396} | ||||
|   - component: {fileID: 6272346181657429395} | ||||
|   - component: {fileID: 7087117678379852523} | ||||
|   m_Layer: 0 | ||||
|   m_Name: Camera | ||||
|   m_TagString: MainCamera | ||||
| @@ -777,6 +830,7 @@ Transform: | ||||
|   - {fileID: 5021921342190399731} | ||||
|   - {fileID: 4074665071222326704} | ||||
|   - {fileID: 1979435770070801855} | ||||
|   - {fileID: 4058555163434875561} | ||||
|   m_Father: {fileID: 981273033772084037} | ||||
|   m_RootOrder: 0 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
| @@ -823,6 +877,18 @@ Camera: | ||||
|   m_OcclusionCulling: 1 | ||||
|   m_StereoConvergence: 10 | ||||
|   m_StereoSeparation: 0.022 | ||||
| --- !u!114 &7087117678379852523 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 6272346181657429393} | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
| --- !u!1 &6272346182417644038 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
| @@ -881,11 +947,30 @@ Transform: | ||||
|   m_LocalPosition: {x: 0, y: -0.056, z: 0.4} | ||||
|   m_LocalScale: {x: 1, y: 1, z: 1} | ||||
|   m_ConstrainProportionsScale: 0 | ||||
|   m_Children: | ||||
|   - {fileID: 4058555163434875561} | ||||
|   m_Children: [] | ||||
|   m_Father: {fileID: 6272346181657429396} | ||||
|   m_RootOrder: 1 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
| --- !u!95 &1978909962 | ||||
| Animator: | ||||
|   serializedVersion: 4 | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 6576156620079053231} | ||||
|   m_Enabled: 1 | ||||
|   m_Avatar: {fileID: 0} | ||||
|   m_Controller: {fileID: 0} | ||||
|   m_CullingMode: 0 | ||||
|   m_UpdateMode: 0 | ||||
|   m_ApplyRootMotion: 0 | ||||
|   m_LinearVelocityBlending: 0 | ||||
|   m_StabilizeFeet: 0 | ||||
|   m_WarningMessage:  | ||||
|   m_HasTransformHierarchy: 1 | ||||
|   m_AllowConstantClipSamplingOptimization: 1 | ||||
|   m_KeepAnimatorControllerStateOnDisable: 0 | ||||
| --- !u!1 &7061967201775281134 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
| @@ -895,6 +980,7 @@ GameObject: | ||||
|   serializedVersion: 6 | ||||
|   m_Component: | ||||
|   - component: {fileID: 981273033772084037} | ||||
|   - component: {fileID: 1345655087433563259} | ||||
|   m_Layer: 0 | ||||
|   m_Name: neck | ||||
|   m_TagString: Untagged | ||||
| @@ -918,6 +1004,18 @@ Transform: | ||||
|   m_Father: {fileID: 6272346181302961296} | ||||
|   m_RootOrder: 2 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
| --- !u!114 &1345655087433563259 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 7061967201775281134} | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
| --- !u!1 &8043317747957554736 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
| @@ -954,11 +1052,11 @@ PrefabInstance: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   serializedVersion: 2 | ||||
|   m_Modification: | ||||
|     m_TransformParent: {fileID: 4074665071222326704} | ||||
|     m_TransformParent: {fileID: 6272346181657429396} | ||||
|     m_Modifications: | ||||
|     - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} | ||||
|       propertyPath: m_RootOrder | ||||
|       value: 0 | ||||
|       value: 3 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} | ||||
|       propertyPath: m_LocalPosition.x | ||||
| @@ -966,11 +1064,11 @@ PrefabInstance: | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} | ||||
|       propertyPath: m_LocalPosition.y | ||||
|       value: 0 | ||||
|       value: -0.056000024 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} | ||||
|       propertyPath: m_LocalPosition.z | ||||
|       value: 0 | ||||
|       value: 0.4 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} | ||||
|       propertyPath: m_LocalRotation.w | ||||
| @@ -1015,6 +1113,11 @@ Transform: | ||||
|   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} | ||||
|   m_PrefabInstance: {fileID: 4600527171543473474} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
| --- !u!1 &3682030003239559187 stripped | ||||
| GameObject: | ||||
|   m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} | ||||
|   m_PrefabInstance: {fileID: 4600527171543473474} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
| --- !u!1001 &6305701708507383038 | ||||
| PrefabInstance: | ||||
|   m_ObjectHideFlags: 0 | ||||
| @@ -1024,7 +1127,7 @@ PrefabInstance: | ||||
|     m_Modifications: | ||||
|     - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} | ||||
|       propertyPath: m_RootOrder | ||||
|       value: 3 | ||||
|       value: 4 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} | ||||
|       propertyPath: m_LocalPosition.x | ||||
| @@ -1072,6 +1175,26 @@ PrefabInstance: | ||||
|       objectReference: {fileID: 0} | ||||
|     m_RemovedComponents: [] | ||||
|   m_SourcePrefab: {fileID: 100100000, guid: 01316cb596562384da845bc519fb90de, type: 3} | ||||
| --- !u!1 &6576156620079053231 stripped | ||||
| GameObject: | ||||
|   m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} | ||||
|   m_PrefabInstance: {fileID: 6305701708507383038} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
| --- !u!4 &5767109144009335573 stripped | ||||
| Transform: | ||||
|   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} | ||||
|   m_PrefabInstance: {fileID: 6305701708507383038} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
| --- !u!4 &5739201115059209923 stripped | ||||
| Transform: | ||||
|   m_CorrespondingSourceObject: {fileID: 1740614089614901821, guid: 01316cb596562384da845bc519fb90de, type: 3} | ||||
|   m_PrefabInstance: {fileID: 6305701708507383038} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
| --- !u!4 &1706812538552309319 stripped | ||||
| Transform: | ||||
|   m_CorrespondingSourceObject: {fileID: -4598867093515939143, guid: 01316cb596562384da845bc519fb90de, type: 3} | ||||
|   m_PrefabInstance: {fileID: 6305701708507383038} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
| --- !u!4 &9127245645273413481 stripped | ||||
| Transform: | ||||
|   m_CorrespondingSourceObject: {fileID: 2965664082145358743, guid: 01316cb596562384da845bc519fb90de, type: 3} | ||||
| @@ -1082,13 +1205,13 @@ Transform: | ||||
|   m_CorrespondingSourceObject: {fileID: -5945183352512053224, guid: 01316cb596562384da845bc519fb90de, type: 3} | ||||
|   m_PrefabInstance: {fileID: 6305701708507383038} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
| --- !u!4 &5767109144009335573 stripped | ||||
| Transform: | ||||
|   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} | ||||
|   m_PrefabInstance: {fileID: 6305701708507383038} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
| --- !u!4 &8703533484509679896 stripped | ||||
| Transform: | ||||
|   m_CorrespondingSourceObject: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} | ||||
|   m_PrefabInstance: {fileID: 6305701708507383038} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
| --- !u!4 &8334588817950881727 stripped | ||||
| Transform: | ||||
|   m_CorrespondingSourceObject: {fileID: -6617984589164989631, guid: 01316cb596562384da845bc519fb90de, type: 3} | ||||
|   m_PrefabInstance: {fileID: 6305701708507383038} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
| @@ -302,7 +302,7 @@ Transform: | ||||
|   m_ConstrainProportionsScale: 0 | ||||
|   m_Children: [] | ||||
|   m_Father: {fileID: 0} | ||||
|   m_RootOrder: 3 | ||||
|   m_RootOrder: 2 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
| --- !u!1 &1113968959 | ||||
| GameObject: | ||||
| @@ -419,7 +419,7 @@ PrefabInstance: | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} | ||||
|       propertyPath: m_RootOrder | ||||
|       value: 4 | ||||
|       value: 3 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 3422988367618467043, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} | ||||
|       propertyPath: m_LocalPosition.x | ||||
| @@ -463,89 +463,3 @@ PrefabInstance: | ||||
|       objectReference: {fileID: 0} | ||||
|     m_RemovedComponents: [] | ||||
|   m_SourcePrefab: {fileID: 100100000, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} | ||||
| --- !u!1001 &1852602306 | ||||
| PrefabInstance: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   serializedVersion: 2 | ||||
|   m_Modification: | ||||
|     m_TransformParent: {fileID: 0} | ||||
|     m_Modifications: | ||||
|     - target: {fileID: 320375778840406984, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
|       propertyPath: sceneId | ||||
|       value: 1961350237 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 6272346181302961293, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
|       propertyPath: m_Name | ||||
|       value: Player Animation Test | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
|       propertyPath: m_RootOrder | ||||
|       value: 2 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
|       propertyPath: m_LocalPosition.x | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
|       propertyPath: m_LocalPosition.y | ||||
|       value: 2.15 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
|       propertyPath: m_LocalPosition.z | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
|       propertyPath: m_LocalRotation.w | ||||
|       value: 1 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
|       propertyPath: m_LocalRotation.x | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
|       propertyPath: m_LocalRotation.y | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
|       propertyPath: m_LocalRotation.z | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
|       propertyPath: m_LocalEulerAnglesHint.x | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
|       propertyPath: m_LocalEulerAnglesHint.y | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 6272346181302961296, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
|       propertyPath: m_LocalEulerAnglesHint.z | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     m_RemovedComponents: [] | ||||
|   m_SourcePrefab: {fileID: 100100000, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
| --- !u!1 &1978909960 stripped | ||||
| GameObject: | ||||
|   m_CorrespondingSourceObject: {fileID: 6576156620079053231, guid: a14d876ac00bdf6498e30b3e58b68fdf, type: 3} | ||||
|   m_PrefabInstance: {fileID: 1852602306} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
| --- !u!95 &1978909962 | ||||
| Animator: | ||||
|   serializedVersion: 4 | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 1978909960} | ||||
|   m_Enabled: 1 | ||||
|   m_Avatar: {fileID: 0} | ||||
|   m_Controller: {fileID: 0} | ||||
|   m_CullingMode: 0 | ||||
|   m_UpdateMode: 0 | ||||
|   m_ApplyRootMotion: 0 | ||||
|   m_LinearVelocityBlending: 0 | ||||
|   m_StabilizeFeet: 0 | ||||
|   m_WarningMessage:  | ||||
|   m_HasTransformHierarchy: 1 | ||||
|   m_AllowConstantClipSamplingOptimization: 1 | ||||
|   m_KeepAnimatorControllerStateOnDisable: 0 | ||||
|   | ||||
| @@ -6,6 +6,8 @@ using Mirror; | ||||
| public class Shoot : NetworkBehaviour | ||||
| { | ||||
|     [SerializeField] GameObject muzzle; | ||||
|     [SerializeField] ShootAnimation shootAnim; | ||||
|     [SerializeField] float fireRate; | ||||
|     private void Update() | ||||
|     { | ||||
|         if (isLocalPlayer) | ||||
| @@ -25,6 +27,9 @@ public class Shoot : NetworkBehaviour | ||||
|     { | ||||
|         GameObject dedplayer; | ||||
|         RaycastHit hit; | ||||
|  | ||||
|         shootAnim.StartShootAnimation(60f/fireRate); | ||||
|  | ||||
|         if (Physics.Raycast(muzzle.transform.position, muzzle.transform.forward, out hit)) | ||||
|         { | ||||
|             if (hit.transform.gameObject.GetComponent<Player>() != null) | ||||
|   | ||||
| @@ -4,12 +4,22 @@ using UnityEngine; | ||||
|  | ||||
| public class ShootAnimation : MonoBehaviour | ||||
| { | ||||
|     // Start is called before the first frame update | ||||
|     private Animator anim; | ||||
|     [SerializeField]private GameObject gun; | ||||
|     void Start() | ||||
|     { | ||||
|          | ||||
|         anim = gun.GetComponent<Animator>(); | ||||
|     } | ||||
|  | ||||
|     void OnSwitchWeapon(GameObject newGun) | ||||
|     { | ||||
|         gun = newGun; | ||||
|         anim = gun.GetComponent<Animator>(); | ||||
|     } | ||||
|     public void StartShootAnimation(float timeInSeconds)  | ||||
|     { | ||||
|         anim.PlayInFixedTime("Shoot", 0, timeInSeconds); | ||||
|     } | ||||
|     // Update is called once per frame | ||||
|     void Update() | ||||
|     { | ||||
|   | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Reference in New Issue
	
	Block a user
	 juliuse98
					juliuse98