From b07135d8f35fd43bac01fccfb8d268c7baabe9c1 Mon Sep 17 00:00:00 2001 From: TAASONI3 Date: Wed, 13 Dec 2023 15:33:12 +0100 Subject: [PATCH] fixed locals, fixed object+world gen --- .../StringTable/MyTexts Shared Data.asset | 2 +- Assets/Locals/StringTable/MyTexts_en.asset | 2 +- Assets/Prefabs/House.prefab | 92 ++++++-- Assets/Prefabs/NPC.prefab | 30 ++- Assets/Prefabs/NPCIdle.prefab | 37 +++- Assets/Prefabs/Rock_1.prefab | 2 +- Assets/Prefabs/Rock_2.prefab | 27 ++- Assets/Prefabs/SlimeBaseIdle.prefab | 31 ++- Assets/Prefabs/SlimeBossIdle.prefab | 33 ++- Assets/Prefabs/SlimeForestIdle.prefab | 33 ++- Assets/Prefabs/SlimeMageIdle.prefab | 33 ++- Assets/Prefabs/SlimeMetalIdle.prefab | 33 ++- Assets/Prefabs/SlimeMiniBossIdle.prefab | 33 ++- Assets/Prefabs/SlimeWarriorIdle.prefab | 33 ++- Assets/Prefabs/Tree_1.prefab | 2 +- Assets/Prefabs/Tree_2.prefab | 27 ++- Assets/Prefabs/copperOre.prefab | 31 ++- Assets/Prefabs/goldOre.prefab | 31 ++- Assets/Prefabs/ironOre.prefab | 31 ++- Assets/Prefabs/newTile.prefab | 45 ++-- Assets/Prefabs/tinOre.prefab | 33 ++- Assets/Scenes/MenuScene.unity | 196 +++++++++--------- Assets/Scripts/ContentGenerator.cs | 27 +-- Assets/Scripts/InventorySlot.cs | 1 - Assets/Scripts/NoiseGenerator.cs | 10 +- Assets/Scripts/Player/PlayerGameObject.cs | 9 +- Assets/Scripts/Tile.cs | 46 ++-- Assets/Scripts/TileType.cs | 12 +- Assets/Scripts/WorldGenerator.cs | 2 +- 29 files changed, 649 insertions(+), 275 deletions(-) diff --git a/Assets/Locals/StringTable/MyTexts Shared Data.asset b/Assets/Locals/StringTable/MyTexts Shared Data.asset index 4702a4e..6323cc7 100644 --- a/Assets/Locals/StringTable/MyTexts Shared Data.asset +++ b/Assets/Locals/StringTable/MyTexts Shared Data.asset @@ -984,7 +984,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 236781229043712 - m_Key: plane + m_Key: Plain m_Metadata: m_Items: [] - m_Id: 13166294331397 diff --git a/Assets/Locals/StringTable/MyTexts_en.asset b/Assets/Locals/StringTable/MyTexts_en.asset index bee9995..03835f9 100644 --- a/Assets/Locals/StringTable/MyTexts_en.asset +++ b/Assets/Locals/StringTable/MyTexts_en.asset @@ -1101,7 +1101,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 236781229043712 - m_Localized: Plane + m_Localized: Plain m_Metadata: m_Items: [] - m_Id: 236911118249984 diff --git a/Assets/Prefabs/House.prefab b/Assets/Prefabs/House.prefab index e1d0515..ccaa35f 100644 --- a/Assets/Prefabs/House.prefab +++ b/Assets/Prefabs/House.prefab @@ -31,13 +31,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7662282263901986782} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: -0, y: 4, z: 0} m_LocalScale: {x: 100, y: 100, z: 400} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7290224385214606018} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1944602544116445065 MeshFilter: @@ -99,9 +99,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7662282263901986782} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.02, y: 0.12, z: 0.020000005} m_Center: {x: 0, y: 0.05, z: 0} --- !u!65 &1767011682744252576 @@ -112,9 +120,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7662282263901986782} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.12, y: 0.02, z: 0.020000005} m_Center: {x: -0.05, y: 0.1, z: 0} --- !u!65 &5010910893148806149 @@ -125,9 +141,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7662282263901986782} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.02, y: 0.12, z: 0.020000005} m_Center: {x: -0.1, y: 0.05, z: 0} --- !u!65 &793041006294504099 @@ -138,9 +162,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7662282263901986782} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.05, y: 0.02, z: 0.020000005} m_Center: {x: -0.015, y: 0, z: 0} --- !u!65 &3900849479010375039 @@ -151,9 +183,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7662282263901986782} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.05, y: 0.02, z: 0.020000005} m_Center: {x: -0.085, y: 0, z: 0} --- !u!65 &1007100526981742462 @@ -164,9 +204,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7662282263901986782} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.05, y: 0.02, z: 0.01} m_Center: {x: -0.05, y: 0, z: 0.005} --- !u!1 &7955543730560905336 @@ -193,16 +241,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7955543730560905336} + 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_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 453517342273645446} - {fileID: 2475709711252233216} - {fileID: 7319099656983815127} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &6286653566616308184 MeshRenderer: @@ -275,13 +323,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8263785157974351812} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: -5, y: 2, z: 0} m_LocalScale: {x: 100, y: 25, z: 200} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7290224385214606018} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1355778423402970440 MeshFilter: @@ -341,9 +389,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8263785157974351812} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 2619086233303812490, guid: 8e16fe9f84a3b4074820e5e1000c8454, type: 3} @@ -389,9 +445,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8263785157974351812} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.02, y: 0.04170223, z: 0.020000005} m_Center: {x: 0, y: -0.010851122, z: 1.2354351e-17} --- !u!1001 &8303087274738875168 @@ -399,6 +463,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7290224385214606018} m_Modifications: - target: {fileID: 1632792077707532535, guid: 8b854ede9bf3508eeb0ecc0b6043496c, type: 3} @@ -466,6 +531,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8b854ede9bf3508eeb0ecc0b6043496c, type: 3} --- !u!4 &7319099656983815127 stripped Transform: diff --git a/Assets/Prefabs/NPC.prefab b/Assets/Prefabs/NPC.prefab index a4a501b..684d1c4 100644 --- a/Assets/Prefabs/NPC.prefab +++ b/Assets/Prefabs/NPC.prefab @@ -28,12 +28,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6513753043401943383} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: 1, z: 2} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6513753043401943378 MeshFilter: @@ -54,6 +55,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -92,8 +94,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6513753043401943383} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.5 m_Height: 2 m_Direction: 1 @@ -117,12 +128,23 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6513753043401943383} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 - m_Constraints: 90 + m_Constraints: 122 m_CollisionDetection: 0 diff --git a/Assets/Prefabs/NPCIdle.prefab b/Assets/Prefabs/NPCIdle.prefab index 071d3fc..8f8057c 100644 --- a/Assets/Prefabs/NPCIdle.prefab +++ b/Assets/Prefabs/NPCIdle.prefab @@ -28,12 +28,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4918528717594724652} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 920.2423, y: 908.753, z: -1397.8136} - m_LocalScale: {x: 0.75, y: 0.75, z: 1} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3025019558383155384 SpriteRenderer: @@ -46,6 +47,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -88,7 +90,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!95 &6200548482590590452 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -101,10 +103,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!65 &926641932008158262 BoxCollider: m_ObjectHideFlags: 0 @@ -113,9 +117,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4918528717594724652} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 2.5, z: 0.2} m_Center: {x: 0, y: 0, z: 0} --- !u!54 &2439320622826616689 @@ -125,14 +137,25 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4918528717594724652} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 - m_Constraints: 90 + m_Constraints: 122 m_CollisionDetection: 0 --- !u!114 &93839263464728524 MonoBehaviour: diff --git a/Assets/Prefabs/Rock_1.prefab b/Assets/Prefabs/Rock_1.prefab index 0722ca3..6068235 100644 --- a/Assets/Prefabs/Rock_1.prefab +++ b/Assets/Prefabs/Rock_1.prefab @@ -30,7 +30,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 0} - m_LocalScale: {x: 10, y: 10, z: 10} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Prefabs/Rock_2.prefab b/Assets/Prefabs/Rock_2.prefab index 08d3d0c..663e2bb 100644 --- a/Assets/Prefabs/Rock_2.prefab +++ b/Assets/Prefabs/Rock_2.prefab @@ -27,13 +27,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4009596908532748171} + 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_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &810920735779723924 MeshFilter: @@ -93,9 +93,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4009596908532748171} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -5495902117074765545, guid: 24561849f2237bdae82a34946c395e2f, type: 3} @@ -106,10 +114,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4009596908532748171} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 10 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 diff --git a/Assets/Prefabs/SlimeBaseIdle.prefab b/Assets/Prefabs/SlimeBaseIdle.prefab index b64a340..a405269 100644 --- a/Assets/Prefabs/SlimeBaseIdle.prefab +++ b/Assets/Prefabs/SlimeBaseIdle.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1559523074422732712} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: -0.3043864, y: 0.15276223, z: 0.9322337} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5641417337849635797} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1521455441413793094 MeshFilter: @@ -108,13 +108,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4688534640967278678} + 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: 5641417337849635797} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1818392387320441820 MeshFilter: @@ -192,15 +192,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4972404453844040047} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -4.4827, y: 0.85681313, z: -9.817575} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8076583132970814980} - {fileID: 555552680004695237} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1904705628739848748 MonoBehaviour: @@ -222,9 +222,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4972404453844040047} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 2959467708922500008, guid: 631f87ef3202ea28687b84b3e6031f49, type: 3} @@ -235,10 +243,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4972404453844040047} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 diff --git a/Assets/Prefabs/SlimeBossIdle.prefab b/Assets/Prefabs/SlimeBossIdle.prefab index af2abf0..d580213 100644 --- a/Assets/Prefabs/SlimeBossIdle.prefab +++ b/Assets/Prefabs/SlimeBossIdle.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4009429731162968192} + serializedVersion: 2 m_LocalRotation: {x: 0.000000021855696, y: 0, z: -0, w: 1} m_LocalPosition: {x: -0.3043864, y: 0.15276223, z: 0.9322337} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7803196416337626365} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3971498983060914798 MeshFilter: @@ -108,13 +108,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4226256666451239148} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: -0, y: 0.88267493, z: 0} m_LocalScale: {x: 50, y: 50, z: 75} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7803196416337626365} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2122558792854445539 MeshFilter: @@ -191,13 +191,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7138723880517093246} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 100, y: 100, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7803196416337626365} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4268542579448237300 MeshFilter: @@ -275,16 +275,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7422307534756093511} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.0726633, y: 0.85681325, z: -9.327548} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5914663856013388076} - {fileID: 7091902927605422426} - {fileID: 2717195434078770157} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-8135730071228705793 MonoBehaviour: @@ -306,9 +306,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7422307534756093511} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 2959467708922500008, guid: 631f87ef3202ea28687b84b3e6031f49, type: 3} @@ -319,10 +327,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7422307534756093511} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 diff --git a/Assets/Prefabs/SlimeForestIdle.prefab b/Assets/Prefabs/SlimeForestIdle.prefab index 3cd33ff..6c1c264 100644 --- a/Assets/Prefabs/SlimeForestIdle.prefab +++ b/Assets/Prefabs/SlimeForestIdle.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2525705241748358274} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0.5314933, y: 1.1279188, z: 0} m_LocalScale: {x: 10, y: 10, z: 20} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8494123487333769363} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &351107576752748941 MeshFilter: @@ -119,13 +119,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3319133795678483694} + serializedVersion: 2 m_LocalRotation: {x: 0.000000021855696, y: 0, z: -0, w: 1} m_LocalPosition: {x: -0.3043864, y: 0.15276223, z: 0.9322337} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8494123487333769363} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3365927019875984896 MeshFilter: @@ -202,13 +202,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8843488609347756816} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 100, y: 100, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8494123487333769363} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2492563580371036314 MeshFilter: @@ -286,16 +286,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9127354857402186281} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -7.1362953, y: 0.8568135, z: -9.345547} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5457992154690751810} - {fileID: 8917186230581099828} - {fileID: 4332145474068232067} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-9107466593245354884 MonoBehaviour: @@ -317,9 +317,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9127354857402186281} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 2959467708922500008, guid: 631f87ef3202ea28687b84b3e6031f49, type: 3} @@ -330,10 +338,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9127354857402186281} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 diff --git a/Assets/Prefabs/SlimeMageIdle.prefab b/Assets/Prefabs/SlimeMageIdle.prefab index ac12e9c..6b80c04 100644 --- a/Assets/Prefabs/SlimeMageIdle.prefab +++ b/Assets/Prefabs/SlimeMageIdle.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2708904517552353782} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: -0.3043864, y: 0.15276223, z: 0.9322337} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9113359965981287819} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2679136135708975896 MeshFilter: @@ -108,13 +108,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2924247232951648666} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 1.3296216, z: -0.085970916} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9113359965981287819} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1100983527967292565 MeshFilter: @@ -191,13 +191,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8152213366730040840} + 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: 9113359965981287819} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2958659942071348610 MeshFilter: @@ -275,16 +275,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8445085162624319281} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -10.091804, y: 0.85681313, z: -9.799664} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4622582341891934298} - {fileID: 8095270314147723308} - {fileID: 4001104737291694747} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &-7730725110928551322 MonoBehaviour: @@ -306,9 +306,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8445085162624319281} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 2959467708922500008, guid: 631f87ef3202ea28687b84b3e6031f49, type: 3} @@ -319,10 +327,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8445085162624319281} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 diff --git a/Assets/Prefabs/SlimeMetalIdle.prefab b/Assets/Prefabs/SlimeMetalIdle.prefab index eeefb77..7acbb34 100644 --- a/Assets/Prefabs/SlimeMetalIdle.prefab +++ b/Assets/Prefabs/SlimeMetalIdle.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1168908679270300560} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 100, y: 100, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2261825194822793235} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5194325029138165786 MeshFilter: @@ -109,16 +109,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1452497377981145769} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -12.952088, y: 0.856813, z: -9.418654} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2394789906264233410} - {fileID: 1243727869997114804} - {fileID: 6240987505827720963} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4495711281441888207 MonoBehaviour: @@ -140,9 +140,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1452497377981145769} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 2959467708922500008, guid: 631f87ef3202ea28687b84b3e6031f49, type: 3} @@ -153,10 +161,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1452497377981145769} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -187,13 +206,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4939675641827880046} + serializedVersion: 2 m_LocalRotation: {x: 0.000000021855696, y: 0, z: -0, w: 1} m_LocalPosition: {x: -0.3043864, y: 0.15276223, z: 0.9322337} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2261825194822793235} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4914696595242286720 MeshFilter: @@ -270,13 +289,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5300655123622845442} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: -0, y: 1.0095178, z: 0} m_LocalScale: {x: 10, y: 10, z: 20} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2261825194822793235} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7952737032997937421 MeshFilter: diff --git a/Assets/Prefabs/SlimeMiniBossIdle.prefab b/Assets/Prefabs/SlimeMiniBossIdle.prefab index 5aab704..83abd1e 100644 --- a/Assets/Prefabs/SlimeMiniBossIdle.prefab +++ b/Assets/Prefabs/SlimeMiniBossIdle.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 127209223992796959} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 100, y: 100, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1051769021957432476} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6480344831830518933 MeshFilter: @@ -109,16 +109,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 419805594404797990} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -15.735274, y: 0.85681325, z: -9.778998} - m_LocalScale: {x: 0.875, y: 0.875, z: 0.875} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3514844996491184461} - {fileID: 52257267236927803} - {fileID: 5145166103919178636} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3721256651052916070 MonoBehaviour: @@ -140,9 +140,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 419805594404797990} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 2959467708922500008, guid: 631f87ef3202ea28687b84b3e6031f49, type: 3} @@ -153,10 +161,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 419805594404797990} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -187,13 +206,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6158246492121624801} + serializedVersion: 2 m_LocalRotation: {x: 0.000000021855696, y: 0, z: -0, w: 1} m_LocalPosition: {x: -0.3043864, y: 0.15276223, z: 0.9322337} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1051769021957432476} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6183370674242085391 MeshFilter: @@ -270,13 +289,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6373870682498678925} + serializedVersion: 2 m_LocalRotation: {x: -0.66869575, y: -0.08975861, z: 0.22065507, w: 0.70434415} m_LocalPosition: {x: -0.48997515, y: 0.88267493, z: 0} m_LocalScale: {x: 25, y: 25, z: 75} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1051769021957432476} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &9198303651051289986 MeshFilter: diff --git a/Assets/Prefabs/SlimeWarriorIdle.prefab b/Assets/Prefabs/SlimeWarriorIdle.prefab index 9d7fd1f..049c294 100644 --- a/Assets/Prefabs/SlimeWarriorIdle.prefab +++ b/Assets/Prefabs/SlimeWarriorIdle.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3590361294465366248} + serializedVersion: 2 m_LocalRotation: {x: -0.69991654, y: -0.077013835, z: 0.18974392, w: 0.684239} m_LocalPosition: {x: -0.63952434, y: 1.109589, z: 0} m_LocalScale: {x: 20, y: 0.99999994, z: 50} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7439855689670810873} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1585829336565417447 MeshFilter: @@ -110,13 +110,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4382410906995476612} + serializedVersion: 2 m_LocalRotation: {x: 0.000000021855696, y: 0, z: -0, w: 1} m_LocalPosition: {x: -0.3043864, y: 0.15276223, z: 0.9322337} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7439855689670810873} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4352924549880437354 MeshFilter: @@ -193,13 +193,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7522417735511924602} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 100, y: 100, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7439855689670810873} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3479523589609018608 MeshFilter: @@ -277,16 +277,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7815009759384241731} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18.473278, y: 0.85681325, z: -9.911191} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6440204540026138920} - {fileID: 7574677147011367262} - {fileID: 3368765368734354409} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3440633642314224233 MonoBehaviour: @@ -308,9 +308,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7815009759384241731} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 2959467708922500008, guid: 631f87ef3202ea28687b84b3e6031f49, type: 3} @@ -321,10 +329,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7815009759384241731} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 diff --git a/Assets/Prefabs/Tree_1.prefab b/Assets/Prefabs/Tree_1.prefab index 4c4ada5..b51649f 100644 --- a/Assets/Prefabs/Tree_1.prefab +++ b/Assets/Prefabs/Tree_1.prefab @@ -30,7 +30,7 @@ Transform: 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: 2, z: 1} + m_LocalScale: {x: 0.1, y: 0.2, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Prefabs/Tree_2.prefab b/Assets/Prefabs/Tree_2.prefab index 0a4a62d..0bed074 100644 --- a/Assets/Prefabs/Tree_2.prefab +++ b/Assets/Prefabs/Tree_2.prefab @@ -27,13 +27,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9023347993894783213} + 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: 3, z: 1} + m_LocalScale: {x: 0.1, y: 0.3, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4746041977943514610 MeshFilter: @@ -94,9 +94,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9023347993894783213} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 3613567641014311022, guid: e4e3e654e339acc099bd19d8e40a5387, type: 3} @@ -107,10 +115,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9023347993894783213} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 10 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 diff --git a/Assets/Prefabs/copperOre.prefab b/Assets/Prefabs/copperOre.prefab index 32ede81..d9f7c3a 100644 --- a/Assets/Prefabs/copperOre.prefab +++ b/Assets/Prefabs/copperOre.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 103474722946308485} + serializedVersion: 2 m_LocalRotation: {x: -0.030137267, y: -0.18757918, z: 0.32253432, w: 0.92729574} m_LocalPosition: {x: -0.16520548, y: 0.0062828064, z: -0.31748235} m_LocalScale: {x: 0.12499999, y: 0.49999994, z: 0.12499999} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4848850860749154617} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8476677249860510247 MeshFilter: @@ -108,15 +108,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5188503590062044035} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -418.7024, y: 1, z: -62.4635} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8731068313411171416} - {fileID: 6152205392487755750} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &-2572412590075727139 Rigidbody: @@ -125,10 +125,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5188503590062044035} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -142,9 +153,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5188503590062044035} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -5266056624350073623, guid: 21b8842f73b5b16dc87c1cb1b0afe0ce, type: 3} @@ -173,13 +192,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8310517336631356992} + 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: 4848850860749154617} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1161712919478833859 MeshFilter: diff --git a/Assets/Prefabs/goldOre.prefab b/Assets/Prefabs/goldOre.prefab index 6fbbe3a..753201d 100644 --- a/Assets/Prefabs/goldOre.prefab +++ b/Assets/Prefabs/goldOre.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 864574327375996918} + serializedVersion: 2 m_LocalRotation: {x: -0.030137267, y: -0.18757918, z: 0.32253432, w: 0.92729574} m_LocalPosition: {x: -0.16520548, y: 0.0062828064, z: -0.31748235} m_LocalScale: {x: 0.12499999, y: 0.49999994, z: 0.12499999} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5321737818351179594} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &9165737283788954708 MeshFilter: @@ -108,15 +108,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4796699693279464944} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -418.7024, y: 1, z: -62.4635} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8339246131117804075} - {fileID: 6913322597155393941} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &8145716631555738662 Rigidbody: @@ -125,10 +125,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4796699693279464944} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -142,9 +153,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4796699693279464944} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -5266056624350073623, guid: 21b8842f73b5b16dc87c1cb1b0afe0ce, type: 3} @@ -173,13 +192,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8774396427657433139} + 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: 5321737818351179594} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1913805325201173680 MeshFilter: diff --git a/Assets/Prefabs/ironOre.prefab b/Assets/Prefabs/ironOre.prefab index 0019b1a..586d18b 100644 --- a/Assets/Prefabs/ironOre.prefab +++ b/Assets/Prefabs/ironOre.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2286725907388461764} + serializedVersion: 2 m_LocalRotation: {x: -0.030137267, y: -0.18757918, z: 0.32253432, w: 0.92729574} m_LocalPosition: {x: -0.16520548, y: 0.0062828064, z: -0.31748235} m_LocalScale: {x: 0.12499999, y: 0.49999994, z: 0.12499999} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6744453271754949240} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7741896265506621798 MeshFilter: @@ -108,15 +108,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6256287307790063810} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -418.7024, y: 1, z: -62.4635} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7492148035865714457} - {fileID: 5454578898636997799} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &215655860811652073 Rigidbody: @@ -125,10 +125,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6256287307790063810} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -142,9 +153,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6256287307790063810} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -5266056624350073623, guid: 21b8842f73b5b16dc87c1cb1b0afe0ce, type: 3} @@ -173,13 +192,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7892395422436754689} + 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: 6744453271754949240} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1066424094966462850 MeshFilter: diff --git a/Assets/Prefabs/newTile.prefab b/Assets/Prefabs/newTile.prefab index 00fd452..4c9040d 100644 --- a/Assets/Prefabs/newTile.prefab +++ b/Assets/Prefabs/newTile.prefab @@ -11,8 +11,8 @@ GameObject: - component: {fileID: 1418724594657166519} - component: {fileID: 592371478074520587} - component: {fileID: 1441453626542042980} - - component: {fileID: 7385324898674005301} - component: {fileID: 7807969927081444678} + - component: {fileID: 5401968094440738511} m_Layer: 0 m_Name: pnlWater m_TagString: Untagged @@ -29,7 +29,7 @@ Transform: m_GameObject: {fileID: 1432760222041494230} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -1, z: 0} + m_LocalPosition: {x: 0, y: -0.25, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -85,8 +85,20 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &7385324898674005301 -MeshCollider: +--- !u!114 &7807969927081444678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432760222041494230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d2f50a8e0bb841a5aaa90ae55db8849, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!65 &5401968094440738511 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -103,22 +115,9 @@ MeshCollider: m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &7807969927081444678 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1432760222041494230} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0d2f50a8e0bb841a5aaa90ae55db8849, type: 3} - m_Name: - m_EditorClassIdentifier: + serializedVersion: 3 + m_Size: {x: 10, y: 2.220446e-16, z: 10} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &7573435787306895624 GameObject: m_ObjectHideFlags: 0 @@ -150,7 +149,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -109.4, y: 0, z: 0} - m_LocalScale: {x: 10, y: 1, z: 10} + m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1418724594657166519} @@ -259,5 +258,5 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 10, y: 50, z: 10} - m_Center: {x: 0, y: 10, z: 0} + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/tinOre.prefab b/Assets/Prefabs/tinOre.prefab index f549ab2..b42f0a7 100644 --- a/Assets/Prefabs/tinOre.prefab +++ b/Assets/Prefabs/tinOre.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1277199643121852568} + serializedVersion: 2 m_LocalRotation: {x: -0.030137267, y: -0.18757918, z: 0.32253432, w: 0.92729574} m_LocalPosition: {x: -0.16520548, y: 0.0062828064, z: -0.31748235} m_LocalScale: {x: 0.12499999, y: 0.49999994, z: 0.12499999} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6024848534698070052} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7310801197800676154 MeshFilter: @@ -108,15 +108,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6401690393767201438} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -418.7024, y: 1, z: -62.4635} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7637233774999129413} - {fileID: 5023516679142070011} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &70974923766122465 Rigidbody: @@ -125,14 +125,25 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6401690393767201438} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 - m_Constraints: 122 + m_Constraints: 0 m_CollisionDetection: 0 --- !u!64 &6135128249415564205 MeshCollider: @@ -142,9 +153,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6401690393767201438} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -5266056624350073623, guid: 21b8842f73b5b16dc87c1cb1b0afe0ce, type: 3} @@ -173,13 +192,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7170566803458479965} + 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: 6024848534698070052} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &56611957142088670 MeshFilter: diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 1636343..e574925 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -283,7 +283,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -362,7 +362,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -441,7 +441,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -629,7 +629,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 0 @@ -1041,7 +1041,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1156,7 +1156,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -1271,7 +1271,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1540,7 +1540,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1658,7 +1658,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 1 m_BestFit: 0 @@ -1775,7 +1775,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1893,7 +1893,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -2177,7 +2177,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -2257,7 +2257,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 30 m_FontStyle: 1 m_BestFit: 0 @@ -2465,7 +2465,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -2657,7 +2657,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 1 m_BestFit: 0 @@ -2737,7 +2737,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -2855,7 +2855,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -3053,7 +3053,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -3436,7 +3436,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -3516,7 +3516,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -3633,7 +3633,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -4001,7 +4001,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -4080,7 +4080,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -4355,7 +4355,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -4589,7 +4589,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -4794,7 +4794,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -4910,7 +4910,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -5261,7 +5261,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -5421,7 +5421,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -5539,7 +5539,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -5693,7 +5693,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -5889,7 +5889,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -5968,7 +5968,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -6084,7 +6084,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -6458,7 +6458,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 @@ -6576,7 +6576,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -6730,7 +6730,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -6923,7 +6923,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -7349,7 +7349,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -7652,7 +7652,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -7826,7 +7826,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -8593,7 +8593,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -8784,7 +8784,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -8863,7 +8863,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 2 m_BestFit: 0 @@ -9164,7 +9164,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -9318,7 +9318,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -9436,7 +9436,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -9702,7 +9702,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -10110,7 +10110,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -10496,7 +10496,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -10576,7 +10576,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -10824,7 +10824,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -11162,7 +11162,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -11479,7 +11479,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -11683,7 +11683,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 50 m_FontStyle: 1 m_BestFit: 0 @@ -12096,7 +12096,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -12251,7 +12251,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -12404,7 +12404,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -12483,7 +12483,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 1 m_BestFit: 0 @@ -12723,7 +12723,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -12839,7 +12839,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -13416,7 +13416,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -13534,7 +13534,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -13883,7 +13883,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -14000,7 +14000,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -14300,7 +14300,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -14962,7 +14962,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -15080,7 +15080,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -15518,7 +15518,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -15849,7 +15849,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -16150,7 +16150,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -16229,7 +16229,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -16527,7 +16527,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -16607,7 +16607,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -16725,7 +16725,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -16925,7 +16925,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -17351,7 +17351,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -17505,7 +17505,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -17585,7 +17585,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 @@ -17883,7 +17883,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -18509,7 +18509,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -18776,7 +18776,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -18855,7 +18855,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 1 m_BestFit: 0 @@ -19537,7 +19537,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -19693,7 +19693,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -20148,7 +20148,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -20481,7 +20481,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -20560,7 +20560,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -20659,7 +20659,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -20776,7 +20776,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -20930,7 +20930,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -21694,7 +21694,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -22330,7 +22330,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -22795,7 +22795,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -22913,7 +22913,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -23030,7 +23030,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -23361,7 +23361,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -24385,7 +24385,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/Scripts/ContentGenerator.cs b/Assets/Scripts/ContentGenerator.cs index a48debd..c9903ad 100644 --- a/Assets/Scripts/ContentGenerator.cs +++ b/Assets/Scripts/ContentGenerator.cs @@ -24,16 +24,16 @@ public class ContentGenerator : MonoBehaviour { switch (tiletype.ToLower()) { - case "plane": + case "plain": return generateTileContent(); case "mountains": return generateStoneTileContent(); case "forest": return generateTreeTileContent(); - case "river": - return generateRiverTileContent(); - case "lake": - return generateLakeTileContent(); + case "hills": + return generateHillTileContent(); + case "desert": + return generateDesertTileContent(); case "city": return generateCityTileContent(); } @@ -77,11 +77,11 @@ public class ContentGenerator : MonoBehaviour int chance = rand.Next(1, 101); if (chance < 60) { - return stones[rand.Next(0, stones.Length)]; + return null; } else if (chance >= 60 && chance < 90) { - return trees[rand.Next(0, trees.Length)]; + return stones[rand.Next(0, stones.Length)]; } else if (chance >= 90 && chance < 95) { @@ -122,7 +122,7 @@ public class ContentGenerator : MonoBehaviour } } - public GameObject generateRiverTileContent() + public GameObject generateDesertTileContent() { int chance = rand.Next(1, 101); if (chance < 50) @@ -131,14 +131,7 @@ public class ContentGenerator : MonoBehaviour } else if (chance >= 50 && chance < 90) { - if (rand.Next(0, 2) == 0) - { - return trees[rand.Next(0, trees.Length)]; - } - else - { - return stones[rand.Next(0, stones.Length)]; - } + return stones[rand.Next(0, stones.Length)]; } else if (chance >= 90 && chance < 95) { @@ -154,7 +147,7 @@ public class ContentGenerator : MonoBehaviour } } - public GameObject generateLakeTileContent() + public GameObject generateHillTileContent() { int chance = rand.Next(1, 101); if (chance < 75) diff --git a/Assets/Scripts/InventorySlot.cs b/Assets/Scripts/InventorySlot.cs index 0952ba6..44e4b9f 100644 --- a/Assets/Scripts/InventorySlot.cs +++ b/Assets/Scripts/InventorySlot.cs @@ -140,7 +140,6 @@ namespace Assets.Scripts switch (place) { case ItemPlace.LEFTHAND: - Debug.Log(GameObject.Find("Player").GetComponent().getClass().classname); image = Resources.Load("Equipment/" + GameObject.Find("Player").GetComponent().getClass().classname + "/Inv_LeftHand"); break; case ItemPlace.RIGHTHAND: diff --git a/Assets/Scripts/NoiseGenerator.cs b/Assets/Scripts/NoiseGenerator.cs index 77ef8b1..08cc4cb 100644 --- a/Assets/Scripts/NoiseGenerator.cs +++ b/Assets/Scripts/NoiseGenerator.cs @@ -86,7 +86,7 @@ public class NoiseGenerator for (int i = 0; i < samples.Length; i++) { - vertices[i].y = samples[i] * 3; + vertices[i].y = samples[i]; } applyMesh(tile, mesh, vertices, colors); @@ -139,7 +139,7 @@ public class NoiseGenerator vertices = mesh.vertices; for (int i = 0; i < sidelength; i++) { - result[sidelength - 1 + i * sidelength] = vertices[0 + i * sidelength].y / 3; + result[sidelength - 1 + i * sidelength] = vertices[0 + i * sidelength].y; result[sidelength - 2 + i * sidelength] = (result[sidelength - 1 + i * sidelength] + result[sidelength - 3 + i * sidelength]) / 2; } } @@ -149,7 +149,7 @@ public class NoiseGenerator vertices = mesh.vertices; for (int i = 0; i < sidelength; i++) { - result[0 + i * sidelength] = vertices[sidelength - 1 + i * sidelength].y / 3; + result[0 + i * sidelength] = vertices[sidelength - 1 + i * sidelength].y; result[1 + i * sidelength] = (result[0 + i * sidelength] + result[2 + i * sidelength]) / 2; } @@ -160,7 +160,7 @@ public class NoiseGenerator vertices = mesh.vertices; for (int i = 0; i < sidelength; i++) { - result[sidelength * sidelength - (sidelength - i)] = vertices[i].y / 3; + result[sidelength * sidelength - (sidelength - i)] = vertices[i].y; result[sidelength * (sidelength - 1) - (sidelength - i)] = (result[sidelength * sidelength - (sidelength - i)] + result[sidelength * (sidelength - 2) - (sidelength - i)]) / 2; } @@ -171,7 +171,7 @@ public class NoiseGenerator vertices = mesh.vertices; for (int i = 0; i < sidelength; i++) { - result[i] = vertices[sidelength * sidelength - (sidelength - i)].y / 3; + result[i] = vertices[sidelength * sidelength - (sidelength - i)].y; result[i + sidelength] = (result[i] + result[i + sidelength * 2]) / 2; } } diff --git a/Assets/Scripts/Player/PlayerGameObject.cs b/Assets/Scripts/Player/PlayerGameObject.cs index e706ca0..99e0bc3 100644 --- a/Assets/Scripts/Player/PlayerGameObject.cs +++ b/Assets/Scripts/Player/PlayerGameObject.cs @@ -218,13 +218,14 @@ namespace Assets.Scripts.Player { worldGenerator.changeCurrentTile(col.gameObject); - worldGenerator.createTile(new Vector3(-1,0,-1)); - worldGenerator.createTile(new Vector3(0,0,-1)); - worldGenerator.createTile(new Vector3(1,0,-1)); worldGenerator.createTile(new Vector3(-1,0,0)); worldGenerator.createTile(new Vector3(1,0,0)); - worldGenerator.createTile(new Vector3(-1,0,1)); worldGenerator.createTile(new Vector3(0,0,1)); + worldGenerator.createTile(new Vector3(0,0,-1)); + + worldGenerator.createTile(new Vector3(-1,0,-1)); + worldGenerator.createTile(new Vector3(1,0,-1)); + worldGenerator.createTile(new Vector3(-1,0,1)); worldGenerator.createTile(new Vector3(1,0,1)); } diff --git a/Assets/Scripts/Tile.cs b/Assets/Scripts/Tile.cs index a25b453..8df1702 100644 --- a/Assets/Scripts/Tile.cs +++ b/Assets/Scripts/Tile.cs @@ -12,7 +12,6 @@ public class Tile : MonoBehaviour System.Random rand = new System.Random(); TileType tiletype; GameObject contentGenerator; - List aliveEnemies = new List(); public void generateTile(Vector3 pos, TileType type) @@ -26,7 +25,7 @@ public class Tile : MonoBehaviour public void Update() { - + } public void generateContent() @@ -40,23 +39,41 @@ public class Tile : MonoBehaviour public List getSpawnLocations() { List list = new List(); - //Change object spawning + int objectAmount = rand.Next(20, 101); + Vector3 newPoint; + while(list.Count < objectAmount){ + newPoint = new Vector3(rand.Next(-40, 40) + 100 * position.x, 50, rand.Next(-40, 40) + 100 * position.z); + if (!list.Contains(newPoint)) + { + list.Add(newPoint); + } + } return list; } public void spawnObject(Vector3 position) { int chance = rand.Next(1, 101); + if (chance >= 25) { GameObject content = contentGenerator.GetComponent().generateContent(tiletype.ToString()); if (content != null) { - if(tiletype == TileType.CITY && (content.tag.ToLower().Contains("npc") || content.tag.ToLower().Contains("tree") || content.tag.ToLower().Contains("stone") || content.tag.ToLower().Contains("ore"))){ - position.y = 5; + float verticeX = position.x / 10; + float verticeZ = position.z / 10; + + Vector3 vertice = new Vector3(Mathf.Round(verticeX), 0, Mathf.Round(verticeZ)); + Vector3[] vertices = gameObject.GetComponent().mesh.vertices; + + foreach(Vector3 v in vertices){ + if(v.x == vertice.x && v.z == vertice.z){ + position.y = v.y; + break; + } } - GameObject obj = Instantiate(content, position, Quaternion.identity); - obj.transform.parent = gameObject.transform; + + GameObject obj = Instantiate(content, position, Quaternion.identity, gameObject.transform); if (obj.tag.Contains("Enemy")) { aliveEnemies.Add(obj); @@ -103,10 +120,12 @@ public class Tile : MonoBehaviour { result = result + obj.GetComponent().saveEnemy() + "\r\n}"; } - else if(obj.name.ToLower().Contains("house")){ + else if (obj.name.ToLower().Contains("house")) + { result = result + obj.transform.Find("Door").GetComponent().saveHouse() + "\r\n}"; } - else if(obj.name.ToLower().Contains("npc")){ + else if (obj.name.ToLower().Contains("npc")) + { result = result + obj.GetComponent().saveNPC() + "\r\n}"; } else @@ -166,10 +185,12 @@ public class Tile : MonoBehaviour spawnedObject.GetComponent().loadEnemy(obj); } } - else if(spawnedObject.name.ToLower().Contains("house")){ + else if (spawnedObject.name.ToLower().Contains("house")) + { spawnedObject.transform.Find("Door").GetComponent().loadHouse(obj); } - else if(spawnedObject.tag.ToLower().Contains("npc")){ + else if (spawnedObject.tag.ToLower().Contains("npc")) + { spawnedObject.GetComponent().loadQuest(obj["receivedQuest"].ToString()); } } @@ -178,7 +199,8 @@ public class Tile : MonoBehaviour setPosition(pos); } - public List getPossibleNeighbours(){ + public List getPossibleNeighbours() + { return TileTypeMethods.getPossibleNeighbours(tiletype); } } \ No newline at end of file diff --git a/Assets/Scripts/TileType.cs b/Assets/Scripts/TileType.cs index 6b93d92..7f4b398 100644 --- a/Assets/Scripts/TileType.cs +++ b/Assets/Scripts/TileType.cs @@ -152,7 +152,7 @@ namespace Assets.Scripts case TileType.HILLS: lowModifier[0] = 0.2f; lowModifier[1] = 0.1f; - highModifier[0] = 0.5f; + highModifier[0] = 0.3f; highModifier[1] = 0.1f; break; case TileType.FOREST: @@ -162,9 +162,9 @@ namespace Assets.Scripts highModifier[1] = 0.1f; break; case TileType.MOUNTAINS: - lowModifier[0] = 0.2f; + lowModifier[0] = 0.5f; lowModifier[1] = 0.3f; - highModifier[0] = 1.0f; + highModifier[0] = 0.5f; highModifier[1] = 0.2f; break; case TileType.LAKE: @@ -176,7 +176,7 @@ namespace Assets.Scripts case TileType.DESERT: lowModifier[0] = 0.2f; lowModifier[1] = 0.1f; - highModifier[0] = 0.5f; + highModifier[0] = 0.3f; highModifier[1] = 0.1f; break; case TileType.CITY: @@ -206,10 +206,10 @@ namespace Assets.Scripts switch (type) { case TileType.LAKE: - result[i] = basis[i] - 3; + result[i] = basis[i] - 1.5f; break; case TileType.MOUNTAINS: - result[i] = basis[i] + 3; + result[i] = basis[i] + 1.5f; break; } } diff --git a/Assets/Scripts/WorldGenerator.cs b/Assets/Scripts/WorldGenerator.cs index 8d8b5de..b3f1c2f 100644 --- a/Assets/Scripts/WorldGenerator.cs +++ b/Assets/Scripts/WorldGenerator.cs @@ -62,7 +62,7 @@ public class WorldGenerator : MonoBehaviour void resetPlayer() { - if (player.transform.position.y <= -10) + if (player.transform.position.y <= -20) { Vector3 position = new Vector3(currentTile.transform.position.x, 50, currentTile.transform.position.z); player.transform.SetPositionAndRotation(position, player.transform.rotation);