diff --git a/Assets/Locals/StringTable/MyTexts Shared Data.asset b/Assets/Locals/StringTable/MyTexts Shared Data.asset index a54fc9b..bf8af58 100644 --- a/Assets/Locals/StringTable/MyTexts Shared Data.asset +++ b/Assets/Locals/StringTable/MyTexts Shared Data.asset @@ -1353,15 +1353,15 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 343461740212834304 - m_Key: Birch + m_Key: birch m_Metadata: m_Items: [] - m_Id: 343461777605054464 - m_Key: Oak + m_Key: oak m_Metadata: m_Items: [] - m_Id: 343461779215667200 - m_Key: Pine + m_Key: pine m_Metadata: m_Items: [] m_Metadata: diff --git a/Assets/Prefabs/FBX/Tree_Birch.fbx b/Assets/Prefabs/FBX/Tree_Birch.fbx index df0f5bc..4cc4182 100644 Binary files a/Assets/Prefabs/FBX/Tree_Birch.fbx and b/Assets/Prefabs/FBX/Tree_Birch.fbx differ diff --git a/Assets/Prefabs/FBX/Tree_Oak.fbx b/Assets/Prefabs/FBX/Tree_Oak.fbx index 76629e8..f1dc4d0 100644 Binary files a/Assets/Prefabs/FBX/Tree_Oak.fbx and b/Assets/Prefabs/FBX/Tree_Oak.fbx differ diff --git a/Assets/Prefabs/FBX/Tree_Pine.fbx b/Assets/Prefabs/FBX/Tree_Pine.fbx index 4a67b8f..f711996 100644 Binary files a/Assets/Prefabs/FBX/Tree_Pine.fbx and b/Assets/Prefabs/FBX/Tree_Pine.fbx differ diff --git a/Assets/Prefabs/TreeBirch.prefab b/Assets/Prefabs/TreeBirch.prefab index e820c7f..bc1db2b 100644 --- a/Assets/Prefabs/TreeBirch.prefab +++ b/Assets/Prefabs/TreeBirch.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &613453123924352852 +--- !u!1 &352077459850844714 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,47 +8,49 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2214916485250371354} - - component: {fileID: 8463167582911852566} - - component: {fileID: 6340058510204143077} - - component: {fileID: 1228907576036537818} + - component: {fileID: 5980475020152547812} + - component: {fileID: 6781887244969615079} + - component: {fileID: 5342137157383028953} + - component: {fileID: 8745966837972967146} + - component: {fileID: 1216969537074850901} + - component: {fileID: 4126052043241902833} m_Layer: 0 - m_Name: Trunk - m_TagString: Untagged + m_Name: TreeBirch + m_TagString: Object:Tree m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2214916485250371354 +--- !u!4 &5980475020152547812 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613453123924352852} + m_GameObject: {fileID: 352077459850844714} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0, y: 1, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5493288557151090055} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8463167582911852566 +--- !u!33 &6781887244969615079 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613453123924352852} + m_GameObject: {fileID: 352077459850844714} m_Mesh: {fileID: 5668788170693331272, guid: c8b0f433deeb91dc0a6c581288fb13af, type: 3} ---- !u!23 &6340058510204143077 +--- !u!23 &5342137157383028953 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613453123924352852} + m_GameObject: {fileID: 352077459850844714} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -68,193 +70,6 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 6849546283596164469, guid: c8b0f433deeb91dc0a6c581288fb13af, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &1228907576036537818 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613453123924352852} - 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: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 5668788170693331272, guid: c8b0f433deeb91dc0a6c581288fb13af, type: 3} ---- !u!1 &1155525015202716413 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5493288557151090055} - - component: {fileID: 8095415602826057453} - - component: {fileID: -4806639779125950661} - m_Layer: 0 - m_Name: TreeBirch - m_TagString: Object:Tree - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5493288557151090055 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1155525015202716413} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1344851817079671045} - - {fileID: 2214916485250371354} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &8095415602826057453 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1155525015202716413} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 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_CollisionDetection: 0 ---- !u!114 &-4806639779125950661 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1155525015202716413} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9d069bae9082b7b60a2a05060a98424e, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Assets.Scripts.InteractableObjects.Tree - clip: {fileID: 7400000, guid: 4522681ee7a4e1196af04c3f4fc704d6, type: 2} - keepAlive: 0 ---- !u!1 &5772107735271204395 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1344851817079671045} - - component: {fileID: 3865816835056842188} - - component: {fileID: 2900584035887521660} - - component: {fileID: 7290806417235695853} - m_Layer: 0 - m_Name: Leaves - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1344851817079671045 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5772107735271204395} - serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0, y: 6, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5493288557151090055} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3865816835056842188 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5772107735271204395} - m_Mesh: {fileID: 766207002214816160, guid: c8b0f433deeb91dc0a6c581288fb13af, type: 3} ---- !u!23 &2900584035887521660 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5772107735271204395} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - {fileID: -4006148316881293267, guid: c8b0f433deeb91dc0a6c581288fb13af, type: 3} m_StaticBatchInfo: firstSubMesh: 0 @@ -278,13 +93,54 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &7290806417235695853 +--- !u!54 &8745966837972967146 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 352077459850844714} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 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_CollisionDetection: 0 +--- !u!114 &1216969537074850901 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 352077459850844714} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d069bae9082b7b60a2a05060a98424e, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Assets.Scripts.InteractableObjects.Tree + clip: {fileID: 7400000, guid: 4522681ee7a4e1196af04c3f4fc704d6, type: 2} + keepAlive: 0 +--- !u!64 &4126052043241902833 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5772107735271204395} + m_GameObject: {fileID: 352077459850844714} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -299,4 +155,4 @@ MeshCollider: serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 - m_Mesh: {fileID: 766207002214816160, guid: c8b0f433deeb91dc0a6c581288fb13af, type: 3} + m_Mesh: {fileID: 5668788170693331272, guid: c8b0f433deeb91dc0a6c581288fb13af, type: 3} diff --git a/Assets/Prefabs/TreeOak.prefab b/Assets/Prefabs/TreeOak.prefab index 068da19..e183f75 100644 --- a/Assets/Prefabs/TreeOak.prefab +++ b/Assets/Prefabs/TreeOak.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3525700029626501665 +--- !u!1 &5857011290546105250 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,47 +8,49 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 833110004148929354} - - component: {fileID: 6829603295247618104} - - component: {fileID: 6305443571121795948} - - component: {fileID: 6480375958879178139} + - component: {fileID: 1492505417243600631} + - component: {fileID: 7473755911226639561} + - component: {fileID: 8483839453887768150} + - component: {fileID: 1412096845212143023} + - component: {fileID: 5712153852468982786} + - component: {fileID: 5454797359024096544} m_Layer: 0 - m_Name: Leaves - m_TagString: Untagged + m_Name: TreeOak + m_TagString: Object:Tree m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &833110004148929354 +--- !u!4 &1492505417243600631 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3525700029626501665} + m_GameObject: {fileID: 5857011290546105250} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0, y: 6, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 6, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2698384647925906637} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6829603295247618104 +--- !u!33 &7473755911226639561 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3525700029626501665} + m_GameObject: {fileID: 5857011290546105250} m_Mesh: {fileID: 766207002214816160, guid: 928d961bf36f781b9a09e3eb915b489c, type: 3} ---- !u!23 &6305443571121795948 +--- !u!23 &8483839453887768150 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3525700029626501665} + m_GameObject: {fileID: 5857011290546105250} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -68,193 +70,6 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: -4006148316881293267, guid: 928d961bf36f781b9a09e3eb915b489c, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &6480375958879178139 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3525700029626501665} - 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: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 766207002214816160, guid: 928d961bf36f781b9a09e3eb915b489c, type: 3} ---- !u!1 &3610914203820979933 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2698384647925906637} - - component: {fileID: -3532374327791534734} - - component: {fileID: 3756573438612552993} - m_Layer: 0 - m_Name: TreeOak - m_TagString: Object:Tree - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2698384647925906637 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3610914203820979933} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 833110004148929354} - - {fileID: 2331428949448709746} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &-3532374327791534734 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3610914203820979933} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 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_CollisionDetection: 0 ---- !u!114 &3756573438612552993 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3610914203820979933} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9d069bae9082b7b60a2a05060a98424e, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Assets.Scripts.InteractableObjects.Tree - clip: {fileID: 7400000, guid: 4522681ee7a4e1196af04c3f4fc704d6, type: 2} - keepAlive: 0 ---- !u!1 &5537256180096389915 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2331428949448709746} - - component: {fileID: 6948020191366850320} - - component: {fileID: 3546040816609132871} - - component: {fileID: 575757436876653167} - m_Layer: 0 - m_Name: Trunk - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2331428949448709746 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5537256180096389915} - serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0, y: 1, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2698384647925906637} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6948020191366850320 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5537256180096389915} - m_Mesh: {fileID: 5668788170693331272, guid: 928d961bf36f781b9a09e3eb915b489c, type: 3} ---- !u!23 &3546040816609132871 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5537256180096389915} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - {fileID: 6849546283596164469, guid: 928d961bf36f781b9a09e3eb915b489c, type: 3} m_StaticBatchInfo: firstSubMesh: 0 @@ -278,13 +93,40 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &575757436876653167 +--- !u!54 &1412096845212143023 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5857011290546105250} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 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_CollisionDetection: 0 +--- !u!64 &5712153852468982786 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5537256180096389915} + m_GameObject: {fileID: 5857011290546105250} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -299,4 +141,18 @@ MeshCollider: serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 - m_Mesh: {fileID: 5668788170693331272, guid: 928d961bf36f781b9a09e3eb915b489c, type: 3} + m_Mesh: {fileID: 766207002214816160, guid: 928d961bf36f781b9a09e3eb915b489c, type: 3} +--- !u!114 &5454797359024096544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5857011290546105250} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d069bae9082b7b60a2a05060a98424e, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Assets.Scripts.InteractableObjects.Tree + clip: {fileID: 0} + keepAlive: 0 diff --git a/Assets/Prefabs/TreeOak.prefab.meta b/Assets/Prefabs/TreeOak.prefab.meta index 8cd1a87..83264c8 100644 --- a/Assets/Prefabs/TreeOak.prefab.meta +++ b/Assets/Prefabs/TreeOak.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 320dc8bc9780c5d00a3b3eaceccaf7b1 +guid: 6ea4ca9811e8dbbc9a740d5bd305d9c4 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/TreePine.prefab b/Assets/Prefabs/TreePine.prefab index 5d20bc5..9c0408c 100644 --- a/Assets/Prefabs/TreePine.prefab +++ b/Assets/Prefabs/TreePine.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2587055905586634353 +--- !u!1 &6971555245367516797 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,47 +8,49 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3879087331990626232} - - component: {fileID: 6302142894244826075} - - component: {fileID: 7545449209083017637} - - component: {fileID: 2617455541230396305} + - component: {fileID: 6229508760484546746} + - component: {fileID: 5114172205684513170} + - component: {fileID: 2589982914730828577} + - component: {fileID: 1814630129096772098} + - component: {fileID: 6623677197114307238} + - component: {fileID: 5186043394024381658} m_Layer: 0 - m_Name: Trunk - m_TagString: Untagged + m_Name: TreePine + m_TagString: Object:Tree m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3879087331990626232 +--- !u!4 &6229508760484546746 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2587055905586634353} + m_GameObject: {fileID: 6971555245367516797} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0, y: 1, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 5, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 256452006853846864} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6302142894244826075 +--- !u!33 &5114172205684513170 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2587055905586634353} - m_Mesh: {fileID: 5668788170693331272, guid: 962e3a95545ad3314a0aa4a16432f605, type: 3} ---- !u!23 &7545449209083017637 + m_GameObject: {fileID: 6971555245367516797} + m_Mesh: {fileID: 766207002214816160, guid: 962e3a95545ad3314a0aa4a16432f605, type: 3} +--- !u!23 &2589982914730828577 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2587055905586634353} + m_GameObject: {fileID: 6971555245367516797} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -67,6 +69,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: + - {fileID: -4006148316881293267, guid: 962e3a95545ad3314a0aa4a16432f605, type: 3} - {fileID: 6849546283596164469, guid: 962e3a95545ad3314a0aa4a16432f605, type: 3} m_StaticBatchInfo: firstSubMesh: 0 @@ -90,70 +93,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &2617455541230396305 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2587055905586634353} - 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: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 5668788170693331272, guid: 962e3a95545ad3314a0aa4a16432f605, type: 3} ---- !u!1 &3012938571535029900 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 256452006853846864} - - component: {fileID: 8498416014582569} - - component: {fileID: 4327634743839177160} - m_Layer: 0 - m_Name: TreePine - m_TagString: Object:Tree - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &256452006853846864 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3012938571535029900} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 4506403956502137123} - - {fileID: 3879087331990626232} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &8498416014582569 +--- !u!54 &1814630129096772098 Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3012938571535029900} + m_GameObject: {fileID: 6971555245367516797} serializedVersion: 5 m_Mass: 1 m_LinearDamping: 0 @@ -174,117 +120,13 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 122 m_CollisionDetection: 0 ---- !u!114 &4327634743839177160 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3012938571535029900} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9d069bae9082b7b60a2a05060a98424e, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Assets.Scripts.InteractableObjects.Tree - clip: {fileID: 7400000, guid: 4522681ee7a4e1196af04c3f4fc704d6, type: 2} - keepAlive: 0 ---- !u!1 &8886160613574724975 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4506403956502137123} - - component: {fileID: 3837943092135027738} - - component: {fileID: 221671553831467210} - - component: {fileID: 1647660149270285472} - m_Layer: 0 - m_Name: Leaves - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4506403956502137123 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8886160613574724975} - serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0, y: 5, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 256452006853846864} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3837943092135027738 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8886160613574724975} - m_Mesh: {fileID: 766207002214816160, guid: 962e3a95545ad3314a0aa4a16432f605, type: 3} ---- !u!23 &221671553831467210 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8886160613574724975} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: -4006148316881293267, guid: 962e3a95545ad3314a0aa4a16432f605, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &1647660149270285472 +--- !u!64 &6623677197114307238 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8886160613574724975} + m_GameObject: {fileID: 6971555245367516797} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -300,3 +142,17 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 766207002214816160, guid: 962e3a95545ad3314a0aa4a16432f605, type: 3} +--- !u!114 &5186043394024381658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6971555245367516797} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d069bae9082b7b60a2a05060a98424e, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Assets.Scripts.InteractableObjects.Tree + clip: {fileID: 7400000, guid: 4522681ee7a4e1196af04c3f4fc704d6, type: 2} + keepAlive: 0 diff --git a/Assets/Prefabs/TreePine.prefab.meta b/Assets/Prefabs/TreePine.prefab.meta index 3c4fba7..1ce795f 100644 --- a/Assets/Prefabs/TreePine.prefab.meta +++ b/Assets/Prefabs/TreePine.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9fa7013d02b061270815e147840dd1ba +guid: 6974488d5f2a560648b8b280ca4af331 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 131a906..7ccf6d5 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -2976,7 +2976,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 18 + m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -9980,10 +9980,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 10 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 1 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -11078,9 +11078,9 @@ MonoBehaviour: - {fileID: 710453253311522916, guid: f9d8d40eab862fd098af9f5de7b69174, type: 3} - {fileID: 7591882314654710750, guid: fcaf709a5d34e2511959a3f37d85a9fe, type: 3} trees: - - {fileID: 1155525015202716413, guid: 5944286591d81574d8cd634a54909b00, type: 3} - - {fileID: 3012938571535029900, guid: 9fa7013d02b061270815e147840dd1ba, type: 3} - - {fileID: 3610914203820979933, guid: 320dc8bc9780c5d00a3b3eaceccaf7b1, type: 3} + - {fileID: 352077459850844714, guid: 5944286591d81574d8cd634a54909b00, type: 3} + - {fileID: 6971555245367516797, guid: 6974488d5f2a560648b8b280ca4af331, type: 3} + - {fileID: 5857011290546105250, guid: 6ea4ca9811e8dbbc9a740d5bd305d9c4, type: 3} stones: - {fileID: 4852758362040146526, guid: b3d4352243e362c628ae9d1f78fa27bc, type: 3} - {fileID: 4009596908532748171, guid: 5db8b46c2df72e0889d7f821ba6a72af, type: 3} @@ -11453,7 +11453,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 12 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -11565,7 +11565,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Fenster + m_Text: Window --- !u!222 &709576934 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11779,7 +11779,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Deutsch + m_Text: 800x600 --- !u!222 &722907595 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11848,7 +11848,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 18 + m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -12845,7 +12845,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 12 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -14134,7 +14134,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 18 + m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -14454,7 +14454,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 12 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -14613,7 +14613,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 12 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -18673,7 +18673,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 12 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -19912,7 +19912,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 18 + m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -22742,7 +22742,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 12 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -22940,10 +22940,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 10 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 1 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -23805,7 +23805,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 12 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -24638,7 +24638,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 0.27058825, g: 0.4117647, b: 0.5647059, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -24822,7 +24822,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 12 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -26163,7 +26163,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 12 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -29115,10 +29115,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 10 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 1 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -29462,7 +29462,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 12 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -33405,7 +33405,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 12 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -33604,10 +33604,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 10 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 1 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 5f5bf89..801743d 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -7041,7 +7041,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Small (5 cities) + m_Text: K --- !u!222 &929276014 CanvasRenderer: m_ObjectHideFlags: 0 @@ -9590,7 +9590,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: German + m_Text: 800x600 --- !u!222 &1225249785 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Tile.cs b/Assets/Scripts/Tile.cs index b3f1007..a4478f2 100644 --- a/Assets/Scripts/Tile.cs +++ b/Assets/Scripts/Tile.cs @@ -62,7 +62,7 @@ public class Tile : MonoBehaviour newPoint = new Vector3(rand.Next(-40, 40) + 100 * position.x, 50, rand.Next(-40, 40) + 100 * position.z); foreach (Vector3 vector in list) { - if (Vector3.Distance(vector, newPoint) < 2.5f) + if (Vector3.Distance(vector, newPoint) < 5.5f) { canSpawn = false; break; diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4c133b6..4ded375 100755 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -70,7 +70,7 @@ v1.3.1 - Bug fix - Fixed game win bug when discovering last city - Fixed item scaling, rarity chances and item attributes -v1.4.0 - ToN goes 3D (last update) +v1.4.0 - ToN goes 3D -----Visuals/Sounds----- - Changed from 2D to 3D objects (Except NPCs because humanoid models are difficult) - Reworked quest window @@ -90,7 +90,7 @@ v1.4.0 - ToN goes 3D (last update) - Added mouse sensitiviy and fixed options not working correctly - Fixed save and load for all objects and tiles -v1.5.0 - Gameplay and UI improvements (current version) +v2.0.0 - Gameplay and UI improvements (last update) -----Visuals/Sounds----- - Improved and unified UI - Added German to the available languages @@ -105,3 +105,11 @@ v1.5.0 - Gameplay and UI improvements (current version) - Improved save and load mechanic - Improved enemy generation - Worked on controls and camera (Still a bit unpolished but close to finished) + +v2.0.0 - Gameplay and UI improvements (current version) +-----Visuals/Sounds----- +- Added background to coordinates // @Lunchen +- Increased font size on some elements // @Lunchen + +-----Mechanics----- +- Drastically improved camera handling diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index ececa2f..5a71027 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -18,10 +18,10 @@ EditorUserSettings: value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d flags: 0 RecentlyUsedSceneGuid-4: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a flags: 0 RecentlyUsedSceneGuid-5: - value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index 188d538..ac4c4e3 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 3840 + x: 1920 y: 28 width: 1920 height: 998 m_ShowMode: 4 - m_Title: Project + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -118,7 +118,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 39 + controlID: 18 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 40 + controlID: 19 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -170,7 +170,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 41 + controlID: 20 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -192,11 +192,11 @@ MonoBehaviour: x: 0 y: 0 width: 1585 - height: 665 + height: 664 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 42 + controlID: 21 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -216,7 +216,7 @@ MonoBehaviour: x: 0 y: 0 width: 272 - height: 665 + height: 664 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 14} @@ -234,7 +234,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -242,15 +242,15 @@ MonoBehaviour: x: 272 y: 0 width: 1313 - height: 665 - m_MinSize: {x: 202, y: 226} + height: 664 + m_MinSize: {x: 102, y: 126} m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 13} - {fileID: 15} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -267,9 +267,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 665 + y: 664 width: 1585 - height: 277 + height: 278 m_MinSize: {x: 231, y: 276} m_MaxSize: {x: 10001, y: 10026} m_ActualView: {fileID: 16} @@ -325,10 +325,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 273 - y: 24 + x: 2192 + y: 91 width: 1311 - height: 639 + height: 657 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -855,9 +855,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 822.4296, y: 595.892, z: -958.3059} + m_Target: {x: 1039.9667, y: 755.63043, z: -1173.1064} speed: 2 - m_Value: {x: 822.4296, y: 595.892, z: -958.3059} + m_Value: {x: 1039.9667, y: 755.63043, z: -1173.1064} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -903,13 +903,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.035555147, y: 0.010187352, z: -0.0003071978, w: -0.9992763} + m_Target: {x: 0.0637176, y: -0.0077891788, z: 0.00040677178, w: 0.9978921} speed: 2 - m_Value: {x: -0.035555147, y: 0.010187352, z: -0.0003071978, w: -0.9992763} + m_Value: {x: -0.06371761, y: 0.007789179, z: -0.0004067718, w: -0.9978921} m_Size: - m_Target: 141.42136 + m_Target: 0.8660254 speed: 2 - m_Value: 141.42136 + m_Value: 0.8660254 m_Ortho: m_Target: 0 speed: 2 @@ -967,7 +967,7 @@ MonoBehaviour: x: 0 y: 24 width: 271 - height: 639 + height: 638 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -984,7 +984,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 18f9ffff12fbffff + m_ExpandedIDs: 12fbffff169100005292000092920000d692000070930000d693000024940000e09400006e95000048960000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1030,10 +1030,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 2192 - y: 91 + x: 273 + y: 24 width: 1311 - height: 659 + height: 638 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1080,7 +1080,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 @@ -1090,22 +1090,22 @@ MonoBehaviour: x: 0 y: 21 width: 1311 - height: 638 - m_Scale: {x: 0.59074074, y: 0.59074074} - m_Translation: {x: 655.5, y: 319} + height: 636 + m_Scale: {x: 0.58888894, y: 0.5888889} + m_Translation: {x: 655.50006, y: 318} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1109.6238 + x: -1113.1132 y: -540 - width: 2219.2476 + width: 2226.2263 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.59074074 - m_LastWindowPixelSize: {x: 1311, y: 659} + m_defaultScale: 0.5888889 + m_LastWindowPixelSize: {x: 1311, y: 657} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -1134,9 +1134,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 689 + y: 688 width: 1584 - height: 251 + height: 252 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1159,7 +1159,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes + - Assets/Prefabs m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1169,16 +1169,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scenes + - Assets/Prefabs m_LastFoldersGridSize: -1 m_LastProjectPath: /media/nicola/M2SSD/Programmieren/Unity/TalesOfNovariel m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 78} - m_SelectedIDs: e0930000 - m_LastClickedID: 37856 - m_ExpandedIDs: 00000000029300000493000006930000089300000a930000 + m_SelectedIDs: 2c9c0000 + m_LastClickedID: 39980 + m_ExpandedIDs: 00000000569b0000589b00005a9b00005c9b00005e9b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1207,7 +1207,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000029300000493000006930000089300000a930000 + m_ExpandedIDs: 00000000569b0000589b00005a9b00005c9b00005e9b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1235,7 +1235,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f0100b25b0000005d000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1253,7 +1253,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 11} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1286,10 +1286,10 @@ MonoBehaviour: m_TextWithWhitespace: "Console\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 776 + x: 1920 + y: 774 width: 1584 - height: 258 + height: 260 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0