diff options
| -rw-r--r-- | marching/Assets/Bundle/images/denzi/Denzi090824-1.PNG | bin | 104735 -> 104709 bytes | |||
| -rw-r--r-- | marching/Assets/Bundle/prefabs/characters.meta | 8 | ||||
| -rw-r--r-- | marching/Assets/Bundle/prefabs/enemies.meta | 8 | ||||
| -rw-r--r-- | marching/Assets/Bundle/prefabs/enemies/spirit.prefab | 199 | ||||
| -rw-r--r-- | marching/Assets/Bundle/prefabs/enemies/spirit.prefab.meta | 7 | ||||
| -rw-r--r-- | marching/Assets/Bundle/prefabs/projectiles/blade.prefab | 19 | ||||
| -rw-r--r-- | marching/Assets/Scenes/SampleScene.unity | 616 | ||||
| -rw-r--r-- | marching/Assets/Scripts/Projectiles/BladeScript.cs | 21 | ||||
| -rw-r--r-- | marching/Assets/Scripts/Unit/Characters/Samurai/SamuraiScript.cs | 7 | ||||
| -rw-r--r-- | marching/Assets/Scripts/Unit/Enemies.meta | 8 | ||||
| -rw-r--r-- | marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs | 24 | ||||
| -rw-r--r-- | marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs.meta | 11 | ||||
| -rw-r--r-- | marching/ProjectSettings/DynamicsManager.asset | 4 | ||||
| -rw-r--r-- | marching/ProjectSettings/Physics2DSettings.asset | 2 | ||||
| -rw-r--r-- | marching/ProjectSettings/TagManager.asset | 4 |
15 files changed, 886 insertions, 52 deletions
diff --git a/marching/Assets/Bundle/images/denzi/Denzi090824-1.PNG b/marching/Assets/Bundle/images/denzi/Denzi090824-1.PNG Binary files differindex 7d4e408..c573572 100644 --- a/marching/Assets/Bundle/images/denzi/Denzi090824-1.PNG +++ b/marching/Assets/Bundle/images/denzi/Denzi090824-1.PNG diff --git a/marching/Assets/Bundle/prefabs/characters.meta b/marching/Assets/Bundle/prefabs/characters.meta new file mode 100644 index 0000000..699063a --- /dev/null +++ b/marching/Assets/Bundle/prefabs/characters.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01e0b97c267881246ace414fd9172f7e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Bundle/prefabs/enemies.meta b/marching/Assets/Bundle/prefabs/enemies.meta new file mode 100644 index 0000000..4d1c59f --- /dev/null +++ b/marching/Assets/Bundle/prefabs/enemies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 307e5cbcd57efcf4e94b9fdd414be099 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Bundle/prefabs/enemies/spirit.prefab b/marching/Assets/Bundle/prefabs/enemies/spirit.prefab new file mode 100644 index 0000000..3a6b32c --- /dev/null +++ b/marching/Assets/Bundle/prefabs/enemies/spirit.prefab @@ -0,0 +1,199 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1658204677298500496 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1658204677298500499} + - component: {fileID: 1658204677298500498} + - component: {fileID: 1941031568} + - component: {fileID: 1941031567} + - component: {fileID: 6866764985330441534} + m_Layer: 0 + m_Name: spirit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1658204677298500499 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1658204677298500496} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -13.65271, y: -3.4771333, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1852705246095315071} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1658204677298500498 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1658204677298500496} + 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: -2134251297, guid: df6d427c0893ad64fb8402ae159f8d22, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.625, y: 0.96875} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &1941031568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1658204677298500496} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3f7267bb8a6746409b3dbbaf48a575b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Shadow: {fileID: 0} + speed: 1 +--- !u!50 &1941031567 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1658204677298500496} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 10 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!58 &6866764985330441534 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1658204677298500496} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.03192711, y: 0.099999994} + serializedVersion: 2 + m_Radius: 0.28388786 +--- !u!1 &1783410981004449266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1852705246095315071} + - component: {fileID: 1463077840862613621} + m_Layer: 6 + m_Name: hurtbox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1852705246095315071 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1783410981004449266} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1658204677298500499} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1463077840862613621 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1783410981004449266} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.032310963, y: 0.45234638} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.51782703, y: 0.850875} + m_EdgeRadius: 0 diff --git a/marching/Assets/Bundle/prefabs/enemies/spirit.prefab.meta b/marching/Assets/Bundle/prefabs/enemies/spirit.prefab.meta new file mode 100644 index 0000000..d308699 --- /dev/null +++ b/marching/Assets/Bundle/prefabs/enemies/spirit.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e582f35f2198532449d65b42a092e681 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Bundle/prefabs/projectiles/blade.prefab b/marching/Assets/Bundle/prefabs/projectiles/blade.prefab index 4a75a50..1718d2e 100644 --- a/marching/Assets/Bundle/prefabs/projectiles/blade.prefab +++ b/marching/Assets/Bundle/prefabs/projectiles/blade.prefab @@ -11,7 +11,8 @@ GameObject: - component: {fileID: 2217681208478449289} - component: {fileID: 2217681208478449288} - component: {fileID: 2722328784031211685} - m_Layer: 0 + - component: {fileID: 8127628266338154912} + m_Layer: 7 m_Name: blade m_TagString: Untagged m_Icon: {fileID: 0} @@ -97,3 +98,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a4c0b0adacc6e3148aab9ce0f1c0cca1, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!58 &8127628266338154912 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2217681208478449291} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.02} + serializedVersion: 2 + m_Radius: 1 diff --git a/marching/Assets/Scenes/SampleScene.unity b/marching/Assets/Scenes/SampleScene.unity index 4e3cc87..1f1d1f3 100644 --- a/marching/Assets/Scenes/SampleScene.unity +++ b/marching/Assets/Scenes/SampleScene.unity @@ -219,7 +219,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 54 + m_RootOrder: 53 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &15453348 GameObject: @@ -317,7 +317,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 59 + m_RootOrder: 58 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &21973035 GameObject: @@ -415,7 +415,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 35 + m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &31233829 GameObject: @@ -681,7 +681,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 42 + m_RootOrder: 41 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &138208121 GameObject: @@ -779,7 +779,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 55 + m_RootOrder: 54 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &185169426 GameObject: @@ -877,7 +877,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 40 + m_RootOrder: 39 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &279459902 GameObject: @@ -975,7 +975,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 36 + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &283069170 GameObject: @@ -1059,7 +1059,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 26 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -31.592} --- !u!1 &397841417 GameObject: @@ -1325,7 +1325,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 38 + m_RootOrder: 37 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &499996177 GameObject: @@ -1410,7 +1410,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 28 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &499996180 MonoBehaviour: @@ -1709,7 +1709,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 50 + m_RootOrder: 49 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &534021258 GameObject: @@ -1807,7 +1807,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 53 + m_RootOrder: 52 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &542516228 GameObject: @@ -1905,7 +1905,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 39 + m_RootOrder: 38 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &587371404 GameObject: @@ -2074,7 +2074,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &589545022 MonoBehaviour: @@ -2200,6 +2200,63 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &621802102 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1658204677298500496, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_Name + value: spirit (7) + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_RootOrder + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.x + value: -14.112 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.y + value: -3.986 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e582f35f2198532449d65b42a092e681, type: 3} --- !u!1 &629139498 GameObject: m_ObjectHideFlags: 0 @@ -2351,7 +2408,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &635997495 MonoBehaviour: @@ -2462,7 +2519,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 32 + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &745626940 GameObject: @@ -2560,7 +2617,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 34 + m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &755281966 GameObject: @@ -2658,7 +2715,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 58 + m_RootOrder: 57 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &756864024 GameObject: @@ -2756,7 +2813,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 41 + m_RootOrder: 40 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &768991207 GameObject: @@ -2854,7 +2911,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 52 + m_RootOrder: 51 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &806047544 GameObject: @@ -2952,8 +3009,65 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 60 + m_RootOrder: 59 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &815472643 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1658204677298500496, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_Name + value: spirit (6) + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_RootOrder + value: 69 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.x + value: -13.517 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.y + value: -4.013 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e582f35f2198532449d65b42a092e681, type: 3} --- !u!1 &833226662 GameObject: m_ObjectHideFlags: 0 @@ -3037,7 +3151,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 25 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &833226665 MonoBehaviour: @@ -3052,6 +3166,63 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Shadow: {fileID: 0} +--- !u!1001 &861383101 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1658204677298500496, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_Name + value: spirit (4) + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_RootOrder + value: 64 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.x + value: -13.455 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.y + value: -2.636 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e582f35f2198532449d65b42a092e681, type: 3} --- !u!1 &883941414 GameObject: m_ObjectHideFlags: 0 @@ -3232,7 +3403,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 44 + m_RootOrder: 43 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &914454100 GameObject: @@ -3498,7 +3669,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 57 + m_RootOrder: 56 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1122114106 GameObject: @@ -3583,7 +3754,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1122114109 MonoBehaviour: @@ -3680,7 +3851,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 48 + m_RootOrder: 47 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1188955386 GameObject: @@ -3765,7 +3936,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1188955389 MonoBehaviour: @@ -3792,6 +3963,7 @@ GameObject: - component: {fileID: 1195387723} - component: {fileID: 1195387722} - component: {fileID: 1195387725} + - component: {fileID: 1195387726} m_Layer: 0 m_Name: samurai_0 m_TagString: Untagged @@ -3884,7 +4056,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 61 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1195387725 MonoBehaviour: @@ -3902,6 +4074,79 @@ MonoBehaviour: m_Waypoint: {fileID: 1325402158026907919, guid: 5eb28429b437acb45828e7f313e4ac53, type: 3} m_Speed: 3 m_Blade: {fileID: 2722328784031211685, guid: 64b392d0acb4cb44c9907207b451bb4c, type: 3} +--- !u!58 &1195387726 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1195387721} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0.26039362} + serializedVersion: 2 + m_Radius: 0.37971735 +--- !u!1001 &1238814830 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1658204677298500496, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_Name + value: spirit (8) + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_RootOrder + value: 68 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.x + value: -13.533 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.y + value: -4.523 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e582f35f2198532449d65b42a092e681, type: 3} --- !u!1 &1256553123 GameObject: m_ObjectHideFlags: 0 @@ -3913,6 +4158,8 @@ GameObject: - component: {fileID: 1256553125} - component: {fileID: 1256553124} - component: {fileID: 1256553126} + - component: {fileID: 1256553128} + - component: {fileID: 1256553127} m_Layer: 0 m_Name: items_307 m_TagString: Untagged @@ -3985,7 +4232,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1256553126 MonoBehaviour: @@ -4000,6 +4247,110 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Shadow: {fileID: 0} +--- !u!61 &1256553127 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1256553123} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0.25} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + oldSize: {x: 0.4375, y: 0.5} + newSize: {x: 0.4375, y: 0.5} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.4375, y: 0.5} + m_EdgeRadius: 0 +--- !u!50 &1256553128 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1256553123} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!1001 &1291666924 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1658204677298500496, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_Name + value: spirit (3) + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_RootOrder + value: 65 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.x + value: -13.471 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.y + value: -3.146 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e582f35f2198532449d65b42a092e681, type: 3} --- !u!1 &1296034890 GameObject: m_ObjectHideFlags: 0 @@ -4096,12 +4447,12 @@ GameObject: - component: {fileID: 1302526522} - component: {fileID: 1302526521} m_Layer: 0 - m_Name: Denzi090824-1_16 + m_Name: spirit m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1302526521 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4180,7 +4531,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 46 + m_RootOrder: 45 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1306841709 GameObject: @@ -4278,7 +4629,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 47 + m_RootOrder: 46 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1327102205 GameObject: @@ -4362,7 +4713,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 49 + m_RootOrder: 48 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1347513792 GameObject: @@ -4460,7 +4811,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 37 + m_RootOrder: 36 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1449954300 GameObject: @@ -4558,8 +4909,65 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 56 + m_RootOrder: 55 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1450622391 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1658204677298500496, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_Name + value: spirit (2) + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_RootOrder + value: 63 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.x + value: -14.066 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.y + value: -3.119 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e582f35f2198532449d65b42a092e681, type: 3} --- !u!1 &1457997284 GameObject: m_ObjectHideFlags: 0 @@ -4813,7 +5221,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 31 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1582212944 GameObject: @@ -4911,7 +5319,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 43 + m_RootOrder: 42 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1640567660 GameObject: @@ -5009,7 +5417,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 45 + m_RootOrder: 44 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1673767099 GameObject: @@ -5094,7 +5502,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1673767102 MonoBehaviour: @@ -5193,6 +5601,63 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1861314230 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1658204677298500496, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_Name + value: spirit (5) + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_RootOrder + value: 67 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.x + value: -14.128 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.y + value: -4.4960003 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e582f35f2198532449d65b42a092e681, type: 3} --- !u!1 &1863051967 GameObject: m_ObjectHideFlags: 0 @@ -5377,7 +5842,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 29 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1882809087 MonoBehaviour: @@ -5476,6 +5941,63 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1941031564 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1658204677298500496, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_Name + value: spirit (1) + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_RootOrder + value: 62 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.x + value: -14.05 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.y + value: -2.609 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1658204677298500499, guid: e582f35f2198532449d65b42a092e681, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e582f35f2198532449d65b42a092e681, type: 3} --- !u!1 &2006256159 GameObject: m_ObjectHideFlags: 0 @@ -5572,7 +6094,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 33 + m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2034229593 GameObject: @@ -5657,7 +6179,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2034229596 MonoBehaviour: @@ -5730,7 +6252,7 @@ SpriteRenderer: m_SortingLayerID: -820307007 m_SortingLayer: -1 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 88b35d457f33ece448e160daaa3e7415, type: 3} + m_Sprite: {fileID: 21300000, guid: 4698309a5cc1129439e2bf4d193ca949, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -5852,7 +6374,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 30 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2217681209704276838 PrefabInstance: @@ -5863,7 +6385,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 2217681208478449289, guid: 64b392d0acb4cb44c9907207b451bb4c, type: 3} propertyPath: m_RootOrder - value: 51 + value: 50 objectReference: {fileID: 0} - target: {fileID: 2217681208478449289, guid: 64b392d0acb4cb44c9907207b451bb4c, type: 3} propertyPath: m_LocalPosition.x @@ -5928,7 +6450,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8466282754425654057, guid: 57b232593206cca4099ab1fb5ec80e04, type: 3} propertyPath: m_RootOrder - value: 61 + value: 60 objectReference: {fileID: 0} - target: {fileID: 8466282754425654057, guid: 57b232593206cca4099ab1fb5ec80e04, type: 3} propertyPath: m_LocalPosition.x diff --git a/marching/Assets/Scripts/Projectiles/BladeScript.cs b/marching/Assets/Scripts/Projectiles/BladeScript.cs index f5f613c..8a71c27 100644 --- a/marching/Assets/Scripts/Projectiles/BladeScript.cs +++ b/marching/Assets/Scripts/Projectiles/BladeScript.cs @@ -1,3 +1,4 @@ +using MH; using System; using System.Collections; using System.Collections.Generic; @@ -38,4 +39,24 @@ public class BladeScript : ProjectileBase sr.flipX = flip; } + private void OnTriggerEnter2D(Collider2D other) + { + Debug.Log(other.gameObject.name); + LayerMask layerMask = LayerMask.GetMask("Hurtbox"); + if ((layerMask & (1 << other.transform.gameObject.layer)) != 0) + { + //Debug.Log(other.GetType().Name); + Rigidbody2D rig = other.transform.parent.GetComponent<Rigidbody2D>(); + if(rig != null) + { + Debug.Log("force"); + UnitBase hero = UnitManager.hero; + Vector2 pos = transform.position; + Vector2 heroPos = hero.transform.position; + Vector2 dir = (heroPos - pos).normalized; + + rig.AddForce(-dir * 100); + } + } + } } diff --git a/marching/Assets/Scripts/Unit/Characters/Samurai/SamuraiScript.cs b/marching/Assets/Scripts/Unit/Characters/Samurai/SamuraiScript.cs index 29b182c..a271693 100644 --- a/marching/Assets/Scripts/Unit/Characters/Samurai/SamuraiScript.cs +++ b/marching/Assets/Scripts/Unit/Characters/Samurai/SamuraiScript.cs @@ -6,6 +6,11 @@ using static UnityEditor.PlayerSettings; namespace MH { + public class UnitManager + { + public static UnitBase hero; + } + public class SamuraiScript : UnitBase { [SerializeField] private WaypointScript m_Waypoint; @@ -29,6 +34,8 @@ namespace MH m_Sprite = GetComponent<SpriteRenderer>(); m_TimeSinceLastMove = float.MaxValue; StartCoroutine(CoAttack(1f)); + + UnitManager.hero = this; } protected override void Update() diff --git a/marching/Assets/Scripts/Unit/Enemies.meta b/marching/Assets/Scripts/Unit/Enemies.meta new file mode 100644 index 0000000..0256866 --- /dev/null +++ b/marching/Assets/Scripts/Unit/Enemies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc665e807c1d03e43b9b106fcb1ae902 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs b/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs new file mode 100644 index 0000000..f38b354 --- /dev/null +++ b/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs @@ -0,0 +1,24 @@ +using MH; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SpiritScript : UnitBase +{ + public float speed = 10f; + + protected override void Update() + { + base.Update(); + UnitBase hero = UnitManager.hero; + Vector2 pos = transform.position; + Vector2 heroPos = hero.transform.position; + Vector2 dir = (heroPos - pos).normalized; + pos += dir * Time.deltaTime * speed; + this.GetComponent<SpriteRenderer>().flipX = dir.x < 0; + + transform.position = pos; + } + + +} diff --git a/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs.meta b/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs.meta new file mode 100644 index 0000000..57d99b0 --- /dev/null +++ b/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b3f7267bb8a6746409b3dbbaf48a575b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/marching/ProjectSettings/DynamicsManager.asset b/marching/ProjectSettings/DynamicsManager.asset index fc90ab9..6f10efd 100644 --- a/marching/ProjectSettings/DynamicsManager.asset +++ b/marching/ProjectSettings/DynamicsManager.asset @@ -7,6 +7,7 @@ PhysicsManager: m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 + m_DefaultMaxDepenetrationVelocity: 10 m_SleepThreshold: 0.005 m_DefaultContactOffset: 0.01 m_DefaultSolverIterations: 6 @@ -17,7 +18,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: 3fffffff3fffffff3fffffffffffffff3fffffff3fffffff88ffffff48ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_AutoSimulation: 1 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 @@ -32,5 +33,6 @@ PhysicsManager: m_FrictionType: 0 m_EnableEnhancedDeterminism: 0 m_EnableUnifiedHeightmaps: 1 + m_ImprovedPatchFriction: 0 m_SolverType: 0 m_DefaultMaxAngularSpeed: 50 diff --git a/marching/ProjectSettings/Physics2DSettings.asset b/marching/ProjectSettings/Physics2DSettings.asset index 6cfcdda..afe23b0 100644 --- a/marching/ProjectSettings/Physics2DSettings.asset +++ b/marching/ProjectSettings/Physics2DSettings.asset @@ -53,4 +53,4 @@ Physics2DSettings: m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432} m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745} m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804} - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: 3fffffff3fffffff3fffffffffffffff3fffffff3fffffff88ffffff48ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/marching/ProjectSettings/TagManager.asset b/marching/ProjectSettings/TagManager.asset index 848b401..890be5b 100644 --- a/marching/ProjectSettings/TagManager.asset +++ b/marching/ProjectSettings/TagManager.asset @@ -11,8 +11,8 @@ TagManager: - - Water - UI - - - - + - Hurtbox + - Hitbox - - - |
