diff --git a/Assets/Prefabs/Rock_1.prefab b/Assets/Prefabs/Rock1.prefab similarity index 99% rename from Assets/Prefabs/Rock_1.prefab rename to Assets/Prefabs/Rock1.prefab index 51c696a..30a884e 100644 --- a/Assets/Prefabs/Rock_1.prefab +++ b/Assets/Prefabs/Rock1.prefab @@ -15,7 +15,7 @@ GameObject: - component: {fileID: 2329328608366088264} - component: {fileID: 3373736657539295389} m_Layer: 0 - m_Name: Rock_1 + m_Name: Rock1 m_TagString: Object:Stone m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/Rock_1.prefab.meta b/Assets/Prefabs/Rock1.prefab.meta similarity index 100% rename from Assets/Prefabs/Rock_1.prefab.meta rename to Assets/Prefabs/Rock1.prefab.meta diff --git a/Assets/Prefabs/Rock_2.prefab b/Assets/Prefabs/Rock2.prefab similarity index 99% rename from Assets/Prefabs/Rock_2.prefab rename to Assets/Prefabs/Rock2.prefab index cc5c229..c940047 100644 --- a/Assets/Prefabs/Rock_2.prefab +++ b/Assets/Prefabs/Rock2.prefab @@ -15,7 +15,7 @@ GameObject: - component: {fileID: 3850889906121968706} - component: {fileID: 3470364473752288912} m_Layer: 0 - m_Name: Rock_2 + m_Name: Rock2 m_TagString: Object:Stone m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/Rock_2.prefab.meta b/Assets/Prefabs/Rock2.prefab.meta similarity index 100% rename from Assets/Prefabs/Rock_2.prefab.meta rename to Assets/Prefabs/Rock2.prefab.meta diff --git a/Assets/Prefabs/Tree_Birch.prefab b/Assets/Prefabs/TreeBirch.prefab similarity index 99% rename from Assets/Prefabs/Tree_Birch.prefab rename to Assets/Prefabs/TreeBirch.prefab index 9c6c130..e820c7f 100644 --- a/Assets/Prefabs/Tree_Birch.prefab +++ b/Assets/Prefabs/TreeBirch.prefab @@ -124,7 +124,7 @@ GameObject: - component: {fileID: 8095415602826057453} - component: {fileID: -4806639779125950661} m_Layer: 0 - m_Name: Tree_Birch + m_Name: TreeBirch m_TagString: Object:Tree m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/Tree_Birch.prefab.meta b/Assets/Prefabs/TreeBirch.prefab.meta similarity index 100% rename from Assets/Prefabs/Tree_Birch.prefab.meta rename to Assets/Prefabs/TreeBirch.prefab.meta diff --git a/Assets/Prefabs/Tree_Oak.prefab b/Assets/Prefabs/TreeOak.prefab similarity index 99% rename from Assets/Prefabs/Tree_Oak.prefab rename to Assets/Prefabs/TreeOak.prefab index 1002e44..068da19 100644 --- a/Assets/Prefabs/Tree_Oak.prefab +++ b/Assets/Prefabs/TreeOak.prefab @@ -124,7 +124,7 @@ GameObject: - component: {fileID: -3532374327791534734} - component: {fileID: 3756573438612552993} m_Layer: 0 - m_Name: Tree_Oak + m_Name: TreeOak m_TagString: Object:Tree m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/Tree_Oak.prefab.meta b/Assets/Prefabs/TreeOak.prefab.meta similarity index 100% rename from Assets/Prefabs/Tree_Oak.prefab.meta rename to Assets/Prefabs/TreeOak.prefab.meta diff --git a/Assets/Prefabs/Tree_Pine.prefab b/Assets/Prefabs/TreePine.prefab similarity index 99% rename from Assets/Prefabs/Tree_Pine.prefab rename to Assets/Prefabs/TreePine.prefab index 4552681..5d20bc5 100644 --- a/Assets/Prefabs/Tree_Pine.prefab +++ b/Assets/Prefabs/TreePine.prefab @@ -124,7 +124,7 @@ GameObject: - component: {fileID: 8498416014582569} - component: {fileID: 4327634743839177160} m_Layer: 0 - m_Name: Tree_Pine + m_Name: TreePine m_TagString: Object:Tree m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/Tree_Pine.prefab.meta b/Assets/Prefabs/TreePine.prefab.meta similarity index 100% rename from Assets/Prefabs/Tree_Pine.prefab.meta rename to Assets/Prefabs/TreePine.prefab.meta diff --git a/Assets/Prefabs/slime.prefab b/Assets/Prefabs/slime.prefab index 6837fb2..4b73271 100644 --- a/Assets/Prefabs/slime.prefab +++ b/Assets/Prefabs/slime.prefab @@ -1,5 +1,164 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &4493055063801180089 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8448768457604107516} + - component: {fileID: 9030123026119131298} + m_Layer: 0 + m_Name: DetectionRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8448768457604107516 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4493055063801180089} + serializedVersion: 2 + 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: 4016379320889883386} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &9030123026119131298 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4493055063801180089} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 20 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &5699495978643144128 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1643418974084022053} + - component: {fileID: 6643060119676473837} + m_Layer: 0 + m_Name: AttackRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1643418974084022053 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5699495978643144128} + serializedVersion: 2 + 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: 4016379320889883386} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &6643060119676473837 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5699495978643144128} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 10 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &9177574821772890452 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3303812525533846892} + - component: {fileID: 6737692941234265361} + m_Layer: 0 + m_Name: FollowRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3303812525533846892 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9177574821772890452} + serializedVersion: 2 + 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: 4016379320889883386} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &6737692941234265361 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9177574821772890452} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 40 + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &3474442222728961297 PrefabInstance: m_ObjectHideFlags: 0 @@ -70,7 +229,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3} + insertIndex: -1 + addedObject: {fileID: 3303812525533846892} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3} + insertIndex: -1 + addedObject: {fileID: 8448768457604107516} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3} + insertIndex: -1 + addedObject: {fileID: 1643418974084022053} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3} insertIndex: -1 @@ -82,6 +250,11 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: -9044075018784067105} m_SourcePrefab: {fileID: 100100000, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3} +--- !u!4 &4016379320889883386 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3} + m_PrefabInstance: {fileID: 3474442222728961297} + m_PrefabAsset: {fileID: 0} --- !u!1 &4392939395195199552 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3} diff --git a/Assets/Prefabs/slimeBoss.prefab b/Assets/Prefabs/slimeBoss.prefab index 89b65f6..65a4894 100644 --- a/Assets/Prefabs/slimeBoss.prefab +++ b/Assets/Prefabs/slimeBoss.prefab @@ -1,5 +1,164 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1159672073638835980 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7124699769585058840} + - component: {fileID: 2200055204059818183} + m_Layer: 0 + m_Name: DetectionRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7124699769585058840 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1159672073638835980} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6666666, y: 0.6666666, z: 0.6666666} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7468545974690983623} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &2200055204059818183 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1159672073638835980} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 20 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &2575115157376538287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1489239995669502583} + - component: {fileID: 8789267358490305510} + m_Layer: 0 + m_Name: FollowRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1489239995669502583 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2575115157376538287} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6666666, y: 0.6666666, z: 0.6666666} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7468545974690983623} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &8789267358490305510 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2575115157376538287} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 40 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6817155148171716018 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6198002354410019418} + - component: {fileID: 1047629921887515659} + m_Layer: 0 + m_Name: AttackRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6198002354410019418 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6817155148171716018} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6666666, y: 0.6666666, z: 0.6666666} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7468545974690983623} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &1047629921887515659 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6817155148171716018} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 10 + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &6930797397305739564 PrefabInstance: m_ObjectHideFlags: 0 @@ -70,7 +229,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2d2bd9cc44bc54bd98c252ecfa6a4f48, type: 3} + insertIndex: -1 + addedObject: {fileID: 1489239995669502583} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2d2bd9cc44bc54bd98c252ecfa6a4f48, type: 3} + insertIndex: -1 + addedObject: {fileID: 7124699769585058840} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2d2bd9cc44bc54bd98c252ecfa6a4f48, type: 3} + insertIndex: -1 + addedObject: {fileID: 6198002354410019418} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 2d2bd9cc44bc54bd98c252ecfa6a4f48, type: 3} insertIndex: -1 @@ -82,6 +250,11 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 525370201721428245} m_SourcePrefab: {fileID: 100100000, guid: 2d2bd9cc44bc54bd98c252ecfa6a4f48, type: 3} +--- !u!4 &7468545974690983623 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2d2bd9cc44bc54bd98c252ecfa6a4f48, type: 3} + m_PrefabInstance: {fileID: 6930797397305739564} + m_PrefabAsset: {fileID: 0} --- !u!1 &7849292920502973565 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 2d2bd9cc44bc54bd98c252ecfa6a4f48, type: 3} diff --git a/Assets/Prefabs/slimeForest.prefab b/Assets/Prefabs/slimeForest.prefab index 6315244..91b83c2 100644 --- a/Assets/Prefabs/slimeForest.prefab +++ b/Assets/Prefabs/slimeForest.prefab @@ -1,5 +1,164 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &5036660867301342165 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6554387101200656402} + - component: {fileID: 7853142552411401234} + m_Layer: 0 + m_Name: DetectionRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6554387101200656402 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5036660867301342165} + serializedVersion: 2 + 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: 1013216228128019212} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &7853142552411401234 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5036660867301342165} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 20 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6529967664554712711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6009766391395614771} + - component: {fileID: 4385698863660103387} + m_Layer: 0 + m_Name: AttackRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6009766391395614771 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6529967664554712711} + serializedVersion: 2 + 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: 1013216228128019212} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &4385698863660103387 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6529967664554712711} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 10 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &9175929318179943571 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2341284384116550055} + - component: {fileID: 7342232060668078251} + m_Layer: 0 + m_Name: FollowRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2341284384116550055 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9175929318179943571} + serializedVersion: 2 + 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: 1013216228128019212} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &7342232060668078251 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9175929318179943571} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 40 + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &685976198979138791 PrefabInstance: m_ObjectHideFlags: 0 @@ -70,7 +229,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1cf9ed5a5df74305eb65497bd7f54769, type: 3} + insertIndex: -1 + addedObject: {fileID: 2341284384116550055} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1cf9ed5a5df74305eb65497bd7f54769, type: 3} + insertIndex: -1 + addedObject: {fileID: 6554387101200656402} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1cf9ed5a5df74305eb65497bd7f54769, type: 3} + insertIndex: -1 + addedObject: {fileID: 6009766391395614771} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 1cf9ed5a5df74305eb65497bd7f54769, type: 3} insertIndex: -1 @@ -151,3 +319,8 @@ MonoBehaviour: clip: {fileID: 0} keepAlive: 0 slimeType: 4 +--- !u!4 &1013216228128019212 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1cf9ed5a5df74305eb65497bd7f54769, type: 3} + m_PrefabInstance: {fileID: 685976198979138791} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/slimeMage.prefab b/Assets/Prefabs/slimeMage.prefab index 0412813..784f498 100644 --- a/Assets/Prefabs/slimeMage.prefab +++ b/Assets/Prefabs/slimeMage.prefab @@ -1,5 +1,164 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &4496633691180825447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2600651655448529129} + - component: {fileID: 6876311072070197557} + m_Layer: 0 + m_Name: FollowRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2600651655448529129 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4496633691180825447} + serializedVersion: 2 + 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: 7781831058172122526} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &6876311072070197557 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4496633691180825447} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 40 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &4731862947757355355 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9022247765758213584} + - component: {fileID: 1696354478604808426} + m_Layer: 0 + m_Name: DetectionRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9022247765758213584 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4731862947757355355} + serializedVersion: 2 + 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: 7781831058172122526} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &1696354478604808426 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4731862947757355355} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 20 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &5239468169968409265 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2949285342971864115} + - component: {fileID: 4896157844536411139} + m_Layer: 0 + m_Name: AttackRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2949285342971864115 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5239468169968409265} + serializedVersion: 2 + 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: 7781831058172122526} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &4896157844536411139 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5239468169968409265} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 10 + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &7814914561341846133 PrefabInstance: m_ObjectHideFlags: 0 @@ -70,7 +229,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5eaf507c70ffc34389c7a01233041b51, type: 3} + insertIndex: -1 + addedObject: {fileID: 2600651655448529129} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5eaf507c70ffc34389c7a01233041b51, type: 3} + insertIndex: -1 + addedObject: {fileID: 9022247765758213584} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5eaf507c70ffc34389c7a01233041b51, type: 3} + insertIndex: -1 + addedObject: {fileID: 2949285342971864115} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5eaf507c70ffc34389c7a01233041b51, type: 3} insertIndex: -1 @@ -151,3 +319,8 @@ MonoBehaviour: clip: {fileID: 0} keepAlive: 0 slimeType: 1 +--- !u!4 &7781831058172122526 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5eaf507c70ffc34389c7a01233041b51, type: 3} + m_PrefabInstance: {fileID: 7814914561341846133} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/slimeMetal.prefab b/Assets/Prefabs/slimeMetal.prefab index abd37eb..dc9276f 100644 --- a/Assets/Prefabs/slimeMetal.prefab +++ b/Assets/Prefabs/slimeMetal.prefab @@ -1,5 +1,164 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3310626253663584990 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4325297113500892426} + - component: {fileID: 5676651237239528077} + m_Layer: 0 + m_Name: DetectionRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4325297113500892426 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3310626253663584990} + serializedVersion: 2 + 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: 186857417799578334} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &5676651237239528077 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3310626253663584990} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 20 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6172529737653590725 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4103951324519885213} + - component: {fileID: 8461584447447600355} + m_Layer: 0 + m_Name: AttackRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4103951324519885213 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6172529737653590725} + serializedVersion: 2 + 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: 186857417799578334} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &8461584447447600355 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6172529737653590725} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 10 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6532252744912899084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1130595571149962365} + - component: {fileID: 7533292371354499726} + m_Layer: 0 + m_Name: FollowRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1130595571149962365 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6532252744912899084} + serializedVersion: 2 + 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: 186857417799578334} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &7533292371354499726 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6532252744912899084} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 40 + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &368557026251003189 PrefabInstance: m_ObjectHideFlags: 0 @@ -70,7 +229,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2b24b8df3ce5c9e24bb020c5f186d23c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1130595571149962365} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2b24b8df3ce5c9e24bb020c5f186d23c, type: 3} + insertIndex: -1 + addedObject: {fileID: 4325297113500892426} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2b24b8df3ce5c9e24bb020c5f186d23c, type: 3} + insertIndex: -1 + addedObject: {fileID: 4103951324519885213} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 2b24b8df3ce5c9e24bb020c5f186d23c, type: 3} insertIndex: -1 @@ -82,6 +250,11 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 6506905793749053412} m_SourcePrefab: {fileID: 100100000, guid: 2b24b8df3ce5c9e24bb020c5f186d23c, type: 3} +--- !u!4 &186857417799578334 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2b24b8df3ce5c9e24bb020c5f186d23c, type: 3} + m_PrefabInstance: {fileID: 368557026251003189} + m_PrefabAsset: {fileID: 0} --- !u!1 &710453253311522916 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 2b24b8df3ce5c9e24bb020c5f186d23c, type: 3} diff --git a/Assets/Prefabs/slimeWarrior.prefab b/Assets/Prefabs/slimeWarrior.prefab index d898902..86e5f2e 100644 --- a/Assets/Prefabs/slimeWarrior.prefab +++ b/Assets/Prefabs/slimeWarrior.prefab @@ -1,5 +1,164 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &5226550804771198214 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3524284539837803956} + - component: {fileID: 6876879062497798300} + m_Layer: 0 + m_Name: AttackRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3524284539837803956 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5226550804771198214} + serializedVersion: 2 + 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: 7066174277831106916} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &6876879062497798300 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5226550804771198214} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 10 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &5449467032391326534 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4300927784102889960} + - component: {fileID: 21478719681285292} + m_Layer: 0 + m_Name: FollowRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4300927784102889960 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5449467032391326534} + serializedVersion: 2 + 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: 7066174277831106916} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &21478719681285292 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5449467032391326534} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 40 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7243732177382436280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3614793323640838565} + - component: {fileID: 7747801107062687595} + m_Layer: 0 + m_Name: DetectionRange + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3614793323640838565 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7243732177382436280} + serializedVersion: 2 + 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: 7066174277831106916} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &7747801107062687595 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7243732177382436280} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 20 + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &7321341630439310991 PrefabInstance: m_ObjectHideFlags: 0 @@ -70,7 +229,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: a1c34146d1c12b8a49bf7a4efca126c4, type: 3} + insertIndex: -1 + addedObject: {fileID: 4300927784102889960} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: a1c34146d1c12b8a49bf7a4efca126c4, type: 3} + insertIndex: -1 + addedObject: {fileID: 3614793323640838565} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: a1c34146d1c12b8a49bf7a4efca126c4, type: 3} + insertIndex: -1 + addedObject: {fileID: 3524284539837803956} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a1c34146d1c12b8a49bf7a4efca126c4, type: 3} insertIndex: -1 @@ -82,6 +250,11 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: -1716680456059707178} m_SourcePrefab: {fileID: 100100000, guid: a1c34146d1c12b8a49bf7a4efca126c4, type: 3} +--- !u!4 &7066174277831106916 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a1c34146d1c12b8a49bf7a4efca126c4, type: 3} + m_PrefabInstance: {fileID: 7321341630439310991} + m_PrefabAsset: {fileID: 0} --- !u!1 &7591882314654710750 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: a1c34146d1c12b8a49bf7a4efca126c4, type: 3} diff --git a/Assets/Scripts/InteractableObjects/Enemy.cs b/Assets/Scripts/InteractableObjects/Enemy.cs index ff4de0d..d1041fe 100644 --- a/Assets/Scripts/InteractableObjects/Enemy.cs +++ b/Assets/Scripts/InteractableObjects/Enemy.cs @@ -18,12 +18,19 @@ namespace Assets.Scripts.InteractableObjects public SlimeType slimeType; bool isJumping; Stopwatch jumpTimer; + bool followsPlayer; + bool isAttacking; + Stopwatch attackTimer; // Start is called before the first frame update void Start() { - isJumping = false; + isJumping = true; jumpTimer = new Stopwatch(); + jumpTimer.Start(); + followsPlayer = false; + isAttacking = false; + attackTimer = new Stopwatch(); //Nothing } @@ -36,8 +43,18 @@ namespace Assets.Scripts.InteractableObjects { jumpTimer.Start(); isJumping = true; - gameObject.GetComponent().AddForce(new Vector3(rand.Next(-5, 5), 10, rand.Next(-5, 5)), ForceMode.Impulse); - //gameObject.GetComponent().AddForce(new Vector3(5, 10, 5), ForceMode.Impulse); + Vector3 jumpVector; + if (followsPlayer) + { + jumpVector = GameObject.Find("Player").transform.position - gameObject.transform.position; + jumpVector *= 0.25f * Mathf.Log10(jumpVector.magnitude); + jumpVector.y = 5; + } + else + { + jumpVector = new Vector3(rand.Next(-5, 5), 10, rand.Next(-5, 5)); + } + gameObject.GetComponent().AddForce(jumpVector, ForceMode.Impulse); } if (jumpTimer.ElapsedMilliseconds >= 5000) { @@ -59,9 +76,22 @@ namespace Assets.Scripts.InteractableObjects } } - void OnDisable() + public void handleAttack() { - + isAttacking = true; + //Create attack logic here + } + + public void handleFollow(bool isFollowing) + { + followsPlayer = isFollowing; + isAttacking = false; + //Stop attacks + } + + public void handleDetection() + { + followsPlayer = true; } public override void handleInteraction(GameObject player) diff --git a/Assets/Scripts/Player/PlayerGameObject.cs b/Assets/Scripts/Player/PlayerGameObject.cs index edc4fb9..dd50955 100644 --- a/Assets/Scripts/Player/PlayerGameObject.cs +++ b/Assets/Scripts/Player/PlayerGameObject.cs @@ -235,6 +235,45 @@ namespace Assets.Scripts.Player transform.position = new Vector3(transform.position.x + 10, 10, transform.position.z); } } + + if (col.name.Contains("Range")) + { + Enemy enemy = col.gameObject.transform.parent.GetComponent(); + switch (col.name) + { + case "AttackRange": + enemy.handleAttack(); + break; + case "DetectionRange": + enemy.handleDetection(); + break; + case "FollowRange": + //Do nothing, as it needs to be detected first + break; + } + + } + } + + void OnTriggerExit(Collider col) + { + if (col.name.Contains("Range")) + { + Enemy enemy = col.gameObject.transform.parent.GetComponent(); + switch (col.name) + { + case "AttackRange": + enemy.handleFollow(true); + break; + case "DetectionRange": + //Do nothing as it already follows player + break; + case "FollowRange": + enemy.handleFollow(false); + break; + } + + } } public void displayAction(int index, GameObject image, GameObject desc) diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index af6ebf4..68cf126 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -1,6 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.ContainerWindow + m_PixelRect: + serializedVersion: 2 + x: 3840 + y: 28 + width: 1920 + height: 1052 + m_ShowMode: 0 + m_Title: Game + m_RootView: {fileID: 4} + m_MinSize: {x: 100, y: 126} + m_MaxSize: {x: 4000, y: 4026} + m_Maximized: 0 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -17,14 +41,65 @@ MonoBehaviour: x: 1920 y: 28 width: 1920 - height: 998 + height: 971 m_ShowMode: 4 - m_Title: Project - m_RootView: {fileID: 2} + m_Title: Scene + m_RootView: {fileID: 5} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 0 ---- !u!114 &2 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.DockArea + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 1052 + m_MinSize: {x: 100, y: 126} + m_MaxSize: {x: 4000, y: 4026} + m_ActualView: {fileID: 18} + m_Panes: + - {fileID: 18} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.SplitView + m_Children: + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 1052 + m_MinSize: {x: 100, y: 126} + m_MaxSize: {x: 4000, y: 4026} + vertical: 0 + controlID: 4852 + draggingID: 0 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,22 +112,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 3} - - {fileID: 5} - - {fileID: 4} + - {fileID: 6} + - {fileID: 8} + - {fileID: 7} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1920 - height: 998 + height: 971 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 36 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &3 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -74,7 +149,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &4 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -90,12 +165,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 978 + y: 951 width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &5 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -108,19 +183,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 y: 36 width: 1920 - height: 942 + height: 915 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 40 + controlID: 18 draggingID: 0 ---- !u!114 &6 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -133,20 +208,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - - {fileID: 12} + - {fileID: 10} + - {fileID: 15} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1920 - height: 942 + height: 915 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 41 + controlID: 19 draggingID: 0 ---- !u!114 &7 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -159,20 +234,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 8} - {fileID: 11} + - {fileID: 14} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1472 - height: 942 + width: 1456 + height: 915 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 42 + controlID: 20 draggingID: 0 ---- !u!114 &8 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -185,20 +260,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 10} + - {fileID: 12} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1472 - height: 642 + width: 1456 + height: 624 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 43 + controlID: 21 draggingID: 0 ---- !u!114 &9 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -215,16 +290,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 366 - height: 642 + width: 361 + height: 624 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 14} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -239,19 +314,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 366 + x: 361 y: 0 - width: 1106 - height: 642 + width: 1095 + height: 624 m_MinSize: {x: 202, y: 226} m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 13} - - {fileID: 15} + - {fileID: 16} m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &11 + m_LastSelected: 0 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -261,24 +335,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 642 - width: 1472 - height: 300 - m_MinSize: {x: 231, y: 276} - m_MaxSize: {x: 10001, y: 10026} - m_ActualView: {fileID: 16} + y: 624 + width: 1456 + height: 291 + m_MinSize: {x: 101, y: 126} + m_MaxSize: {x: 4001, y: 4026} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 16} - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &12 + - {fileID: 19} + - {fileID: 20} + m_Selected: 1 + m_LastSelected: 0 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -293,18 +367,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1472 + x: 1456 y: 0 - width: 448 - height: 942 + width: 464 + height: 915 m_MinSize: {x: 276, y: 76} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 18} + - {fileID: 21} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -325,10 +399,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 367 + x: 362 y: 24 - width: 1104 - height: 616 + width: 1093 + height: 598 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -385,11 +459,11 @@ MonoBehaviour: displayed: 0 id: unity-search-toolbar index: 2 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 layout: 1 size: {x: 0, y: 0} @@ -441,11 +515,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Light Settings index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -469,11 +543,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Cloth Constraints index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -483,11 +557,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Cloth Collisions index: 2 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -539,11 +613,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Occlusion Culling index: 3 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -553,11 +627,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Physics Debugger index: 4 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -567,11 +641,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Scene Visibility index: 5 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -707,11 +781,11 @@ MonoBehaviour: displayed: 0 id: Brush Attributes index: 2 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -735,11 +809,11 @@ MonoBehaviour: displayed: 0 id: Terrain Tools index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -749,11 +823,11 @@ MonoBehaviour: displayed: 0 id: Brush Masks index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -763,11 +837,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Lighting Visualization Colors index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -791,11 +865,11 @@ MonoBehaviour: displayed: 0 id: SceneView/CamerasOverlay index: 9 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -805,11 +879,11 @@ MonoBehaviour: displayed: 0 id: Scene View/PBR Validation Settings index: 10 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -819,11 +893,11 @@ MonoBehaviour: displayed: 0 id: unity-spline-inspector index: 11 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -855,9 +929,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: -21.803177, y: 0.5, z: -141.33119} + m_Target: {x: 160.92558, y: 44.309845, z: -43.20334} speed: 2 - m_Value: {x: 0.11856556, y: -0.23092982, z: -0.16848195} + m_Value: {x: 160.92558, y: 44.309845, z: -43.20334} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -903,13 +977,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.11655971, y: -0.42193526, z: 0.05481199, w: 0.8974066} + m_Target: {x: -0.119701125, y: 0.86540914, z: -0.24722783, w: -0.41900206} speed: 2 - m_Value: {x: -0.08990689, y: 0.550205, z: -0.059753925, w: -0.82799727} + m_Value: {x: -0.11970438, y: 0.8654327, z: -0.24723455, w: -0.41901344} m_Size: - m_Target: 0.5578986 + m_Target: 0.30661905 speed: 2 - m_Value: 1.6087397 + m_Value: 0.30661905 m_Ortho: m_Target: 0 speed: 2 @@ -930,7 +1004,7 @@ MonoBehaviour: m_LastSceneViewRotation: {x: -0.15849097, y: 0.83661556, z: -0.318175, w: -0.41673577} m_LastSceneViewOrtho: 0 m_Viewpoint: - m_SceneView: {fileID: 13} + m_SceneView: {fileID: 16} m_CameraOverscanSettings: m_Opacity: 50 m_Scale: 1 @@ -943,7 +1017,7 @@ MonoBehaviour: name: Contributors / Receivers section: Lighting m_ViewIsLockedToObject: 0 ---- !u!114 &14 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -966,8 +1040,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 24 - width: 365 - height: 616 + width: 360 + height: 598 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -984,7 +1058,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: e4bbfeff + m_ExpandedIDs: 68a2fdff92a2fdffacacfdffb8aefdff0eb8fdff38b8fdff7004feff9a04feff7a94feffe6f9feffe66affff12fbffffbe9300001a460100404901009e490100d0ec01000a0103006c0b0500740d05004c110500 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1001,7 +1075,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 12} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1009,7 +1083,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 6f1193b7c6ac3e64ca0e317b16d20212 ---- !u!114 &15 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1030,10 +1104,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 2286 - y: 91 - width: 1104 - height: 634 + x: 0 + y: 26 + width: 1920 + height: 1026 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1080,7 +1154,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -1089,30 +1163,30 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1104 - height: 613 - m_Scale: {x: 0.5675926, y: 0.5675926} - m_Translation: {x: 552, y: 306.5} + width: 1920 + height: 1005 + m_Scale: {x: 0.93055564, y: 0.9305556} + m_Translation: {x: 960, y: 502.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -972.5285 + x: -1031.6417 y: -540 - width: 1945.057 + width: 2063.2834 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.5675926 - m_LastWindowPixelSize: {x: 1104, y: 634} + m_defaultScale: 0.9305556 + m_LastWindowPixelSize: {x: 1920, y: 1026} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} m_showToolbar: 1 ---- !u!114 &16 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1133,9 +1207,9 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 666 - width: 1471 + x: 1920 + y: 733 + width: 1455 height: 274 m_SerializedDataModeController: m_DataMode: 0 @@ -1159,7 +1233,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs/FBX + - Assets/Prefabs m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1169,16 +1243,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Prefabs/FBX + - Assets/Prefabs m_LastFoldersGridSize: -1 m_LastProjectPath: /media/nicola/M2SSD/Programmieren/Unity/TalesOfNovariel m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 300} - m_SelectedIDs: a2960000 - m_LastClickedID: 38562 - m_ExpandedIDs: 00000000ea9a0000ec9a0000ee9a0000f09a0000f29a0000f49a0000 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: b69b0000 + m_LastClickedID: 39862 + m_ExpandedIDs: 00000000ec9a0000ee9a0000f09a0000f29a0000f49a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1195,7 +1269,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 14} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1207,7 +1281,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000ea9a0000ec9a0000ee9a0000f09a0000f29a0000f49a0000 + m_ExpandedIDs: 00000000ec9a0000ee9a0000f09a0000f29a0000f49a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1253,7 +1327,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 14} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1265,7 +1339,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 335 ---- !u!114 &17 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1287,9 +1361,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 751 - width: 1471 - height: 283 + y: 648 + width: 1455 + height: 265 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1301,7 +1375,7 @@ MonoBehaviour: m_SaveData: [] m_ContainerData: [] m_OverlaysVisible: 1 ---- !u!114 &18 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1322,10 +1396,10 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1473 + x: 1457 y: 24 - width: 447 - height: 916 + width: 463 + height: 889 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1344,7 +1418,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 69 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings index 0570e0b..6b96bd0 100644 --- a/UserSettings/Search.settings +++ b/UserSettings/Search.settings @@ -29,6 +29,10 @@ scopes = { "picker_visibility_flags.075BCD15" = "264" "picker_item_size.075BCD15" = "96" "picker_inspector.075BCD15" = "0" + "picker_window_position_offset.00000000" = "0;0;320;550" + "picker_visibility_flags.00000000" = "0" + "picker_item_size.00000000" = "1" + "picker_inspector.00000000" = "0" } providers = { packages = { @@ -121,4 +125,5 @@ ignoredProperties = "id;name;classname;imagecontentshash" helperWidgetCurrentArea = "all" disabledIndexers = "" minIndexVariations = 2 -findProviderIndexHelper = true \ No newline at end of file +findProviderIndexHelper = true +itemIconSize = 32 \ No newline at end of file