From e8d57be050bfe862ac1f8f320a97412f50cec8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EB=8F=99=EC=B2=A0?= <36955431+dongcheolpark@users.noreply.github.com> Date: Sun, 7 Aug 2022 17:48:50 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=ED=94=84=EB=A6=AC=ED=8C=B9=20?= =?UTF-8?q?=ED=8F=B4=EB=8D=94=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Resources/Prefabs/ChatBox.prefab | 286 --------------- .../Resources/Prefabs/Enemy/Enemy.prefab | 2 +- .../{Creature.meta => MapObjects.meta} | 2 +- .../{Env.meta => MapObjects/Wave.meta} | 2 +- .../{ => MapObjects/Wave}/WaveSense.prefab | 86 +---- .../Wave}/WaveSense.prefab.meta | 0 .../{Player 1.prefab.meta => Obstacles.meta} | 5 +- .../Prefabs/{ => Obstacles}/Floor.prefab | 0 .../Prefabs/{ => Obstacles}/Floor.prefab.meta | 0 .../{ => Obstacles}/InvisibleFloor.prefab | 0 .../InvisibleFloor.prefab.meta | 0 .../{ => Obstacles}/InvisibleWall.prefab | 0 .../{ => Obstacles}/InvisibleWall.prefab.meta | 0 .../Prefabs/{ => Obstacles}/Lava.prefab | 0 .../Prefabs/{ => Obstacles}/Lava.prefab.meta | 0 .../{ => Obstacles}/PressFloor1.prefab | 0 .../{ => Obstacles}/PressFloor1.prefab.meta | 0 .../Assets/Resources/Prefabs/Player 1.prefab | 339 ------------------ .../{ => SceneControl}/SceneFader.prefab | 0 .../{ => SceneControl}/SceneFader.prefab.meta | 0 .../{ChatBox.prefab.meta => Test.meta} | 5 +- .../Resources/Prefabs/{ => Test}/TestKjh.meta | 0 .../Prefabs/{ => Test}/TestKjh/Camera.prefab | 0 .../{ => Test}/TestKjh/Camera.prefab.meta | 0 .../Prefabs/{ => Test}/TestKjh/Ground.prefab | 0 .../{ => Test}/TestKjh/Ground.prefab.meta | 0 .../Prefabs/{ => Test}/TestKjh/Player.prefab | 0 .../{ => Test}/TestKjh/Player.prefab.meta | 0 .../Prefabs/{ => Test}/TestKjh/Player1.prefab | 0 .../{ => Test}/TestKjh/Player1.prefab.meta | 0 .../{ => Test}/TestKjh/Player11.prefab | 0 .../{ => Test}/TestKjh/Player11.prefab.meta | 0 .../Prefabs/{ => Test}/TestKjh/TestNPC.prefab | 0 .../{ => Test}/TestKjh/TestNPC.prefab.meta | 0 .../{ => Test}/TestKjh/TestObject.prefab | 0 .../{ => Test}/TestKjh/TestObject.prefab.meta | 0 .../Prefabs/{ => Test}/TestKjh/abc.prefab | 0 .../{ => Test}/TestKjh/abc.prefab.meta | 0 .../Prefabs/{ => Test}/TestPooling.prefab | 0 .../{ => Test}/TestPooling.prefab.meta | 0 .../Prefabs/\353\202\250\353\252\250.png" | Bin 43486 -> 0 bytes .../\353\202\250\353\252\250.png.meta" | 98 ----- .../Assets/Scenes/TestFogOfWar.unity | 330 ++++++++--------- .../Core/MonoBehaviour/PlayerCharacter.cs | 2 +- .../Settings/Global Volume Profile.asset | 2 +- .../RiderScriptEditorPersistedState.asset | 2 +- 46 files changed, 178 insertions(+), 983 deletions(-) delete mode 100644 Project_Blind/Assets/Resources/Prefabs/ChatBox.prefab rename Project_Blind/Assets/Resources/Prefabs/{Creature.meta => MapObjects.meta} (77%) rename Project_Blind/Assets/Resources/Prefabs/{Env.meta => MapObjects/Wave.meta} (77%) rename Project_Blind/Assets/Resources/Prefabs/{ => MapObjects/Wave}/WaveSense.prefab (91%) rename Project_Blind/Assets/Resources/Prefabs/{ => MapObjects/Wave}/WaveSense.prefab.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{Player 1.prefab.meta => Obstacles.meta} (57%) rename Project_Blind/Assets/Resources/Prefabs/{ => Obstacles}/Floor.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Obstacles}/Floor.prefab.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Obstacles}/InvisibleFloor.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Obstacles}/InvisibleFloor.prefab.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Obstacles}/InvisibleWall.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Obstacles}/InvisibleWall.prefab.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Obstacles}/Lava.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Obstacles}/Lava.prefab.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Obstacles}/PressFloor1.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Obstacles}/PressFloor1.prefab.meta (100%) delete mode 100644 Project_Blind/Assets/Resources/Prefabs/Player 1.prefab rename Project_Blind/Assets/Resources/Prefabs/{ => SceneControl}/SceneFader.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => SceneControl}/SceneFader.prefab.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{ChatBox.prefab.meta => Test.meta} (57%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/Camera.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/Camera.prefab.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/Ground.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/Ground.prefab.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/Player.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/Player.prefab.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/Player1.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/Player1.prefab.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/Player11.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/Player11.prefab.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/TestNPC.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/TestNPC.prefab.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/TestObject.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/TestObject.prefab.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/abc.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestKjh/abc.prefab.meta (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestPooling.prefab (100%) rename Project_Blind/Assets/Resources/Prefabs/{ => Test}/TestPooling.prefab.meta (100%) delete mode 100644 "Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png" delete mode 100644 "Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png.meta" diff --git a/Project_Blind/Assets/Resources/Prefabs/ChatBox.prefab b/Project_Blind/Assets/Resources/Prefabs/ChatBox.prefab deleted file mode 100644 index ee8579e5..00000000 --- a/Project_Blind/Assets/Resources/Prefabs/ChatBox.prefab +++ /dev/null @@ -1,286 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2002515348805288685 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2002515348805288681} - - component: {fileID: 2002515348805288680} - - component: {fileID: 2002515348805288683} - - component: {fileID: 2002515348805288682} - m_Layer: 0 - m_Name: Quad - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2002515348805288681 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002515348805288685} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.05000019, z: -0.014492093} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2002515350153212937} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2002515348805288680 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002515348805288685} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &2002515348805288683 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002515348805288685} - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 308be2b81ceaa264bb113961fbd5c4bc, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &2002515348805288682 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002515348805288685} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &2002515350153212938 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2002515350153212937} - - component: {fileID: 2002515350153212936} - - component: {fileID: 2002515350153212939} - - component: {fileID: 1769109278407787989} - m_Layer: 0 - m_Name: ChatBox - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2002515350153212937 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002515350153212938} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2002515348805288681} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 4, y: 5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &2002515350153212936 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002515350153212938} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &2002515350153212939 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002515350153212938} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Sample text - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 5 - m_fontSizeBase: 5 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2002515350153212936} - m_maskType: 0 ---- !u!114 &1769109278407787989 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002515350153212938} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 719d922c86e4475e9c3ffbc681b4ba00, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Project_Blind/Assets/Resources/Prefabs/Enemy/Enemy.prefab b/Project_Blind/Assets/Resources/Prefabs/Enemy/Enemy.prefab index ab74a48a..3c9280ee 100644 --- a/Project_Blind/Assets/Resources/Prefabs/Enemy/Enemy.prefab +++ b/Project_Blind/Assets/Resources/Prefabs/Enemy/Enemy.prefab @@ -200,7 +200,7 @@ MonoBehaviour: m_LightCookieSprite: {fileID: 0} m_DeprecatedPointLightCookieSprite: {fileID: 0} m_LightOrder: 0 - m_OverlapOperation: 0 + m_OverlapOperation: 1 m_NormalMapDistance: 3 m_NormalMapQuality: 2 m_UseNormalMap: 0 diff --git a/Project_Blind/Assets/Resources/Prefabs/Creature.meta b/Project_Blind/Assets/Resources/Prefabs/MapObjects.meta similarity index 77% rename from Project_Blind/Assets/Resources/Prefabs/Creature.meta rename to Project_Blind/Assets/Resources/Prefabs/MapObjects.meta index a5148391..4a4be229 100644 --- a/Project_Blind/Assets/Resources/Prefabs/Creature.meta +++ b/Project_Blind/Assets/Resources/Prefabs/MapObjects.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 59c71d4feb8f5b343bd86efd9933941b +guid: b513c0d6c398346ff91196e3f60f727d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Project_Blind/Assets/Resources/Prefabs/Env.meta b/Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave.meta similarity index 77% rename from Project_Blind/Assets/Resources/Prefabs/Env.meta rename to Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave.meta index 004dd205..2a7990e4 100644 --- a/Project_Blind/Assets/Resources/Prefabs/Env.meta +++ b/Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7dccf0a5b6cafb54c8223319b2808ad6 +guid: 61037011469d34ed1a253c2607960550 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Project_Blind/Assets/Resources/Prefabs/WaveSense.prefab b/Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave/WaveSense.prefab similarity index 91% rename from Project_Blind/Assets/Resources/Prefabs/WaveSense.prefab rename to Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave/WaveSense.prefab index 36b8db7d..712c19e6 100644 --- a/Project_Blind/Assets/Resources/Prefabs/WaveSense.prefab +++ b/Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave/WaveSense.prefab @@ -31,8 +31,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2055673048288375742} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -810,86 +809,3 @@ MonoBehaviour: - {x: 0.5, y: -0.5, z: 0} - {x: 0.5, y: 0.5, z: 0} - {x: -0.5, y: 0.5, z: 0} ---- !u!1 &9130447380892499307 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2055673048288375742} - - component: {fileID: 1296353411995899664} - m_Layer: 0 - m_Name: Circle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2055673048288375742 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9130447380892499307} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0013014321} - m_LocalScale: {x: 12.25, y: 12.25, z: 12.25} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 4902102705366628978} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!331 &1296353411995899664 -SpriteMask: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9130447380892499307} - 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: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_MaskAlphaCutoff: 0.267 - m_FrontSortingLayerID: 0 - m_BackSortingLayerID: 0 - m_FrontSortingLayer: 0 - m_BackSortingLayer: 0 - m_FrontSortingOrder: 10 - m_BackSortingOrder: -5 - m_IsCustomRangeActive: 1 - m_SpriteSortPoint: 0 diff --git a/Project_Blind/Assets/Resources/Prefabs/WaveSense.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave/WaveSense.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/WaveSense.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave/WaveSense.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/Player 1.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Obstacles.meta similarity index 57% rename from Project_Blind/Assets/Resources/Prefabs/Player 1.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Obstacles.meta index c72ac3dd..5f339eb1 100644 --- a/Project_Blind/Assets/Resources/Prefabs/Player 1.prefab.meta +++ b/Project_Blind/Assets/Resources/Prefabs/Obstacles.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: 2f0bf8c8717dcce40a637da63acb4162 -PrefabImporter: +guid: 0c850edbde3044d73af3e964010ff949 +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Project_Blind/Assets/Resources/Prefabs/Floor.prefab b/Project_Blind/Assets/Resources/Prefabs/Obstacles/Floor.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/Floor.prefab rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/Floor.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/Floor.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Obstacles/Floor.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/Floor.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/Floor.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/InvisibleFloor.prefab b/Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleFloor.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/InvisibleFloor.prefab rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleFloor.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/InvisibleFloor.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleFloor.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/InvisibleFloor.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleFloor.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/InvisibleWall.prefab b/Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleWall.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/InvisibleWall.prefab rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleWall.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/InvisibleWall.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleWall.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/InvisibleWall.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleWall.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/Lava.prefab b/Project_Blind/Assets/Resources/Prefabs/Obstacles/Lava.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/Lava.prefab rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/Lava.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/Lava.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Obstacles/Lava.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/Lava.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/Lava.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/PressFloor1.prefab b/Project_Blind/Assets/Resources/Prefabs/Obstacles/PressFloor1.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/PressFloor1.prefab rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/PressFloor1.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/PressFloor1.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Obstacles/PressFloor1.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/PressFloor1.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/PressFloor1.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/Player 1.prefab b/Project_Blind/Assets/Resources/Prefabs/Player 1.prefab deleted file mode 100644 index 3a7d1ac2..00000000 --- a/Project_Blind/Assets/Resources/Prefabs/Player 1.prefab +++ /dev/null @@ -1,339 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &8550561745348708040 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8550561746097087466} - - component: {fileID: 8550561745348708037} - - component: {fileID: 8550561745348708036} - - component: {fileID: 8550561745348708039} - - component: {fileID: 8550561746097087470} - - component: {fileID: 8550561745348708041} - - component: {fileID: 8550561745348708034} - - component: {fileID: 8550561745348708035} - - component: {fileID: 8550561745348708032} - m_Layer: 3 - m_Name: Player 1 - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8550561746097087466 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8550561745348708040} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -28.459642, y: -10.74, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8550561745554492956} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8550561745348708037 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8550561745348708040} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 0dac2ab13d2eefe4e8d7bdf0bbf2c22c, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: a0406d281e9797149a7e3b65f868e9b7, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 2} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!50 &8550561745348708036 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8550561745348708040} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: 33e71d9d71a4b09498708826b6610611, type: 2} - m_Interpolate: 2 - m_SleepingMode: 0 - m_CollisionDetection: 1 - m_Constraints: 4 ---- !u!70 &8550561745348708039 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8550561745348708040} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_Size: {x: 1.48, y: 3.38} - m_Direction: 0 ---- !u!114 &8550561746097087470 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8550561745348708040} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eca3a64169bd4dd4bb08e07908ae7a53, type: 3} - m_Name: - m_EditorClassIdentifier: - _hp: 10 - maxhp: 10 - _jumpSpeed: 0.5 - _jumpAbortSpeedReduction: 1 - _gravity: 1 - _maxSpeed: 2 - groundAcceleration: 15 - groundDeceleration: 15 - _dashSpeed: 0 - _defaultTime: 0 - _attackMove: 0.2 - _maxComboDelay: 0.9 - _hurtMove: 0.2 - _lastClickTime: 0 - _clickcount: 0 - attack_x: 1 - attack_y: 3 - paring_x: 2 - paring_y: 2 - _spawnPoint: {fileID: 0} ---- !u!95 &8550561745348708041 -Animator: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8550561745348708040} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 269cb10eaf7e55c438dc685ff581a34b, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &8550561745348708034 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8550561745348708040} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0f23621e48da409db8fdfcff3674cc4f, type: 3} - m_Name: - m_EditorClassIdentifier: - groundedLayerMask: - serializedVersion: 2 - m_Bits: 64 - groundedRaycastDistance: 0.1 ---- !u!114 &8550561745348708035 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8550561745348708040} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 06df7acbb0a84e6580986521c086d75c, type: 3} - m_Name: - m_EditorClassIdentifier: - hitLayer: - serializedVersion: 2 - m_Bits: 8 ---- !u!114 &8550561745348708032 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8550561745348708040} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 737126f82bed49b8be3f8d02d81cd330, type: 3} - m_Name: - m_EditorClassIdentifier: - _hitLayer: - serializedVersion: 2 - m_Bits: 8 ---- !u!1 &8550561745554492959 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8550561745554492956} - - component: {fileID: 8550561745554492957} - m_Layer: 0 - m_Name: PlayerSight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8550561745554492956 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8550561745554492959} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.014151897} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8550561746097087466} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8550561745554492957 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8550561745554492959} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ComponentVersion: 1 - m_LightType: 3 - m_BlendStyleIndex: 0 - m_FalloffIntensity: 1 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1 - m_LightVolumeIntensity: 1 - m_LightVolumeIntensityEnabled: 0 - m_ApplyToSortingLayers: 8d33c247ab75ae9600000000 - m_LightCookieSprite: {fileID: 0} - m_DeprecatedPointLightCookieSprite: {fileID: 0} - m_LightOrder: 0 - m_OverlapOperation: 0 - m_NormalMapDistance: 3 - m_NormalMapQuality: 2 - m_UseNormalMap: 0 - m_ShadowIntensityEnabled: 1 - m_ShadowIntensity: 1 - m_ShadowVolumeIntensityEnabled: 1 - m_ShadowVolumeIntensity: 1 - m_Vertices: - - position: {x: 0.9985302, y: 0.9985302, z: 0} - color: {r: 0.70710677, g: 0.70710677, b: 0, a: 0} - uv: {x: 0, y: 0} - - position: {x: 0.9985302, y: 0.9985302, z: 0} - color: {r: 0, g: 0, b: 0, a: 1} - uv: {x: 0, y: 0} - - position: {x: -0.9985302, y: 0.9985302, z: 0} - color: {r: -0.70710677, g: 0.70710677, b: 0, a: 0} - uv: {x: 0, y: 0} - - position: {x: -0.9985302, y: 0.9985302, z: 0} - color: {r: 0, g: 0, b: 0, a: 1} - uv: {x: 0, y: 0} - - position: {x: -0.99853003, y: -0.9985304, z: 0} - color: {r: -0.70710665, g: -0.7071069, b: 0, a: 0} - uv: {x: 0, y: 0} - - position: {x: -0.99853003, y: -0.9985304, z: 0} - color: {r: 0, g: 0, b: 0, a: 1} - uv: {x: 0, y: 0} - - position: {x: 0.99853003, y: -0.9985304, z: 0} - color: {r: 0.70710665, g: -0.7071069, b: 0, a: 0} - uv: {x: 0, y: 0} - - position: {x: 0.99853003, y: -0.9985304, z: 0} - color: {r: 0, g: 0, b: 0, a: 1} - uv: {x: 0, y: 0} - - position: {x: 0, y: 0, z: 0} - color: {r: 0, g: 0, b: 0, a: 1} - uv: {x: 0, y: 0} - m_Triangles: 030001000800020000000100030002000100050003000800040002000300050004000300070005000800060004000500070006000500010007000800000006000700010000000700 - m_LocalBounds: - m_Center: {x: 0, y: -0.00000011920929, z: 0} - m_Extent: {x: 0.9985302, y: 0.99853027, z: 0} - m_PointLightInnerAngle: 360 - m_PointLightOuterAngle: 360 - m_PointLightInnerRadius: 3 - m_PointLightOuterRadius: 15 - m_ShapeLightParametricSides: 5 - m_ShapeLightParametricAngleOffset: 0 - m_ShapeLightParametricRadius: 1 - m_ShapeLightFalloffSize: 0.5 - m_ShapeLightFalloffOffset: {x: 0, y: 0} - m_ShapePath: - - {x: -0.5, y: -0.5, z: 0} - - {x: 0.5, y: -0.5, z: 0} - - {x: 0.5, y: 0.5, z: 0} - - {x: -0.5, y: 0.5, z: 0} diff --git a/Project_Blind/Assets/Resources/Prefabs/SceneFader.prefab b/Project_Blind/Assets/Resources/Prefabs/SceneControl/SceneFader.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/SceneFader.prefab rename to Project_Blind/Assets/Resources/Prefabs/SceneControl/SceneFader.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/SceneFader.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/SceneControl/SceneFader.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/SceneFader.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/SceneControl/SceneFader.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/ChatBox.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test.meta similarity index 57% rename from Project_Blind/Assets/Resources/Prefabs/ChatBox.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Test.meta index 88247b8e..f007a2fb 100644 --- a/Project_Blind/Assets/Resources/Prefabs/ChatBox.prefab.meta +++ b/Project_Blind/Assets/Resources/Prefabs/Test.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: 3abb6f92851fc434390efe956464b2f1 -PrefabImporter: +guid: 9e99eb142b688472facba88be294bbc9 +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh.meta rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Camera.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Camera.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Camera.prefab rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Camera.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Camera.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Camera.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Camera.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Camera.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Ground.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Ground.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Ground.prefab rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Ground.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Ground.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Ground.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Ground.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Ground.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Player.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Player.prefab rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Player.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Player.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Player1.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player1.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Player1.prefab rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player1.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Player1.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player1.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Player1.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player1.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Player11.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player11.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Player11.prefab rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player11.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Player11.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player11.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Player11.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player11.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/TestNPC.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestNPC.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/TestNPC.prefab rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestNPC.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/TestNPC.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestNPC.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/TestNPC.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestNPC.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/TestObject.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestObject.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/TestObject.prefab rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestObject.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/TestObject.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestObject.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/TestObject.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestObject.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/abc.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/abc.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/abc.prefab rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/abc.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/abc.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/abc.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/abc.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/abc.prefab.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/TestPooling.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestPooling.prefab similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestPooling.prefab rename to Project_Blind/Assets/Resources/Prefabs/Test/TestPooling.prefab diff --git a/Project_Blind/Assets/Resources/Prefabs/TestPooling.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestPooling.prefab.meta similarity index 100% rename from Project_Blind/Assets/Resources/Prefabs/TestPooling.prefab.meta rename to Project_Blind/Assets/Resources/Prefabs/Test/TestPooling.prefab.meta diff --git "a/Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png" "b/Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png" deleted file mode 100644 index 09b9bb66808fa7b22a33fb76949a6d82875242e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43486 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 iRCZnMbKo5?@c#ilLe*FdRrZnq0000 Date: Sun, 7 Aug 2022 18:22:03 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feature=20:=20GlowStone.cs=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/MapObjects/GlowStone.prefab | 117 ++++++++++++++++++ .../Assets/Resources/Prefabs/Player.prefab | 33 ++--- .../Assets/Scenes/TestFogOfWar.unity | 102 ++++++++++++++- .../Core/MonoBehaviour/PlayerCharacter.cs | 2 +- .../Assets/Scripts/MapObjects/GlowStone.cs | 53 ++++++++ .../Scripts/MapObjects/GlowStone.cs.meta | 3 + .../RiderScriptEditorPersistedState.asset | 2 +- .../ProjectSettings/TagManager.asset | 3 + 8 files changed, 282 insertions(+), 33 deletions(-) create mode 100644 Project_Blind/Assets/Scripts/MapObjects/GlowStone.cs create mode 100644 Project_Blind/Assets/Scripts/MapObjects/GlowStone.cs.meta diff --git a/Project_Blind/Assets/Resources/Prefabs/MapObjects/GlowStone.prefab b/Project_Blind/Assets/Resources/Prefabs/MapObjects/GlowStone.prefab index f5d7c3d2..e8ffe3da 100644 --- a/Project_Blind/Assets/Resources/Prefabs/MapObjects/GlowStone.prefab +++ b/Project_Blind/Assets/Resources/Prefabs/MapObjects/GlowStone.prefab @@ -10,6 +10,8 @@ GameObject: m_Component: - component: {fileID: 1448363533951301525} - component: {fileID: 9036080960493351390} + - component: {fileID: 224706432803308441} + - component: {fileID: 1897438289237159185} m_Layer: 0 m_Name: GlowStone m_TagString: Untagged @@ -84,3 +86,118 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &224706432803308441 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 911246595514713373} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ComponentVersion: 1 + m_LightType: 3 + m_BlendStyleIndex: 0 + m_FalloffIntensity: 0.5 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 0.5 + m_LightVolumeIntensity: 1 + m_LightVolumeIntensityEnabled: 0 + m_ApplyToSortingLayers: 000000008d33c247 + m_LightCookieSprite: {fileID: 0} + m_DeprecatedPointLightCookieSprite: {fileID: 0} + m_LightOrder: 0 + m_OverlapOperation: 0 + m_NormalMapDistance: 3 + m_NormalMapQuality: 2 + m_UseNormalMap: 0 + m_ShadowIntensityEnabled: 0 + m_ShadowIntensity: 0.75 + m_ShadowVolumeIntensityEnabled: 0 + m_ShadowVolumeIntensity: 0.75 + m_Vertices: + - position: {x: 0.9985302, y: 0.9985302, z: 0} + color: {r: 0.70710677, g: 0.70710677, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: 0.9985302, y: 0.9985302, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: -0.9985302, y: 0.9985302, z: 0} + color: {r: -0.70710677, g: 0.70710677, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: -0.9985302, y: 0.9985302, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: -0.99853003, y: -0.9985304, z: 0} + color: {r: -0.70710665, g: -0.7071069, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: -0.99853003, y: -0.9985304, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: 0.99853003, y: -0.9985304, z: 0} + color: {r: 0.70710665, g: -0.7071069, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: 0.99853003, y: -0.9985304, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: 0, y: 0, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + m_Triangles: 030001000800020000000100030002000100050003000800040002000300050004000300070005000800060004000500070006000500010007000800000006000700010000000700 + m_LocalBounds: + m_Center: {x: 0, y: -0.00000011920929, z: 0} + m_Extent: {x: 0.9985302, y: 0.99853027, z: 0} + m_PointLightInnerAngle: 360 + m_PointLightOuterAngle: 360 + m_PointLightInnerRadius: 0 + m_PointLightOuterRadius: 30 + m_ShapeLightParametricSides: 5 + m_ShapeLightParametricAngleOffset: 0 + m_ShapeLightParametricRadius: 1 + m_ShapeLightFalloffSize: 0.5 + m_ShapeLightFalloffOffset: {x: 0, y: 0} + m_ShapePath: + - {x: -0.5, y: -0.5, z: 0} + - {x: 0.5, y: -0.5, z: 0} + - {x: 0.5, y: 0.5, z: 0} + - {x: -0.5, y: 0.5, z: 0} +--- !u!114 &1897438289237159185 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 911246595514713373} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99d5497b6a014098837f0ec2edfe797c, type: 3} + m_Name: + m_EditorClassIdentifier: + spreadAnimation: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 2 + outSlope: 2 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + maxSize: 30 diff --git a/Project_Blind/Assets/Resources/Prefabs/Player.prefab b/Project_Blind/Assets/Resources/Prefabs/Player.prefab index 5512a12f..98e4cf89 100644 --- a/Project_Blind/Assets/Resources/Prefabs/Player.prefab +++ b/Project_Blind/Assets/Resources/Prefabs/Player.prefab @@ -48,7 +48,7 @@ MonoBehaviour: m_LightType: 3 m_BlendStyleIndex: 0 m_FalloffIntensity: 0.671 - m_Color: {r: 0.7311321, g: 0.87347394, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 0.8 m_LightVolumeIntensity: 1 m_LightVolumeIntensityEnabled: 0 @@ -251,6 +251,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eca3a64169bd4dd4bb08e07908ae7a53, type: 3} m_Name: m_EditorClassIdentifier: + _moveVector: {x: 0, y: 0} _hp: 10 maxhp: 10 _jumpSpeed: 0.7 @@ -259,43 +260,25 @@ MonoBehaviour: _maxSpeed: 4 groundAcceleration: 15 groundDeceleration: 15 + airborneAccelProportion: 0 + airborneDecelProportion: 0 _dashSpeed: 10 _defaultTime: 0.2 _attackMove: 0.2 _maxComboDelay: 0.9 _hurtMove: 1 + _isHurtCheck: 0 _lastClickTime: 0 _clickcount: 0 + _isPowerAttackCheck: 0 attack_x: 0 attack_y: 0 paring_x: 0 paring_y: 0 - waveSenseSpeed: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 3.1389365 - outSlope: 3.1389365 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0.045833334 - - serializedVersion: 3 - time: 1.0083313 - value: 1 - inSlope: -0.0065817204 - outSlope: -0.0065817204 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.3553706 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 _spawnPoint: {fileID: 0} + isJump: 0 _enemyObject: {fileID: 0} + isOnLava: 0 --- !u!95 &7138595048606892266 Animator: serializedVersion: 4 diff --git a/Project_Blind/Assets/Scenes/TestFogOfWar.unity b/Project_Blind/Assets/Scenes/TestFogOfWar.unity index f10b2b43..e49912c6 100644 --- a/Project_Blind/Assets/Scenes/TestFogOfWar.unity +++ b/Project_Blind/Assets/Scenes/TestFogOfWar.unity @@ -320,7 +320,12 @@ Mesh: offset: 0 size: 0 path: ---- !u!43 &208802976 +--- !u!4 &245413791 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4130092069143574499, guid: e54e058b2ec3b445ab3333a4f138091f, type: 3} + m_PrefabInstance: {fileID: 500005463} + m_PrefabAsset: {fileID: 0} +--- !u!43 &317412724 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -484,11 +489,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!4 &245413791 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4130092069143574499, guid: e54e058b2ec3b445ab3333a4f138091f, type: 3} - m_PrefabInstance: {fileID: 500005463} - m_PrefabAsset: {fileID: 0} --- !u!1 &346694932 GameObject: m_ObjectHideFlags: 0 @@ -903,6 +903,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: af8dd1155cb0b45f0af7c1df1ff6fd14, type: 3} m_Name: m_EditorClassIdentifier: + isLoading: 0 --- !u!4 &1188891547 Transform: m_ObjectHideFlags: 0 @@ -1326,6 +1327,95 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 180f18d4673dfac489e26a16a65b4b79, type: 3} +--- !u!1001 &1995924023 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 224706432803308441, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_Intensity + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 224706432803308441, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_OverlapOperation + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224706432803308441, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_PointLightOuterRadius + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224706432803308441, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_ApplyToSortingLayers.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 224706432803308441, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_ApplyToSortingLayers.Array.data[2] + value: -1766951509 + objectReference: {fileID: 0} + - target: {fileID: 224706432803308441, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_ApplyToSortingLayers.Array.data[3] + value: -1173912585 + objectReference: {fileID: 0} + - target: {fileID: 911246595514713373, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_Name + value: GlowStone + objectReference: {fileID: 0} + - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_LocalPosition.x + value: -25.02 + objectReference: {fileID: 0} + - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_LocalPosition.y + value: -1.78 + objectReference: {fileID: 0} + - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_LocalPosition.z + value: 5.9763207 + objectReference: {fileID: 0} + - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9036080960493351390, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 9036080960493351390, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} + propertyPath: m_SortingLayerID + value: -1173912585 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3} --- !u!1001 &1534490255329974231 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs index 737f14c7..73f2ee7b 100644 --- a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs +++ b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs @@ -75,7 +75,7 @@ private void Awake() //_defaultTime = 0.2f; _dashCount = 1; - ResourceManager.Instance.Destroy(ResourceManager.Instance.Instantiate("WaveSense").gameObject); + ResourceManager.Instance.Destroy(ResourceManager.Instance.Instantiate("MapObjects/Wave/WaveSense").gameObject); _attack.Init(attack_x, attack_y); _paring.Init(paring_x, paring_y); diff --git a/Project_Blind/Assets/Scripts/MapObjects/GlowStone.cs b/Project_Blind/Assets/Scripts/MapObjects/GlowStone.cs new file mode 100644 index 00000000..a4b88eda --- /dev/null +++ b/Project_Blind/Assets/Scripts/MapObjects/GlowStone.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections; +using UnityEngine; +using UnityEngine.Rendering.Universal; + +namespace Blind +{ + [RequireComponent(typeof(Light2D))] + public class GlowStone : MonoBehaviour + { + [SerializeField] private AnimationCurve spreadAnimation; + [SerializeField] private float maxSize = 30f; + + private Light2D _light2D; + private bool _isBright = false; + + private void Awake() + { + _light2D = GetComponent(); + } + + /// + /// 테스트 + /// + private void Start() + { + Bright(); + } + + /// + /// 이 함수 호출하면 켜집니다. + /// + public void Bright() + { + if (_isBright) return; + StartCoroutine(_Bright()); + _isBright = true; + } + + public IEnumerator _Bright() + { + var curTime = 0f; + var radius = 0f; + while (radius < maxSize) + { + curTime += Time.deltaTime; + radius += spreadAnimation.Evaluate(curTime) * maxSize; + _light2D.pointLightOuterRadius = radius; + yield return null; + } + } + } +} \ No newline at end of file diff --git a/Project_Blind/Assets/Scripts/MapObjects/GlowStone.cs.meta b/Project_Blind/Assets/Scripts/MapObjects/GlowStone.cs.meta new file mode 100644 index 00000000..dded6fdc --- /dev/null +++ b/Project_Blind/Assets/Scripts/MapObjects/GlowStone.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 99d5497b6a014098837f0ec2edfe797c +timeCreated: 1659862528 \ No newline at end of file diff --git a/Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset b/Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset index e6bf04e1..257d6284 100644 --- a/Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset +++ b/Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 0} m_Name: m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState - lastWriteTicks: -8585417451134089131 + lastWriteTicks: -8585417436895168888 diff --git a/Project_Blind/ProjectSettings/TagManager.asset b/Project_Blind/ProjectSettings/TagManager.asset index 9670489d..cee1cc2c 100644 --- a/Project_Blind/ProjectSettings/TagManager.asset +++ b/Project_Blind/ProjectSettings/TagManager.asset @@ -54,3 +54,6 @@ TagManager: - name: Secondary uniqueID: 3105953885 locked: 0 + - name: MapObjects + uniqueID: 3121054711 + locked: 0