From 0ec8b19380b2feb928369877ad7f9d09c5264bf9 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Thu, 07 Dec 2023 23:33:16 +0000
Subject: [PATCH] Merge branch 'develop'
---
Assets/Prefab/Player.prefab | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 270 insertions(+), 0 deletions(-)
diff --git a/Assets/Prefab/Player.prefab b/Assets/Prefab/Player.prefab
new file mode 100644
index 0000000..201cb6f
--- /dev/null
+++ b/Assets/Prefab/Player.prefab
@@ -0,0 +1,270 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3345854317100013954
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2368348636056148999}
+ - component: {fileID: 916538189430653628}
+ - component: {fileID: 4941032555966952991}
+ - component: {fileID: 1512638649171213079}
+ - component: {fileID: 6914713383366050867}
+ - component: {fileID: 3884295854780712968}
+ m_Layer: 0
+ m_Name: Player
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2368348636056148999
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3345854317100013954}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 1.848, y: 0.043, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &916538189430653628
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3345854317100013954}
+ 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: 0
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_Sprite: {fileID: -1443769575, guid: 9d524f9ef20ec3344a8c3468add5e772, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 1, y: 1}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!50 &4941032555966952991
+Rigidbody2D:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3345854317100013954}
+ m_BodyType: 0
+ m_Simulated: 1
+ m_UseFullKinematicContacts: 0
+ m_UseAutoMass: 0
+ m_Mass: 1
+ m_LinearDrag: 0
+ m_AngularDrag: 0.05
+ m_GravityScale: 1
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_Interpolate: 0
+ m_SleepingMode: 1
+ m_CollisionDetection: 0
+ m_Constraints: 4
+--- !u!114 &1512638649171213079
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3345854317100013954}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 606e1a476c6c9cc439c149349c6afb16, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ moveSpeed: 5
+ maxFallSpeed: -20
+--- !u!114 &6914713383366050867
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3345854317100013954}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Actions: {fileID: -944628639613478452, guid: 718640fc92746a340863f324ce5525f1, type: 3}
+ m_NotificationBehavior: 2
+ m_UIInputModule: {fileID: 0}
+ m_DeviceLostEvent:
+ m_PersistentCalls:
+ m_Calls: []
+ m_DeviceRegainedEvent:
+ m_PersistentCalls:
+ m_Calls: []
+ m_ControlsChangedEvent:
+ m_PersistentCalls:
+ m_Calls: []
+ m_ActionEvents:
+ - m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1512638649171213079}
+ m_TargetAssemblyTypeName: PlayerController, Assembly-CSharp
+ m_MethodName: OnMove
+ m_Mode: 0
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ m_ActionId: 81f3fdb9-2cc0-44be-83b9-536f8a3e8c9e
+ m_ActionName: Player/Move[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: a84a4dd3-02c8-46fe-aead-f633f88ba867
+ m_ActionName: Player/Look[/Mouse/delta]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: aa175ec4-db5e-409a-bd7b-093945f923ff
+ m_ActionName: Player/Attack[/Mouse/leftButton]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: a852bc06-1d50-4bc4-a07d-1880d5f321b3
+ m_ActionName: UI/Navigate[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: 6cd2037e-0748-46ce-a62a-61462b4b10b7
+ m_ActionName: UI/Submit[/Keyboard/enter]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: adb950f7-3ea6-4924-a556-7ae792bc8409
+ m_ActionName: UI/Cancel[/Keyboard/escape]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: 3f35a531-bb0d-4dff-a808-7638ac6d70c4
+ m_ActionName: UI/Point[/Mouse/position]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: 3a9b05ff-58db-4285-8cd5-4ac711637187
+ m_ActionName: UI/Click[/Mouse/leftButton]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: dc30694c-28e4-4f61-8ebd-8712ede1ed47
+ m_ActionName: UI/ScrollWheel[/Mouse/scroll]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: 7763b61e-23c6-468f-8423-5533be1e36cc
+ m_ActionName: UI/MiddleClick[/Mouse/middleButton]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: 8cf89065-b650-4c52-a6c7-3d163c15e8af
+ m_ActionName: UI/RightClick[/Mouse/rightButton]
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: c6035c9a-8c00-461f-b28b-2bfb2332e525
+ m_ActionName: UI/TrackedDevicePosition
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: 3d1c6017-9298-4bde-8c6e-ad9343a4a520
+ m_ActionName: UI/TrackedDeviceOrientation
+ m_NeverAutoSwitchControlSchemes: 0
+ m_DefaultControlScheme:
+ m_DefaultActionMap: Player
+ m_SplitScreenIndex: -1
+ m_Camera: {fileID: 0}
+--- !u!61 &3884295854780712968
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3345854317100013954}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_ForceSendLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ForceReceiveLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ContactCaptureLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_CallbackLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: -0.03}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 1, y: 1}
+ newSize: {x: 1, y: 1}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 0.88, y: 0.95}
+ m_EdgeRadius: 0
--
Gitblit v1.9.3