From 33bd90658af50faf5ffe9b5d33d972978b32e89c Mon Sep 17 00:00:00 2001 From: dal4segno Date: Mon, 26 Jan 2026 01:33:26 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EC=96=B4,=20=EC=9E=90=EC=9B=90,=20?= =?UTF-8?q?=EB=B2=BD,=20=ED=94=8C=EB=A0=88=EC=9D=B4=EC=96=B4=20=EC=8B=9C?= =?UTF-8?q?=EC=9E=91=20=EC=9C=84=EC=B9=98=20=EC=84=A4=EC=A0=95=20Flatkit?= =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5=20=EC=9D=BC=EB=B6=80=20=ED=99=9C=EC=9A=A9?= =?UTF-8?q?=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assembly-CSharp-Editor.csproj | 18 +- Assembly-CSharp.csproj | 21 +- .../[FlatKit] Example Fog Settings.asset | 8 +- .../[FlatKit] Example Outline Settings.asset | 14 +- .../[FlatKit] Example Renderer.asset | 50 +- .../Materials/flatkit hexagons_medieval.mat | 30 +- .../Materials/flatkit prototype_texture.mat | 212 +++++ .../flatkit prototype_texture.mat.meta | 8 + Assets/Materials/flatkit resource.mat | 213 +++++ Assets/Materials/flatkit resource.mat.meta | 8 + Assets/Prefabs/BaseTower.prefab | 184 ---- Assets/Prefabs/Core.prefab | 138 +++ ...BaseTower.prefab.meta => Core.prefab.meta} | 2 +- Assets/Prefabs/Player.prefab | 31 +- .../Prefabs/{Mine.prefab => Resource.prefab} | 84 +- ...{Mine.prefab.meta => Resource.prefab.meta} | 0 Assets/Scenes/GameMain.unity | 809 +++++++++++++++++- Assets/Scripts/NetworkConnectionHandler.cs | 121 +++ .../Scripts/NetworkConnectionHandler.cs.meta | 2 + Assets/Scripts/NetworkSpawnManager.cs | 132 +++ Assets/Scripts/NetworkSpawnManager.cs.meta | 2 + Assets/Scripts/PlayerSpawnPoint.cs | 25 + Assets/Scripts/PlayerSpawnPoint.cs.meta | 2 + ...y.RenderPipelines.Universal.Runtime.csproj | 2 +- 24 files changed, 1756 insertions(+), 360 deletions(-) create mode 100644 Assets/Materials/flatkit prototype_texture.mat create mode 100644 Assets/Materials/flatkit prototype_texture.mat.meta create mode 100644 Assets/Materials/flatkit resource.mat create mode 100644 Assets/Materials/flatkit resource.mat.meta delete mode 100644 Assets/Prefabs/BaseTower.prefab create mode 100644 Assets/Prefabs/Core.prefab rename Assets/Prefabs/{BaseTower.prefab.meta => Core.prefab.meta} (74%) rename Assets/Prefabs/{Mine.prefab => Resource.prefab} (65%) rename Assets/Prefabs/{Mine.prefab.meta => Resource.prefab.meta} (100%) create mode 100644 Assets/Scripts/NetworkConnectionHandler.cs create mode 100644 Assets/Scripts/NetworkConnectionHandler.cs.meta create mode 100644 Assets/Scripts/NetworkSpawnManager.cs create mode 100644 Assets/Scripts/NetworkSpawnManager.cs.meta create mode 100644 Assets/Scripts/PlayerSpawnPoint.cs create mode 100644 Assets/Scripts/PlayerSpawnPoint.cs.meta diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index b17676e..6d7e972 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -1366,10 +1366,6 @@ Library\ScriptAssemblies\Unity.UnifiedRayTracing.Runtime.dll False - - Library\ScriptAssemblies\Unity.2D.Aseprite.Common.dll - False - Library\ScriptAssemblies\Unity.Cinemachine.dll False @@ -1378,6 +1374,10 @@ Library\ScriptAssemblies\Unity.Multiplayer.Tools.NetVis.Editor.Visualization.dll False + + Library\ScriptAssemblies\Unity.2D.Aseprite.Common.dll + False + Library\ScriptAssemblies\Unity.Rider.Editor.dll False @@ -1390,6 +1390,10 @@ Library\ScriptAssemblies\Unity.2D.Aseprite.Editor.dll False + + Library\ScriptAssemblies\Unity.2D.SpriteShape.Editor.dll + False + Library\ScriptAssemblies\Unity.Multiplayer.Tools.DependencyInjection.UIElements.dll False @@ -1590,16 +1594,12 @@ Library\ScriptAssemblies\UnityEditor.UI.dll False - - Library\ScriptAssemblies\Unity.2D.SpriteShape.Editor.dll - False - - + diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index fea7b37..1021408 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -62,6 +62,7 @@ + @@ -70,10 +71,12 @@ + + @@ -1328,10 +1331,6 @@ Library\ScriptAssemblies\Unity.UnifiedRayTracing.Runtime.dll False - - Library\ScriptAssemblies\Unity.2D.Aseprite.Common.dll - False - Library\ScriptAssemblies\Unity.Cinemachine.dll False @@ -1340,6 +1339,10 @@ Library\ScriptAssemblies\Unity.Multiplayer.Tools.NetVis.Editor.Visualization.dll False + + Library\ScriptAssemblies\Unity.2D.Aseprite.Common.dll + False + Library\ScriptAssemblies\Unity.Rider.Editor.dll False @@ -1352,6 +1355,10 @@ Library\ScriptAssemblies\Unity.2D.Aseprite.Editor.dll False + + Library\ScriptAssemblies\Unity.2D.SpriteShape.Editor.dll + False + Library\ScriptAssemblies\Unity.Multiplayer.Tools.DependencyInjection.UIElements.dll False @@ -1552,15 +1559,11 @@ Library\ScriptAssemblies\UnityEditor.UI.dll False - - Library\ScriptAssemblies\Unity.2D.SpriteShape.Editor.dll - False - - + diff --git a/Assets/FlatKit/Demos/Common/URP Configs/[FlatKit] Example Fog Settings.asset b/Assets/FlatKit/Demos/Common/URP Configs/[FlatKit] Example Fog Settings.asset index 85bb23a..57bd9d8 100644 --- a/Assets/FlatKit/Demos/Common/URP Configs/[FlatKit] Example Fog Settings.asset +++ b/Assets/FlatKit/Demos/Common/URP Configs/[FlatKit] Example Fog Settings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8a6f656ab8114e939b71b289ffd9d7b2, type: 3} m_Name: '[FlatKit] Example Fog Settings' m_EditorClassIdentifier: - useDistance: 1 + useDistance: 0 distanceGradient: serializedVersion: 2 key0: {r: 0, g: 0.85213137, b: 1, a: 0.09803922} @@ -46,7 +46,7 @@ MonoBehaviour: near: 30 far: 150 distanceFogIntensity: 0.5 - useHeight: 1 + useHeight: 0 heightGradient: serializedVersion: 2 key0: {r: 0.0745098, g: 0.94509804, b: 0.9280485, a: 0} @@ -96,9 +96,7 @@ Material: m_Shader: {fileID: -6465566751694194690, guid: c77db07224d9f784d90d7eb0e84c57f7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - USE_DISTANCE_FOG - - USE_HEIGHT_FOG + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 diff --git a/Assets/FlatKit/Demos/Common/URP Configs/[FlatKit] Example Outline Settings.asset b/Assets/FlatKit/Demos/Common/URP Configs/[FlatKit] Example Outline Settings.asset index 2687804..bddecb8 100644 --- a/Assets/FlatKit/Demos/Common/URP Configs/[FlatKit] Example Outline Settings.asset +++ b/Assets/FlatKit/Demos/Common/URP Configs/[FlatKit] Example Outline Settings.asset @@ -39,10 +39,10 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _ColorThresholdMax: 0.25 + - _ColorThresholdMax: 0.2 - _ColorThresholdMin: 0 - - _DepthThresholdMax: 0.1 - - _DepthThresholdMin: 0.1 + - _DepthThresholdMax: 2.6 + - _DepthThresholdMin: 2.31 - _FadeRangeEnd: 50 - _FadeRangeStart: 10 - _NormalThresholdMax: 2 @@ -71,15 +71,15 @@ MonoBehaviour: fadeRangeStart: 10 fadeRangeEnd: 50 useDepth: 0 - minDepthThreshold: 0.1 - maxDepthThreshold: 0.1 + minDepthThreshold: 2.31 + maxDepthThreshold: 2.6 useNormals: 1 minNormalsThreshold: 1 maxNormalsThreshold: 2 useColor: 1 minColorThreshold: 0 - maxColorThreshold: 0.25 + maxColorThreshold: 0.2 renderEvent: 500 outlineOnly: 0 applyInSceneView: 1 - effectMaterial: {fileID: -3130267085085746722} + effectMaterial: {fileID: 0} diff --git a/Assets/FlatKit/Demos/Common/URP Configs/[FlatKit] Example Renderer.asset b/Assets/FlatKit/Demos/Common/URP Configs/[FlatKit] Example Renderer.asset index e42320a..46e81aa 100644 --- a/Assets/FlatKit/Demos/Common/URP Configs/[FlatKit] Example Renderer.asset +++ b/Assets/FlatKit/Demos/Common/URP Configs/[FlatKit] Example Renderer.asset @@ -27,7 +27,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1cca7768aaaea4b0081f14e7f9d4b5ad, type: 3} m_Name: FlatKitOutline m_EditorClassIdentifier: - m_Active: 0 + m_Active: 1 settings: {fileID: 11400000, guid: ff3dfd77429d64938a26bd54c27dacd8, type: 2} --- !u!114 &-1344586528338988631 MonoBehaviour: @@ -70,10 +70,9 @@ MonoBehaviour: m_RendererFeatures: - {fileID: -1344586528338988631} - {fileID: -2401278517541482506} - - {fileID: 4523260582098458979} m_RendererFeatureMap: a9319428ad1157edf6cf292be9f1acde m_UseNativeRenderPass: 0 - xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} + xrSystemData: {fileID: 0} postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} m_AssetVersion: 3 m_PrepassLayerMask: @@ -100,48 +99,3 @@ MonoBehaviour: m_DepthTextureFormat: 0 m_AccurateGbufferNormals: 0 m_IntermediateTextureMode: 1 ---- !u!114 &4523260582098458979 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 576f949be0794f548b825c9ce6f556db, type: 3} - m_Name: Flat Kit Per Object Outline - m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::FlatKit.ObjectOutlineRendererFeature - m_Active: 1 - settings: - passTag: RenderObjectsFeature - Event: 300 - filterSettings: - RenderQueueType: 0 - LayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - PassNames: - - Outline - overrideMaterial: {fileID: 0} - overrideMaterialPassIndex: 0 - overrideShader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} - overrideShaderPassIndex: 1 - overrideMode: 2 - overrideDepthState: 0 - depthCompareFunction: 4 - enableWrite: 1 - stencilSettings: - overrideStencilState: 0 - stencilReference: 0 - stencilCompareFunction: 8 - passOperation: 0 - failOperation: 0 - zFailOperation: 0 - cameraSettings: - overrideCamera: 0 - restoreCamera: 1 - offset: {x: 0, y: 0, z: 0, w: 0} - cameraFieldOfView: 60 - materials: [] - autoReferenceMaterials: 1 diff --git a/Assets/Materials/flatkit hexagons_medieval.mat b/Assets/Materials/flatkit hexagons_medieval.mat index 1f4ecf5..862e1a0 100644 --- a/Assets/Materials/flatkit hexagons_medieval.mat +++ b/Assets/Materials/flatkit hexagons_medieval.mat @@ -25,9 +25,6 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - DR_GRADIENT_ON - - DR_OUTLINE_ON - - DR_RIM_ON - _CELPRIMARYMODE_SINGLE - _DETAILMAPBLENDINGMODE_MULTIPLY - _GRADIENTSPACE_WORLD @@ -38,8 +35,9 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque disabledShaderPasses: - MOTIONVECTORS - SRPDEFAULTUNLIT @@ -143,7 +141,7 @@ Material: - _FlatRimLightAlign: 0 - _FlatRimSize: 0.1 - _FlatSpecularEdgeSmoothness: 0 - - _FlatSpecularSize: 0.1 + - _FlatSpecularSize: 0 - _Flatness: 1 - _FlatnessExtra: 1 - _GlossMapScale: 1 @@ -152,7 +150,7 @@ Material: - _GradientAngle: 0 - _GradientCenterX: 0 - _GradientCenterY: 0 - - _GradientEnabled: 1 + - _GradientEnabled: 0 - _GradientSize: 10 - _GradientSpace: 0 - _LightContribution: 0 @@ -163,19 +161,19 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _OutlineDepthOffset: 0.3 - - _OutlineEnabled: 1 + - _OutlineEnabled: 0 - _OutlineScale: 1 - _OutlineSpace: 0 - - _OutlineWidth: 20 + - _OutlineWidth: 1 - _OverrideLightmapDir: 0 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _RimEnabled: 1 - - _SelfShadingSize: 0.755 - - _SelfShadingSizeExtra: 1 - - _ShadowEdgeSize: 0 - - _ShadowEdgeSizeExtra: 0.05 + - _RimEnabled: 0 + - _SelfShadingSize: 0.5 + - _SelfShadingSizeExtra: 0.464 + - _ShadowEdgeSize: 0.1 + - _ShadowEdgeSizeExtra: 0.124 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularEnabled: 0 @@ -199,13 +197,13 @@ Material: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _ColorDim: {r: 0, g: 0, b: 0, a: 1} - - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimCurve: {r: 1, g: 1, b: 1, a: 1} - _ColorDimExtra: {r: 1, g: 0, b: 0, a: 1} - _ColorDimSteps: {r: 0, g: 0, b: 0, a: 1} - _ColorGradient: {r: 1, g: 1, b: 1, a: 1} - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _FlatRimColor: {r: 1, g: 1, b: 1, a: 1} + - _FlatRimColor: {r: 0, g: 0, b: 0, a: 1} - _FlatSpecularColor: {r: 1, g: 1, b: 1, a: 1} - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/flatkit prototype_texture.mat b/Assets/Materials/flatkit prototype_texture.mat new file mode 100644 index 0000000..c0a9671 --- /dev/null +++ b/Assets/Materials/flatkit prototype_texture.mat @@ -0,0 +1,212 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4489037953329047627 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: flatkit prototype_texture + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _GRADIENTSPACE_WORLD + - _OUTLINESPACE_SCREEN + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 4dc9701608193364ab37e56a8be9c659, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelCurveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelStepTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 4dc9701608193364ab37e56a8be9c659, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CameraDistanceImpact: 0 + - _CelExtraEnabled: 0 + - _CelNumSteps: 3 + - _CelPrimaryMode: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 + - _Flatness: 1 + - _FlatnessExtra: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.59999996 + - _GlossyReflections: 1 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _GradientSpace: 0 + - _LightContribution: 0 + - _LightFalloffSize: 0 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 0 + - _OutlineScale: 1 + - _OutlineSpace: 0 + - _OutlineWidth: 1 + - _OverrideLightmapDir: 0 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0 + - _SelfShadingSizeExtra: 0.6 + - _ShadowEdgeSize: 0.5 + - _ShadowEdgeSizeExtra: 0.05 + - _Smoothness: 0.59999996 + - _SmoothnessTextureChannel: 0 + - _SpecularEnabled: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 + - _UVSec: 0 + - _UnityShadowMode: 0 + - _UnityShadowOcclusion: 0 + - _UnityShadowPower: 0.2 + - _UnityShadowSharpness: 1 + - _VertexColorsEnabled: 0 + - _VertexExtrusionSmoothNormals: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorDim: {r: 0, g: 0, b: 0, a: 1} + - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Materials/flatkit prototype_texture.mat.meta b/Assets/Materials/flatkit prototype_texture.mat.meta new file mode 100644 index 0000000..f5d7a31 --- /dev/null +++ b/Assets/Materials/flatkit prototype_texture.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d64c307f1b4197c44970c29f9845c245 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/flatkit resource.mat b/Assets/Materials/flatkit resource.mat new file mode 100644 index 0000000..a04eba0 --- /dev/null +++ b/Assets/Materials/flatkit resource.mat @@ -0,0 +1,213 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: flatkit resource + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _GRADIENTSPACE_WORLD + - _OUTLINESPACE_SCREEN + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + - SRPDEFAULTUNLIT + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 698c06589ad16cb4c8c3392b73928f42, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelCurveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelStepTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 698c06589ad16cb4c8c3392b73928f42, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CameraDistanceImpact: 0 + - _CelExtraEnabled: 0 + - _CelNumSteps: 3 + - _CelPrimaryMode: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 + - _Flatness: 1 + - _FlatnessExtra: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _GradientSpace: 0 + - _LightContribution: 0 + - _LightFalloffSize: 0 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 0 + - _OutlineScale: 0 + - _OutlineSpace: 0 + - _OutlineWidth: 1 + - _OverrideLightmapDir: 0 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0.5 + - _SelfShadingSizeExtra: 0.6 + - _ShadowEdgeSize: 0.5 + - _ShadowEdgeSizeExtra: 0.05 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularEnabled: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 + - _UVSec: 0 + - _UnityShadowMode: 0 + - _UnityShadowOcclusion: 0 + - _UnityShadowPower: 0.2 + - _UnityShadowSharpness: 1 + - _VertexColorsEnabled: 0 + - _VertexExtrusionSmoothNormals: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorDim: {r: 0, g: 0, b: 0, a: 1} + - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FlatRimColor: {r: 1, g: 1, b: 1, a: 1} + - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &5774252633571324161 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/Materials/flatkit resource.mat.meta b/Assets/Materials/flatkit resource.mat.meta new file mode 100644 index 0000000..d03d8f7 --- /dev/null +++ b/Assets/Materials/flatkit resource.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 726c1e9087356f74594664341c681f12 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/BaseTower.prefab b/Assets/Prefabs/BaseTower.prefab deleted file mode 100644 index 14f7972..0000000 --- a/Assets/Prefabs/BaseTower.prefab +++ /dev/null @@ -1,184 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2363338622025898633 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5908846398168058715} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5908846398168058715 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2363338622025898633} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.75, z: 0.02444} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 600918267133276861} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3733880183385667081 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 600918267133276861} - - component: {fileID: 6029659556982190569} - m_Layer: 0 - m_Name: BaseTower - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &600918267133276861 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3733880183385667081} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4953750989773685492} - - {fileID: 5908846398168058715} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6029659556982190569 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3733880183385667081} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.Netcode.Runtime::Unity.Netcode.NetworkObject - GlobalObjectIdHash: 2180513150 - InScenePlacedSourceGlobalObjectIdHash: 0 - DeferredDespawnTick: 0 - Ownership: 1 - AlwaysReplicateAsRoot: 0 - SynchronizeTransform: 1 - ActiveSceneSynchronization: 0 - SceneMigrationSynchronization: 0 - SpawnWithObservers: 1 - DontDestroyWithOwner: 0 - AutoObjectParentSync: 1 - SyncOwnerTransformWhenParented: 1 - AllowOwnerToParent: 0 ---- !u!1001 &4843053201060930847 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 600918267133276861} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} - propertyPath: m_LocalRotation.x - value: 0.00000008146034 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} - propertyPath: m_Name - value: building_tower_base_blue - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} - insertIndex: -1 - addedObject: {fileID: 6494052432076197753} - m_SourcePrefab: {fileID: 100100000, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} ---- !u!4 &4953750989773685492 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} - m_PrefabInstance: {fileID: 4843053201060930847} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5761391365246359630 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} - m_PrefabInstance: {fileID: 4843053201060930847} - m_PrefabAsset: {fileID: 0} ---- !u!64 &6494052432076197753 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5761391365246359630} - 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: 2231612616327559228, guid: 9925587cfc99e8148bfab9d8b22d9f87, type: 3} diff --git a/Assets/Prefabs/Core.prefab b/Assets/Prefabs/Core.prefab new file mode 100644 index 0000000..3620c95 --- /dev/null +++ b/Assets/Prefabs/Core.prefab @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8124290768227340041 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8064559726283331702} + m_Layer: 0 + m_Name: Core + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8064559726283331702 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8124290768227340041} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -90} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2126198199081001988} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1876730568674182127 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8064559726283331702} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + propertyPath: m_LocalScale.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + propertyPath: m_LocalScale.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + propertyPath: m_LocalScale.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + propertyPath: m_LocalPosition.y + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000021855694 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + propertyPath: m_Name + value: Barrel_C + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + insertIndex: -1 + addedObject: {fileID: 1061550929417117571} + m_SourcePrefab: {fileID: 100100000, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} +--- !u!1 &1642148463057321662 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + m_PrefabInstance: {fileID: 1876730568674182127} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1061550929417117571 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1642148463057321662} + 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: -5282377409767143930, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} +--- !u!4 &2126198199081001988 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} + m_PrefabInstance: {fileID: 1876730568674182127} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/BaseTower.prefab.meta b/Assets/Prefabs/Core.prefab.meta similarity index 74% rename from Assets/Prefabs/BaseTower.prefab.meta rename to Assets/Prefabs/Core.prefab.meta index 81607d6..46a3a05 100644 --- a/Assets/Prefabs/BaseTower.prefab.meta +++ b/Assets/Prefabs/Core.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1979909431408184b9bc587877c5b4b4 +guid: e56926eda34629f4fbf3e4c53f0f8bd4 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 19c783a..dc13abd 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -53,7 +53,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} m_Name: m_EditorClassIdentifier: Unity.Netcode.Runtime::Unity.Netcode.NetworkObject - GlobalObjectIdHash: 1779588780 + GlobalObjectIdHash: 2180021075 InScenePlacedSourceGlobalObjectIdHash: 4211758632 DeferredDespawnTick: 0 Ownership: 1 @@ -170,6 +170,7 @@ MonoBehaviour: useForwardDirection: 1 playAnimations: 1 useAnimationEvents: 1 + blockDuringAnimation: 1 useEquipment: 1 showDebugRay: 1 --- !u!114 &5217638038410020423 @@ -274,10 +275,38 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8677449236576905839, guid: 4652a9058e767d142b3e889c2983fa9a, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d64c307f1b4197c44970c29f9845c245, type: 2} + - target: {fileID: -7164137249434462698, guid: 4652a9058e767d142b3e889c2983fa9a, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d64c307f1b4197c44970c29f9845c245, type: 2} + - target: {fileID: -6711558888386824058, guid: 4652a9058e767d142b3e889c2983fa9a, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d64c307f1b4197c44970c29f9845c245, type: 2} + - target: {fileID: -1697328484770790153, guid: 4652a9058e767d142b3e889c2983fa9a, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d64c307f1b4197c44970c29f9845c245, type: 2} + - target: {fileID: -540077757996713287, guid: 4652a9058e767d142b3e889c2983fa9a, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d64c307f1b4197c44970c29f9845c245, type: 2} - target: {fileID: 919132149155446097, guid: 4652a9058e767d142b3e889c2983fa9a, type: 3} propertyPath: m_Name value: Dummy objectReference: {fileID: 0} + - target: {fileID: 5737771032674114347, guid: 4652a9058e767d142b3e889c2983fa9a, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d64c307f1b4197c44970c29f9845c245, type: 2} + - target: {fileID: 8594629792745241546, guid: 4652a9058e767d142b3e889c2983fa9a, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d64c307f1b4197c44970c29f9845c245, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Prefabs/Mine.prefab b/Assets/Prefabs/Resource.prefab similarity index 65% rename from Assets/Prefabs/Mine.prefab rename to Assets/Prefabs/Resource.prefab index c71d208..b5b69cd 100644 --- a/Assets/Prefabs/Mine.prefab +++ b/Assets/Prefabs/Resource.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 5088182607393517512} - component: {fileID: 4361814627648944929} m_Layer: 7 - m_Name: Mine + m_Name: Resource m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -28,10 +28,10 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 3.73671, y: 1, z: -2.10091} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6628027201009695540} + - {fileID: 1933346348436029429} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!114 &5088182607393517512 @@ -46,8 +46,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} m_Name: m_EditorClassIdentifier: Unity.Netcode.Runtime::Unity.Netcode.NetworkObject - GlobalObjectIdHash: 3754078294 - InScenePlacedSourceGlobalObjectIdHash: 0 + GlobalObjectIdHash: 2106816000 + InScenePlacedSourceGlobalObjectIdHash: 1509768584 DeferredDespawnTick: 0 Ownership: 1 AlwaysReplicateAsRoot: 0 @@ -75,7 +75,7 @@ MonoBehaviour: infiniteResources: 1 maxResources: 1000 resourcesPerMining: 10 - miningCooldown: 2 + miningCooldown: 0 resourceName: "\uAD11\uC11D" interactionAnimationTrigger: Mining equipmentData: @@ -85,7 +85,7 @@ MonoBehaviour: detachOnEnd: 1 miningEffectPrefab: {fileID: 0} effectSpawnPoint: {fileID: 0} ---- !u!1001 &6661319600370769119 +--- !u!1001 &2116156636655425566 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -93,86 +93,86 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3247786716306397435} m_Modifications: - - target: {fileID: -8679921383154817045, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - target: {fileID: -8679921383154817045, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 3 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - target: {fileID: -8679921383154817045, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 3 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - target: {fileID: -8679921383154817045, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 3 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - target: {fileID: -8679921383154817045, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - target: {fileID: -8679921383154817045, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - target: {fileID: -8679921383154817045, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - target: {fileID: -8679921383154817045, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - target: {fileID: -8679921383154817045, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} propertyPath: m_LocalRotation.x value: 0.00000008146034 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - target: {fileID: -8679921383154817045, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - target: {fileID: -8679921383154817045, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - target: {fileID: -8679921383154817045, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - target: {fileID: -8679921383154817045, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - target: {fileID: -8679921383154817045, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - target: {fileID: -7511558181221131132, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 726c1e9087356f74594664341c681f12, type: 2} + - target: {fileID: 919132149155446097, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} propertyPath: m_Name - value: building_mine_blue - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} - propertyPath: m_Layer - value: 7 + value: Gems_Pile_Large objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} insertIndex: -1 - addedObject: {fileID: 7086370303817695609} - m_SourcePrefab: {fileID: 100100000, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} ---- !u!1 &5814335357814006158 stripped + addedObject: {fileID: 2263651141701971438} + m_SourcePrefab: {fileID: 100100000, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} +--- !u!1 &1269857788199413071 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} - m_PrefabInstance: {fileID: 6661319600370769119} + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} + m_PrefabInstance: {fileID: 2116156636655425566} m_PrefabAsset: {fileID: 0} ---- !u!64 &7086370303817695609 +--- !u!64 &2263651141701971438 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5814335357814006158} + m_GameObject: {fileID: 1269857788199413071} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -187,9 +187,9 @@ MeshCollider: serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 - m_Mesh: {fileID: -1670515093782540488, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} ---- !u!4 &6628027201009695540 stripped + m_Mesh: {fileID: -8477760475877621899, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} +--- !u!4 &1933346348436029429 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a58786a28a2fd2b40b9df4d8592ce2b8, type: 3} - m_PrefabInstance: {fileID: 6661319600370769119} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 61adaca355888734ab2e5d1cb08f040c, type: 3} + m_PrefabInstance: {fileID: 2116156636655425566} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Mine.prefab.meta b/Assets/Prefabs/Resource.prefab.meta similarity index 100% rename from Assets/Prefabs/Mine.prefab.meta rename to Assets/Prefabs/Resource.prefab.meta diff --git a/Assets/Scenes/GameMain.unity b/Assets/Scenes/GameMain.unity index b9ca57c..676544a 100644 --- a/Assets/Scenes/GameMain.unity +++ b/Assets/Scenes/GameMain.unity @@ -152,6 +152,288 @@ Transform: - {fileID: 1672828973} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &195219037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 195219038} + - component: {fileID: 195219039} + m_Layer: 0 + m_Name: PlayerSpawnPoint (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &195219038 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195219037} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3, y: 0, z: -5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 447015515} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &195219039 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 195219037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41a3c6ef0dc9b4d4c9db4ec668a78fb3, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Northbound.PlayerSpawnPoint + spawnIndex: 3 + isAvailable: 1 + gizmoColor: {r: 0, g: 1, b: 0, a: 1} + gizmoRadius: 0.5 +--- !u!1001 &378823424 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1068750869} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalPosition.x + value: 8 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000021855694 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d64c307f1b4197c44970c29f9845c245, type: 2} + - target: {fileID: 919132149155446097, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_Name + value: Wall (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} +--- !u!1001 &383372408 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1068750869} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalPosition.x + value: 16 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000021855694 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d64c307f1b4197c44970c29f9845c245, type: 2} + - target: {fileID: 919132149155446097, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_Name + value: Wall (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} +--- !u!1 &447015514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 447015515} + m_Layer: 0 + m_Name: SpawnPoints + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &447015515 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 447015514} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 2, z: -65} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 500303526} + - {fileID: 538566343} + - {fileID: 1562472532} + - {fileID: 195219038} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &448767617 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + m_PrefabInstance: {fileID: 579997178} + m_PrefabAsset: {fileID: 0} +--- !u!1 &500303525 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 500303526} + - component: {fileID: 500303527} + m_Layer: 0 + m_Name: PlayerSpawnPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &500303526 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500303525} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3, y: 0, z: -5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 447015515} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &500303527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500303525} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41a3c6ef0dc9b4d4c9db4ec668a78fb3, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Northbound.PlayerSpawnPoint + spawnIndex: 0 + isAvailable: 1 + gizmoColor: {r: 0, g: 1, b: 0, a: 1} + gizmoRadius: 0.5 --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -283,8 +565,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} serializedVersion: 2 - m_LocalRotation: {x: 0.5, y: 0, z: 0, w: 0.8660254} - m_LocalPosition: {x: 0, y: 31, z: -14} + m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} + m_LocalPosition: {x: 0, y: 31, z: -25} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -322,6 +604,200 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 CustomBlends: {fileID: 0} +--- !u!1 &538566342 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 538566343} + - component: {fileID: 538566344} + m_Layer: 0 + m_Name: PlayerSpawnPoint (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &538566343 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 538566342} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1, y: 0, z: -5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 447015515} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &538566344 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 538566342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41a3c6ef0dc9b4d4c9db4ec668a78fb3, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Northbound.PlayerSpawnPoint + spawnIndex: 1 + isAvailable: 1 + gizmoColor: {r: 0, g: 1, b: 0, a: 1} + gizmoRadius: 0.5 +--- !u!1001 &579997178 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1068750869} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalPosition.x + value: -16 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000021855694 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d64c307f1b4197c44970c29f9845c245, type: 2} + - target: {fileID: 919132149155446097, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_Name + value: Wall (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} +--- !u!1001 &588824321 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1068750869} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000021855694 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d64c307f1b4197c44970c29f9845c245, type: 2} + - target: {fileID: 919132149155446097, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + propertyPath: m_Name + value: Wall_Doorway + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0ec490e44836ee4387c63d21980611c, type: 3} --- !u!1 &782070680 GameObject: m_ObjectHideFlags: 0 @@ -449,6 +925,11 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!4 &788941389 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + m_PrefabInstance: {fileID: 383372408} + m_PrefabAsset: {fileID: 0} --- !u!1 &985764481 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 19ca9afdd7bb3a64c9036c18e8cee5f2, type: 3} @@ -476,6 +957,47 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 7871226766641542135, guid: 19ca9afdd7bb3a64c9036c18e8cee5f2, type: 3} +--- !u!1 &1068750868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1068750869} + m_Layer: 0 + m_Name: Walls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1068750869 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068750868} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -40} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1685319252} + - {fileID: 1313237195} + - {fileID: 788941389} + - {fileID: 448767617} + - {fileID: 1113397316} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1113397316 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: b0ec490e44836ee4387c63d21980611c, type: 3} + m_PrefabInstance: {fileID: 588824321} + m_PrefabAsset: {fileID: 0} --- !u!1 &1142746332 GameObject: m_ObjectHideFlags: 0 @@ -597,6 +1119,11 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1313237195 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + m_PrefabInstance: {fileID: 378823424} + m_PrefabAsset: {fileID: 0} --- !u!1 &1433142230 GameObject: m_ObjectHideFlags: 0 @@ -608,6 +1135,7 @@ GameObject: - component: {fileID: 1433142232} - component: {fileID: 1433142233} - component: {fileID: 1433142234} + - component: {fileID: 1433142235} m_Layer: 0 m_Name: NetworkManager m_TagString: Untagged @@ -652,7 +1180,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 7b404c1238cb4de4fb03160b5011a202, type: 2} TickRate: 30 ClientConnectionBufferTimeout: 10 - ConnectionApproval: 0 + ConnectionApproval: 1 ConnectionData: EnableTimeResync: 0 TimeResyncInterval: 30 @@ -703,6 +1231,69 @@ MonoBehaviour: PacketDelayMS: 0 PacketJitterMS: 0 PacketDropRate: 0 +--- !u!114 &1433142235 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433142230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f77688301e4c5684bae207ce2a93706c, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Northbound.NetworkConnectionHandler + spawnPoints: [] + useRandomSpawn: 0 + findSpawnPointsAutomatically: 1 +--- !u!1 &1562472531 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1562472532} + - component: {fileID: 1562472533} + m_Layer: 0 + m_Name: PlayerSpawnPoint (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1562472532 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1562472531} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1, y: 0, z: -5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 447015515} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1562472533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1562472531} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41a3c6ef0dc9b4d4c9db4ec668a78fb3, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Northbound.PlayerSpawnPoint + spawnIndex: 2 + isAvailable: 1 + gizmoColor: {r: 0, g: 1, b: 0, a: 1} + gizmoRadius: 0.5 --- !u!1 &1672828972 GameObject: m_ObjectHideFlags: 0 @@ -729,13 +1320,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1672828972} serializedVersion: 2 - m_LocalRotation: {x: 0.5, y: 0, z: 0, w: 0.8660254} - m_LocalPosition: {x: 0, y: 31, z: -14} + m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} + m_LocalPosition: {x: 0, y: 31, z: -25} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 61373299} - m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} --- !u!114 &1672828974 MonoBehaviour: m_ObjectHideFlags: 0 @@ -754,7 +1345,7 @@ MonoBehaviour: AngularDampingMode: 0 RotationDamping: {x: 1, y: 1, z: 1} QuaternionDamping: 1 - FollowOffset: {x: 0, y: 30, z: -14} + FollowOffset: {x: 0, y: 30, z: -25} --- !u!114 &1672828975 MonoBehaviour: m_ObjectHideFlags: 0 @@ -798,6 +1389,84 @@ MonoBehaviour: BarrelClipping: 0.25 Anamorphism: 0 BlendHint: 0 +--- !u!4 &1685319252 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + m_PrefabInstance: {fileID: 1880237668} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1880237668 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1068750869} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalPosition.x + value: -8 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000021855694 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d64c307f1b4197c44970c29f9845c245, type: 2} + - target: {fileID: 919132149155446097, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} + propertyPath: m_Name + value: Wall + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 244a8d70d41b1a948beb2221c7c0efa9, type: 3} --- !u!1001 &1975225896 PrefabInstance: m_ObjectHideFlags: 0 @@ -808,7 +1477,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 19ca9afdd7bb3a64c9036c18e8cee5f2, type: 3} propertyPath: m_LocalScale.x - value: 5 + value: 10 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 19ca9afdd7bb3a64c9036c18e8cee5f2, type: 3} propertyPath: m_LocalScale.y @@ -816,7 +1485,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 19ca9afdd7bb3a64c9036c18e8cee5f2, type: 3} propertyPath: m_LocalScale.z - value: 5 + value: 200 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 19ca9afdd7bb3a64c9036c18e8cee5f2, type: 3} propertyPath: m_LocalPosition.x @@ -828,7 +1497,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 19ca9afdd7bb3a64c9036c18e8cee5f2, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 19ca9afdd7bb3a64c9036c18e8cee5f2, type: 3} propertyPath: m_LocalRotation.w @@ -874,6 +1543,93 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 985764485} m_SourcePrefab: {fileID: 100100000, guid: 19ca9afdd7bb3a64c9036c18e8cee5f2, type: 3} +--- !u!1001 &4786254629656932894 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8064559726283331702, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8064559726283331702, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8064559726283331702, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3} + propertyPath: m_LocalPosition.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 8064559726283331702, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8064559726283331702, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8064559726283331702, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8064559726283331702, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8064559726283331702, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8064559726283331702, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8064559726283331702, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8124290768227340041, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3} + propertyPath: m_Name + value: Core + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1642148463057321662, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3} + insertIndex: -1 + addedObject: {fileID: 4786254629656932896} + m_SourcePrefab: {fileID: 100100000, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3} +--- !u!1 &4786254629656932895 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1642148463057321662, guid: e56926eda34629f4fbf3e4c53f0f8bd4, type: 3} + m_PrefabInstance: {fileID: 4786254629656932894} + m_PrefabAsset: {fileID: 0} +--- !u!64 &4786254629656932896 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4786254629656932895} + 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: -5282377409767143930, guid: 5f64c4e10a9ac674c9d0b68790f2c859, type: 3} --- !u!1001 &4875211098963642791 PrefabInstance: m_ObjectHideFlags: 0 @@ -882,29 +1638,17 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3247786716306397435, guid: f395fcc064a3a834ba957327f1387c19, type: 3} - propertyPath: m_LocalScale.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3247786716306397435, guid: f395fcc064a3a834ba957327f1387c19, type: 3} - propertyPath: m_LocalScale.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3247786716306397435, guid: f395fcc064a3a834ba957327f1387c19, type: 3} - propertyPath: m_LocalScale.z - value: 2 - objectReference: {fileID: 0} - target: {fileID: 3247786716306397435, guid: f395fcc064a3a834ba957327f1387c19, type: 3} propertyPath: m_LocalPosition.x - value: 3.73671 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3247786716306397435, guid: f395fcc064a3a834ba957327f1387c19, type: 3} propertyPath: m_LocalPosition.y - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3247786716306397435, guid: f395fcc064a3a834ba957327f1387c19, type: 3} propertyPath: m_LocalPosition.z - value: 5.8804636 + value: -50 objectReference: {fileID: 0} - target: {fileID: 3247786716306397435, guid: f395fcc064a3a834ba957327f1387c19, type: 3} propertyPath: m_LocalRotation.w @@ -934,22 +1678,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4361814627648944929, guid: f395fcc064a3a834ba957327f1387c19, type: 3} - propertyPath: miningCooldown - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5088182607393517512, guid: f395fcc064a3a834ba957327f1387c19, type: 3} propertyPath: GlobalObjectIdHash value: 2106816000 objectReference: {fileID: 0} - - target: {fileID: 5088182607393517512, guid: f395fcc064a3a834ba957327f1387c19, type: 3} - propertyPath: InScenePlacedSourceGlobalObjectIdHash - value: 1509768584 - objectReference: {fileID: 0} - - target: {fileID: 5453955098077085787, guid: f395fcc064a3a834ba957327f1387c19, type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 2100000, guid: 91e05bbf1e5cbfb4d865c8e2febc4673, type: 2} - target: {fileID: 5585059388146411250, guid: f395fcc064a3a834ba957327f1387c19, type: 3} propertyPath: m_Name value: Mine @@ -970,3 +1702,6 @@ SceneRoots: - {fileID: 1199559224} - {fileID: 4875211098963642791} - {fileID: 782070683} + - {fileID: 4786254629656932894} + - {fileID: 447015515} + - {fileID: 1068750869} diff --git a/Assets/Scripts/NetworkConnectionHandler.cs b/Assets/Scripts/NetworkConnectionHandler.cs new file mode 100644 index 0000000..f3a2fb4 --- /dev/null +++ b/Assets/Scripts/NetworkConnectionHandler.cs @@ -0,0 +1,121 @@ +using System.Collections.Generic; +using System.Linq; +using Unity.Netcode; +using UnityEngine; + +namespace Northbound +{ + /// + /// 네트워크 연결 및 스폰 관리 + /// + public class NetworkConnectionHandler : MonoBehaviour + { + [Header("Spawn Settings")] + public List spawnPoints = new List(); + public bool useRandomSpawn = false; + public bool findSpawnPointsAutomatically = true; + + private Dictionary _clientSpawnIndices = new Dictionary(); + private int _nextSpawnIndex = 0; + + private void Start() + { + if (findSpawnPointsAutomatically) + { + FindSpawnPoints(); + } + + if (NetworkManager.Singleton != null) + { + NetworkManager.Singleton.ConnectionApprovalCallback = ApprovalCheck; + NetworkManager.Singleton.OnServerStarted += OnServerStarted; + } + } + + private void FindSpawnPoints() + { + PlayerSpawnPoint[] points = FindObjectsByType(FindObjectsSortMode.None); + + // spawnIndex로 정렬 + var sortedPoints = points.OrderBy(p => p.spawnIndex == -1 ? int.MaxValue : p.spawnIndex); + + spawnPoints.Clear(); + foreach (var point in sortedPoints) + { + if (point.isAvailable) + { + spawnPoints.Add(point.transform); + } + } + + Debug.Log($"[Connection] {spawnPoints.Count}개의 스폰 포인트를 찾았습니다."); + } + + private void OnServerStarted() + { + Debug.Log("[Connection] 서버 시작됨"); + } + + private void ApprovalCheck( + NetworkManager.ConnectionApprovalRequest request, + NetworkManager.ConnectionApprovalResponse response) + { + response.Approved = true; + response.CreatePlayerObject = true; + + // 스폰 위치 설정 + response.Position = GetSpawnPosition(request.ClientNetworkId); + response.Rotation = GetSpawnRotation(request.ClientNetworkId); + + Debug.Log($"[Connection] 클라이언트 {request.ClientNetworkId} 승인됨. 스폰 위치: {response.Position}"); + } + + private Vector3 GetSpawnPosition(ulong clientId) + { + if (spawnPoints.Count == 0) + { + Debug.LogWarning("[Connection] 스폰 포인트가 없습니다. 기본 위치 반환."); + return Vector3.zero; + } + + int spawnIndex; + + if (useRandomSpawn) + { + spawnIndex = Random.Range(0, spawnPoints.Count); + } + else + { + if (!_clientSpawnIndices.ContainsKey(clientId)) + { + _clientSpawnIndices[clientId] = _nextSpawnIndex; + _nextSpawnIndex = (_nextSpawnIndex + 1) % spawnPoints.Count; + } + spawnIndex = _clientSpawnIndices[clientId]; + } + + return spawnPoints[spawnIndex].position; + } + + private Quaternion GetSpawnRotation(ulong clientId) + { + if (spawnPoints.Count == 0) + return Quaternion.identity; + + int spawnIndex = _clientSpawnIndices.ContainsKey(clientId) + ? _clientSpawnIndices[clientId] + : 0; + + return spawnPoints[spawnIndex].rotation; + } + + private void OnDestroy() + { + if (NetworkManager.Singleton != null) + { + NetworkManager.Singleton.ConnectionApprovalCallback = null; + NetworkManager.Singleton.OnServerStarted -= OnServerStarted; + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/NetworkConnectionHandler.cs.meta b/Assets/Scripts/NetworkConnectionHandler.cs.meta new file mode 100644 index 0000000..1f532df --- /dev/null +++ b/Assets/Scripts/NetworkConnectionHandler.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f77688301e4c5684bae207ce2a93706c \ No newline at end of file diff --git a/Assets/Scripts/NetworkSpawnManager.cs b/Assets/Scripts/NetworkSpawnManager.cs new file mode 100644 index 0000000..7f3e617 --- /dev/null +++ b/Assets/Scripts/NetworkSpawnManager.cs @@ -0,0 +1,132 @@ +using System.Collections.Generic; +using System.Linq; +using Unity.Netcode; +using UnityEngine; + +namespace Northbound +{ + /// + /// 네트워크 플레이어의 스폰 위치를 관리 + /// + public class NetworkSpawnManager : NetworkBehaviour + { + public static NetworkSpawnManager Instance { get; private set; } + + [Header("Spawn Settings")] + public List spawnPoints = new List(); + public bool useRandomSpawn = false; + public bool findSpawnPointsAutomatically = true; + + private Dictionary _clientSpawnIndices = new Dictionary(); + private int _nextSpawnIndex = 0; + + private void Awake() + { + if (Instance != null && Instance != this) + { + Destroy(gameObject); + return; + } + Instance = this; + } + + private void Start() + { + if (findSpawnPointsAutomatically) + { + FindSpawnPoints(); + } + + if (NetworkManager.Singleton != null) + { + NetworkManager.Singleton.OnClientConnectedCallback += OnClientConnected; + } + } + + private void FindSpawnPoints() + { + PlayerSpawnPoint[] points = FindObjectsByType(FindObjectsSortMode.None); + + // spawnIndex로 정렬 + var sortedPoints = points.OrderBy(p => p.spawnIndex == -1 ? int.MaxValue : p.spawnIndex); + + spawnPoints.Clear(); + foreach (var point in sortedPoints) + { + if (point.isAvailable) + { + spawnPoints.Add(point.transform); + } + } + + Debug.Log($"[SpawnManager] {spawnPoints.Count}개의 스폰 포인트를 찾았습니다."); + } + + private void OnClientConnected(ulong clientId) + { + if (!IsServer) return; + + // 플레이어가 스폰되었을 때 위치 설정 + if (NetworkManager.Singleton.ConnectedClients.TryGetValue(clientId, out var client)) + { + if (client.PlayerObject != null) + { + Vector3 spawnPosition = GetSpawnPosition(clientId); + Quaternion spawnRotation = GetSpawnRotation(clientId); + + client.PlayerObject.transform.position = spawnPosition; + client.PlayerObject.transform.rotation = spawnRotation; + + Debug.Log($"[SpawnManager] 클라이언트 {clientId} 스폰 위치 설정: {spawnPosition}"); + } + } + } + + public Vector3 GetSpawnPosition(ulong clientId) + { + if (spawnPoints.Count == 0) + { + Debug.LogWarning("[SpawnManager] 스폰 포인트가 없습니다. 기본 위치 반환."); + return Vector3.zero; + } + + int spawnIndex; + + if (useRandomSpawn) + { + spawnIndex = Random.Range(0, spawnPoints.Count); + } + else + { + if (!_clientSpawnIndices.ContainsKey(clientId)) + { + _clientSpawnIndices[clientId] = _nextSpawnIndex; + _nextSpawnIndex = (_nextSpawnIndex + 1) % spawnPoints.Count; + } + spawnIndex = _clientSpawnIndices[clientId]; + } + + return spawnPoints[spawnIndex].position; + } + + public Quaternion GetSpawnRotation(ulong clientId) + { + if (spawnPoints.Count == 0) + return Quaternion.identity; + + int spawnIndex = _clientSpawnIndices.ContainsKey(clientId) + ? _clientSpawnIndices[clientId] + : 0; + + return spawnPoints[spawnIndex].rotation; + } + + private void OnDestroy() + { + if (NetworkManager.Singleton != null) + { + NetworkManager.Singleton.OnClientConnectedCallback -= OnClientConnected; + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/NetworkSpawnManager.cs.meta b/Assets/Scripts/NetworkSpawnManager.cs.meta new file mode 100644 index 0000000..7721fc3 --- /dev/null +++ b/Assets/Scripts/NetworkSpawnManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 287898125f34d1448a03db6b98a9c420 \ No newline at end of file diff --git a/Assets/Scripts/PlayerSpawnPoint.cs b/Assets/Scripts/PlayerSpawnPoint.cs new file mode 100644 index 0000000..9c9fbb2 --- /dev/null +++ b/Assets/Scripts/PlayerSpawnPoint.cs @@ -0,0 +1,25 @@ +using UnityEngine; + +namespace Northbound +{ + /// + /// 플레이어 스폰 위치를 표시하는 마커 + /// + public class PlayerSpawnPoint : MonoBehaviour + { + [Header("Spawn Settings")] + public int spawnIndex = -1; // -1 = 순서대로 할당 + public bool isAvailable = true; + + [Header("Debug")] + public Color gizmoColor = Color.green; + public float gizmoRadius = 0.5f; + + private void OnDrawGizmos() + { + Gizmos.color = isAvailable ? gizmoColor : Color.red; + Gizmos.DrawWireSphere(transform.position, gizmoRadius); + Gizmos.DrawLine(transform.position, transform.position + transform.forward * 2f); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/PlayerSpawnPoint.cs.meta b/Assets/Scripts/PlayerSpawnPoint.cs.meta new file mode 100644 index 0000000..eacd77c --- /dev/null +++ b/Assets/Scripts/PlayerSpawnPoint.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 41a3c6ef0dc9b4d4c9db4ec668a78fb3 \ No newline at end of file diff --git a/Unity.RenderPipelines.Universal.Runtime.csproj b/Unity.RenderPipelines.Universal.Runtime.csproj index 5d0eda5..9afe700 100644 --- a/Unity.RenderPipelines.Universal.Runtime.csproj +++ b/Unity.RenderPipelines.Universal.Runtime.csproj @@ -57,8 +57,8 @@ - +