mirror of
				https://github.com/DerTyp7/defrain-shooter-unity.git
				synced 2025-10-31 05:27:07 +01:00 
			
		
		
		
	Merge branch 'main' into Player-Animation
This commit is contained in:
		| @@ -1,5 +1,258 @@ | ||||
| %YAML 1.1 | ||||
| %TAG !u! tag:unity3d.com,2011: | ||||
| --- !u!1 &681358948229890261 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   serializedVersion: 6 | ||||
|   m_Component: | ||||
|   - component: {fileID: 4399039561386292163} | ||||
|   - component: {fileID: 2732428023354893519} | ||||
|   - component: {fileID: 3713494182464178449} | ||||
|   m_Layer: 0 | ||||
|   m_Name: Cube | ||||
|   m_TagString: Untagged | ||||
|   m_Icon: {fileID: 0} | ||||
|   m_NavMeshLayer: 0 | ||||
|   m_StaticEditorFlags: 0 | ||||
|   m_IsActive: 1 | ||||
| --- !u!4 &4399039561386292163 | ||||
| Transform: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 681358948229890261} | ||||
|   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||||
|   m_LocalPosition: {x: 0.3586286, y: -0.5799999, z: -0.03139314} | ||||
|   m_LocalScale: {x: 0.8, y: 0.2, z: 1} | ||||
|   m_Children: [] | ||||
|   m_Father: {fileID: 981273033772084037} | ||||
|   m_RootOrder: 1 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
| --- !u!33 &2732428023354893519 | ||||
| MeshFilter: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 681358948229890261} | ||||
|   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} | ||||
| --- !u!23 &3713494182464178449 | ||||
| MeshRenderer: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 681358948229890261} | ||||
|   m_Enabled: 1 | ||||
|   m_CastShadows: 1 | ||||
|   m_ReceiveShadows: 1 | ||||
|   m_DynamicOccludee: 1 | ||||
|   m_StaticShadowCaster: 0 | ||||
|   m_MotionVectors: 1 | ||||
|   m_LightProbeUsage: 1 | ||||
|   m_ReflectionProbeUsage: 1 | ||||
|   m_RayTracingMode: 2 | ||||
|   m_RayTraceProcedural: 0 | ||||
|   m_RenderingLayerMask: 1 | ||||
|   m_RendererPriority: 0 | ||||
|   m_Materials: | ||||
|   - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} | ||||
|   m_StaticBatchInfo: | ||||
|     firstSubMesh: 0 | ||||
|     subMeshCount: 0 | ||||
|   m_StaticBatchRoot: {fileID: 0} | ||||
|   m_ProbeAnchor: {fileID: 0} | ||||
|   m_LightProbeVolumeOverride: {fileID: 0} | ||||
|   m_ScaleInLightmap: 1 | ||||
|   m_ReceiveGI: 1 | ||||
|   m_PreserveUVs: 0 | ||||
|   m_IgnoreNormalsForChartDetection: 0 | ||||
|   m_ImportantGI: 0 | ||||
|   m_StitchLightmapSeams: 1 | ||||
|   m_SelectedEditorRenderState: 3 | ||||
|   m_MinimumChartSize: 4 | ||||
|   m_AutoUVMaxDistance: 0.5 | ||||
|   m_AutoUVMaxAngle: 89 | ||||
|   m_LightmapParameters: {fileID: 0} | ||||
|   m_SortingLayerID: 0 | ||||
|   m_SortingLayer: 0 | ||||
|   m_SortingOrder: 0 | ||||
|   m_AdditionalVertexStreams: {fileID: 0} | ||||
| --- !u!1 &4824770690127859843 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   serializedVersion: 6 | ||||
|   m_Component: | ||||
|   - component: {fileID: 5844730607706440515} | ||||
|   - component: {fileID: 763023871062575730} | ||||
|   - component: {fileID: 3585047559268765858} | ||||
|   m_Layer: 0 | ||||
|   m_Name: PlayerNameText | ||||
|   m_TagString: Untagged | ||||
|   m_Icon: {fileID: 0} | ||||
|   m_NavMeshLayer: 0 | ||||
|   m_StaticEditorFlags: 0 | ||||
|   m_IsActive: 1 | ||||
| --- !u!224 &5844730607706440515 | ||||
| RectTransform: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 4824770690127859843} | ||||
|   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: 6272346181302961296} | ||||
|   m_RootOrder: 0 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
|   m_AnchorMin: {x: 0.5, y: 0.5} | ||||
|   m_AnchorMax: {x: 0.5, y: 0.5} | ||||
|   m_AnchoredPosition: {x: 0, y: 2.8} | ||||
|   m_SizeDelta: {x: 20, y: 5} | ||||
|   m_Pivot: {x: 0.5, y: 0.5} | ||||
| --- !u!23 &763023871062575730 | ||||
| MeshRenderer: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 4824770690127859843} | ||||
|   m_Enabled: 1 | ||||
|   m_CastShadows: 0 | ||||
|   m_ReceiveShadows: 0 | ||||
|   m_DynamicOccludee: 1 | ||||
|   m_StaticShadowCaster: 0 | ||||
|   m_MotionVectors: 1 | ||||
|   m_LightProbeUsage: 1 | ||||
|   m_ReflectionProbeUsage: 1 | ||||
|   m_RayTracingMode: 2 | ||||
|   m_RayTraceProcedural: 0 | ||||
|   m_RenderingLayerMask: 1 | ||||
|   m_RendererPriority: 0 | ||||
|   m_Materials: | ||||
|   - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} | ||||
|   m_StaticBatchInfo: | ||||
|     firstSubMesh: 0 | ||||
|     subMeshCount: 0 | ||||
|   m_StaticBatchRoot: {fileID: 0} | ||||
|   m_ProbeAnchor: {fileID: 0} | ||||
|   m_LightProbeVolumeOverride: {fileID: 0} | ||||
|   m_ScaleInLightmap: 1 | ||||
|   m_ReceiveGI: 1 | ||||
|   m_PreserveUVs: 0 | ||||
|   m_IgnoreNormalsForChartDetection: 0 | ||||
|   m_ImportantGI: 0 | ||||
|   m_StitchLightmapSeams: 1 | ||||
|   m_SelectedEditorRenderState: 3 | ||||
|   m_MinimumChartSize: 4 | ||||
|   m_AutoUVMaxDistance: 0.5 | ||||
|   m_AutoUVMaxAngle: 89 | ||||
|   m_LightmapParameters: {fileID: 0} | ||||
|   m_SortingLayerID: 0 | ||||
|   m_SortingLayer: 0 | ||||
|   m_SortingOrder: 0 | ||||
|   m_AdditionalVertexStreams: {fileID: 0} | ||||
| --- !u!114 &3585047559268765858 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 4824770690127859843} | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
|   m_Material: {fileID: 0} | ||||
|   m_Color: {r: 1, g: 1, b: 1, a: 1} | ||||
|   m_RaycastTarget: 1 | ||||
|   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} | ||||
|   m_Maskable: 1 | ||||
|   m_OnCullStateChanged: | ||||
|     m_PersistentCalls: | ||||
|       m_Calls: [] | ||||
|   m_text: Username | ||||
|   m_isRightToLeft: 0 | ||||
|   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} | ||||
|   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} | ||||
|   m_fontSharedMaterials: [] | ||||
|   m_fontMaterial: {fileID: 0} | ||||
|   m_fontMaterials: [] | ||||
|   m_fontColor32: | ||||
|     serializedVersion: 2 | ||||
|     rgba: 4293783039 | ||||
|   m_fontColor: {r: 1, g: 0.9283019, b: 0.9283019, a: 1} | ||||
|   m_enableVertexGradient: 0 | ||||
|   m_colorMode: 3 | ||||
|   m_fontColorGradient: | ||||
|     topLeft: {r: 1, g: 1, b: 1, a: 1} | ||||
|     topRight: {r: 1, g: 1, b: 1, a: 1} | ||||
|     bottomLeft: {r: 1, g: 1, b: 1, a: 1} | ||||
|     bottomRight: {r: 1, g: 1, b: 1, a: 1} | ||||
|   m_fontColorGradientPreset: {fileID: 0} | ||||
|   m_spriteAsset: {fileID: 0} | ||||
|   m_tintAllSprites: 0 | ||||
|   m_StyleSheet: {fileID: 0} | ||||
|   m_TextStyleHashCode: -1183493901 | ||||
|   m_overrideHtmlColors: 0 | ||||
|   m_faceColor: | ||||
|     serializedVersion: 2 | ||||
|     rgba: 4294967295 | ||||
|   m_fontSize: 8 | ||||
|   m_fontSizeBase: 8 | ||||
|   m_fontWeight: 400 | ||||
|   m_enableAutoSizing: 0 | ||||
|   m_fontSizeMin: 18 | ||||
|   m_fontSizeMax: 72 | ||||
|   m_fontStyle: 1 | ||||
|   m_HorizontalAlignment: 2 | ||||
|   m_VerticalAlignment: 512 | ||||
|   m_textAlignment: 65535 | ||||
|   m_characterSpacing: 0 | ||||
|   m_wordSpacing: 0 | ||||
|   m_lineSpacing: 0 | ||||
|   m_lineSpacingMax: 0 | ||||
|   m_paragraphSpacing: 0 | ||||
|   m_charWidthMaxAdj: 0 | ||||
|   m_enableWordWrapping: 1 | ||||
|   m_wordWrappingRatios: 0.4 | ||||
|   m_overflowMode: 0 | ||||
|   m_linkedTextComponent: {fileID: 0} | ||||
|   parentLinkedComponent: {fileID: 0} | ||||
|   m_enableKerning: 1 | ||||
|   m_enableExtraPadding: 0 | ||||
|   checkPaddingRequired: 0 | ||||
|   m_isRichText: 1 | ||||
|   m_parseCtrlCharacters: 1 | ||||
|   m_isOrthographic: 0 | ||||
|   m_isCullingEnabled: 0 | ||||
|   m_horizontalMapping: 0 | ||||
|   m_verticalMapping: 0 | ||||
|   m_uvLineOffset: 0 | ||||
|   m_geometrySortingOrder: 0 | ||||
|   m_IsTextObjectScaleStatic: 0 | ||||
|   m_VertexBufferAutoSizeReduction: 0 | ||||
|   m_useMaxVisibleDescender: 1 | ||||
|   m_pageToDisplay: 1 | ||||
|   m_margin: {x: 0, y: 0, z: 0, w: 0} | ||||
|   m_isUsingLegacyAnimationComponent: 0 | ||||
|   m_isVolumetricText: 0 | ||||
|   _SortingLayer: 0 | ||||
|   _SortingLayerID: 0 | ||||
|   _SortingOrder: 0 | ||||
|   m_hasFontAssetChanged: 0 | ||||
|   m_renderer: {fileID: 763023871062575730} | ||||
|   m_maskType: 0 | ||||
| --- !u!1 &6272346181302961293 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
| @@ -10,10 +263,11 @@ GameObject: | ||||
|   m_Component: | ||||
|   - component: {fileID: 6272346181302961296} | ||||
|   - component: {fileID: 6272346181302961295} | ||||
|   - component: {fileID: 6272346181302961294} | ||||
|   - component: {fileID: 6272346181302961297} | ||||
|   - component: {fileID: 3531617101327355807} | ||||
|   - component: {fileID: 4705578737523903129} | ||||
|   - component: {fileID: 320375778840406984} | ||||
|   - component: {fileID: -4574526707603160507} | ||||
|   - component: {fileID: 7273209952621479910} | ||||
|   - component: {fileID: 5317111308216027170} | ||||
|   - component: {fileID: 4959463831902427506} | ||||
|   m_Layer: 0 | ||||
|   m_Name: Player | ||||
|   m_TagString: Player | ||||
| @@ -32,10 +286,10 @@ Transform: | ||||
|   m_LocalPosition: {x: 0, y: 2.15, z: 0} | ||||
|   m_LocalScale: {x: 1, y: 1, z: 1} | ||||
|   m_Children: | ||||
|   - {fileID: 8217141752490496735} | ||||
|   - {fileID: 5844730607706440515} | ||||
|   - {fileID: 2458562619286483438} | ||||
|   - {fileID: 6272346182417644039} | ||||
|   - {fileID: 223626088105882255} | ||||
|   - {fileID: 981273033772084037} | ||||
|   m_Father: {fileID: 0} | ||||
|   m_RootOrder: 0 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
| @@ -51,13 +305,30 @@ CharacterController: | ||||
|   m_Enabled: 1 | ||||
|   serializedVersion: 2 | ||||
|   m_Height: 2 | ||||
|   m_Radius: 0.3 | ||||
|   m_Radius: 0.5 | ||||
|   m_SlopeLimit: 45 | ||||
|   m_StepOffset: 0.1 | ||||
|   m_SkinWidth: 0.08 | ||||
|   m_MinMoveDistance: 0.001 | ||||
|   m_Center: {x: 0, y: 1, z: 0} | ||||
| --- !u!114 &6272346181302961294 | ||||
| --- !u!114 &320375778840406984 | ||||
| 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: 9b91ecbcc199f4492b9a91e820070131, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
|   sceneId: 0 | ||||
|   serverOnly: 0 | ||||
|   visible: 0 | ||||
|   m_AssetId: 2935eead9a075fd489d6a6dc273a5999 | ||||
|   hasSpawned: 0 | ||||
| --- !u!114 &-4574526707603160507 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
| @@ -69,30 +340,28 @@ MonoBehaviour: | ||||
|   m_Script: {fileID: 11500000, guid: 124e7dc536a7de8418284dc873cb1bb2, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
|   syncMode: 0 | ||||
|   syncInterval: 0.1 | ||||
|   playerCamera: {fileID: 6272346181657429396} | ||||
|   playerNeck: {fileID: 223626088105882255} | ||||
|   playerNeck: {fileID: 981273033772084037} | ||||
|   mouseSensitivity: 4 | ||||
|   neckStartAngle: 0 | ||||
|   maxCameraAngle: 90 | ||||
|   neckStartAngle: 0 | ||||
|   minCameraAngle: -90 | ||||
|   neckLength: 0 | ||||
|   mouseSmoothTime: 0 | ||||
|   neckLength: 0.2 | ||||
|   mouseSmoothTime: 0.001 | ||||
|   lockCursor: 1 | ||||
|   walkSpeed: 6 | ||||
|   sprintSpeed: 10 | ||||
|   speedUpVal: 0.3 | ||||
|   speedDownVal: 0.1 | ||||
|   moveSmoothTime: 0.05 | ||||
|   gravity: -13 | ||||
|   jumpHeight: 1 | ||||
|   jumpHeight: 2 | ||||
|   groundCheck: {fileID: 6272346182417644039} | ||||
|   groundDistance: 0.15 | ||||
|   groundDistance: 0.4 | ||||
|   groundMask: | ||||
|     serializedVersion: 2 | ||||
|     m_Bits: 64 | ||||
|   playerAnimator: {fileID: 0} | ||||
|   isGrounded: 0 | ||||
| --- !u!114 &6272346181302961297 | ||||
| --- !u!114 &7273209952621479910 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
| @@ -101,13 +370,27 @@ MonoBehaviour: | ||||
|   m_GameObject: {fileID: 6272346181302961293} | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 11500000, guid: 3317f24e780855847830f5662153b41d, type: 3} | ||||
|   m_Script: {fileID: 11500000, guid: 2f74aedd71d9a4f55b3ce499326d45fb, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
|   health: 100 | ||||
|   SyncIntervalSeconds: 5 | ||||
|   GameManager: {fileID: 0} | ||||
| --- !u!114 &3531617101327355807 | ||||
|   syncMode: 0 | ||||
|   syncInterval: 0.1 | ||||
|   clientAuthority: 1 | ||||
|   sendInterval: 0.05 | ||||
|   syncPosition: 1 | ||||
|   syncRotation: 1 | ||||
|   syncScale: 0 | ||||
|   interpolatePosition: 1 | ||||
|   interpolateRotation: 1 | ||||
|   interpolateScale: 0 | ||||
|   bufferTimeMultiplier: 1 | ||||
|   bufferSizeLimit: 64 | ||||
|   catchupThreshold: 4 | ||||
|   catchupMultiplier: 0.1 | ||||
|   showGizmos: 1 | ||||
|   showOverlay: 1 | ||||
|   overlayColor: {r: 0, g: 0, b: 0, a: 0.5} | ||||
| --- !u!114 &5317111308216027170 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
| @@ -116,15 +399,16 @@ MonoBehaviour: | ||||
|   m_GameObject: {fileID: 6272346181302961293} | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} | ||||
|   m_Script: {fileID: 11500000, guid: c2e457ad00c1a044a924a5bc00776df9, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
|   NetworkInstanceId: 0 | ||||
|   PrefabHash: 1897319656204293034 | ||||
|   PrefabHashGenerator: Player | ||||
|   AlwaysReplicateAsRoot: 0 | ||||
|   DontDestroyWithOwner: 0 | ||||
| --- !u!114 &4705578737523903129 | ||||
|   syncMode: 0 | ||||
|   syncInterval: 0.1 | ||||
|   isAlive: 0 | ||||
|   clientId: 0 | ||||
|   username: Janis | ||||
|   usernameTextObj: {fileID: 4824770690127859843} | ||||
| --- !u!114 &4959463831902427506 | ||||
| MonoBehaviour: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
| @@ -133,12 +417,13 @@ MonoBehaviour: | ||||
|   m_GameObject: {fileID: 6272346181302961293} | ||||
|   m_Enabled: 1 | ||||
|   m_EditorHideFlags: 0 | ||||
|   m_Script: {fileID: 11500000, guid: e8d0727d5ae3244e3b569694d3912374, type: 3} | ||||
|   m_Script: {fileID: 11500000, guid: 00dc60b61b501f2419e2abd7158be5f8, type: 3} | ||||
|   m_Name:  | ||||
|   m_EditorClassIdentifier:  | ||||
|   SendRate: 0.1 | ||||
|   m_Animator: {fileID: 0} | ||||
|   m_TrackedParamFlags: 0 | ||||
|   syncMode: 0 | ||||
|   syncInterval: 0.1 | ||||
|   color: {r: 1, g: 0, b: 0, a: 0} | ||||
|   renderer: {fileID: 8824871639981994016} | ||||
| --- !u!1 &6272346181657429393 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
| @@ -149,7 +434,6 @@ GameObject: | ||||
|   m_Component: | ||||
|   - component: {fileID: 6272346181657429396} | ||||
|   - component: {fileID: 6272346181657429395} | ||||
|   - component: {fileID: 6272346181657429394} | ||||
|   m_Layer: 0 | ||||
|   m_Name: Main Camera | ||||
|   m_TagString: MainCamera | ||||
| @@ -165,10 +449,10 @@ Transform: | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 6272346181657429393} | ||||
|   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||||
|   m_LocalPosition: {x: 0, y: 0.235, z: 0} | ||||
|   m_LocalPosition: {x: 0, y: 0, z: 0} | ||||
|   m_LocalScale: {x: 1, y: 1, z: 1} | ||||
|   m_Children: [] | ||||
|   m_Father: {fileID: 223626088105882255} | ||||
|   m_Father: {fileID: 981273033772084037} | ||||
|   m_RootOrder: 0 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
| --- !u!20 &6272346181657429395 | ||||
| @@ -194,7 +478,7 @@ Camera: | ||||
|     y: 0 | ||||
|     width: 1 | ||||
|     height: 1 | ||||
|   near clip plane: 0.15 | ||||
|   near clip plane: 0.3 | ||||
|   far clip plane: 1000 | ||||
|   field of view: 61.4 | ||||
|   orthographic: 0 | ||||
| @@ -214,14 +498,6 @@ Camera: | ||||
|   m_OcclusionCulling: 1 | ||||
|   m_StereoConvergence: 10 | ||||
|   m_StereoSeparation: 0.022 | ||||
| --- !u!81 &6272346181657429394 | ||||
| AudioListener: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 6272346181657429393} | ||||
|   m_Enabled: 1 | ||||
| --- !u!1 &6272346182417644038 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
| @@ -252,7 +528,7 @@ Transform: | ||||
|   m_Father: {fileID: 6272346181302961296} | ||||
|   m_RootOrder: 2 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
| --- !u!1 &7697277603114630017 | ||||
| --- !u!1 &7061967201775281134 | ||||
| GameObject: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
| @@ -260,26 +536,27 @@ GameObject: | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   serializedVersion: 6 | ||||
|   m_Component: | ||||
|   - component: {fileID: 223626088105882255} | ||||
|   - component: {fileID: 981273033772084037} | ||||
|   m_Layer: 0 | ||||
|   m_Name: Neck | ||||
|   m_Name: neck | ||||
|   m_TagString: Untagged | ||||
|   m_Icon: {fileID: 0} | ||||
|   m_NavMeshLayer: 0 | ||||
|   m_StaticEditorFlags: 0 | ||||
|   m_IsActive: 1 | ||||
| --- !u!4 &223626088105882255 | ||||
| --- !u!4 &981273033772084037 | ||||
| Transform: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 7697277603114630017} | ||||
|   m_GameObject: {fileID: 7061967201775281134} | ||||
|   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||||
|   m_LocalPosition: {x: 0, y: 1.8, z: 0} | ||||
|   m_LocalPosition: {x: 0, y: 2.01, z: 0} | ||||
|   m_LocalScale: {x: 1, y: 1, z: 1} | ||||
|   m_Children: | ||||
|   - {fileID: 6272346181657429396} | ||||
|   - {fileID: 4399039561386292163} | ||||
|   m_Father: {fileID: 6272346181302961296} | ||||
|   m_RootOrder: 3 | ||||
|   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||||
| @@ -294,6 +571,7 @@ GameObject: | ||||
|   - component: {fileID: 2458562619286483438} | ||||
|   - component: {fileID: 390397068222218691} | ||||
|   - component: {fileID: 8824871639981994016} | ||||
|   - component: {fileID: 5472825146870239901} | ||||
|   m_Layer: 0 | ||||
|   m_Name: Capsule | ||||
|   m_TagString: Untagged | ||||
| @@ -330,8 +608,8 @@ MeshRenderer: | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 8690889598169456425} | ||||
|   m_Enabled: 0 | ||||
|   m_CastShadows: 0 | ||||
|   m_Enabled: 1 | ||||
|   m_CastShadows: 1 | ||||
|   m_ReceiveShadows: 1 | ||||
|   m_DynamicOccludee: 1 | ||||
|   m_StaticShadowCaster: 0 | ||||
| @@ -365,81 +643,17 @@ MeshRenderer: | ||||
|   m_SortingLayer: 0 | ||||
|   m_SortingOrder: 0 | ||||
|   m_AdditionalVertexStreams: {fileID: 0} | ||||
| --- !u!1001 &8467787226490041652 | ||||
| PrefabInstance: | ||||
| --- !u!136 &5472825146870239901 | ||||
| CapsuleCollider: | ||||
|   m_ObjectHideFlags: 0 | ||||
|   serializedVersion: 2 | ||||
|   m_Modification: | ||||
|     m_TransformParent: {fileID: 6272346181302961296} | ||||
|     m_Modifications: | ||||
|     - target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_RootOrder | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_LocalScale.x | ||||
|       value: 1.3 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_LocalScale.y | ||||
|       value: 1.3 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_LocalScale.z | ||||
|       value: 1.3 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_LocalPosition.x | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_LocalPosition.y | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_LocalPosition.z | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_LocalRotation.w | ||||
|       value: 1 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_LocalRotation.x | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_LocalRotation.y | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_LocalRotation.z | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_LocalEulerAnglesHint.x | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_LocalEulerAnglesHint.y | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_LocalEulerAnglesHint.z | ||||
|       value: 0 | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 919132149155446097, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_Name | ||||
|       value: Human | ||||
|       objectReference: {fileID: 0} | ||||
|     - target: {fileID: 5866666021909216657, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|       propertyPath: m_Controller | ||||
|       value:  | ||||
|       objectReference: {fileID: 9100000, guid: bcfd120671431f84097ebc1045370f76, type: 2} | ||||
|     m_RemovedComponents: [] | ||||
|   m_SourcePrefab: {fileID: 100100000, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
| --- !u!4 &8217141752490496735 stripped | ||||
| Transform: | ||||
|   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 25ca9c9cd2d467c4e9b7c7759baa0db2, type: 3} | ||||
|   m_PrefabInstance: {fileID: 8467787226490041652} | ||||
|   m_CorrespondingSourceObject: {fileID: 0} | ||||
|   m_PrefabInstance: {fileID: 0} | ||||
|   m_PrefabAsset: {fileID: 0} | ||||
|   m_GameObject: {fileID: 8690889598169456425} | ||||
|   m_Material: {fileID: 0} | ||||
|   m_IsTrigger: 0 | ||||
|   m_Enabled: 1 | ||||
|   m_Radius: 0.5 | ||||
|   m_Height: 2 | ||||
|   m_Direction: 1 | ||||
|   m_Center: {x: 0, y: 0, z: 0} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 DerTyp187
					DerTyp187