diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index a1b0c82d2..66c8c0361 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -54,4 +54,6 @@ messageinfo 엄청 느린 버그 - 맵 벽과 플레이 사이 더 멀게 만들자 - 결과 화면 (보상 지급) - 랭킹 (플레이팹 v2 연결) - - 몬스터 생성 (한 층당 몇 마리? 6스테이지마다 보스는 한 마리만?) \ No newline at end of file + - 포탈 타면 레벨 하나 증가시키고 다음 맵 시작 + - 몬스터 다 잡으면 시간 멈추고 포탈 나오게 + - 몬스터 스탯 설정 : (lv - 1) * 0.5 \ No newline at end of file diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 5cd2f88b0..28a6a2988 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Res_Addr/Map/Map_Maze.prefab b/Assets/Res_Addr/Map/Map_Maze.prefab index b1d24bf86..b41dead38 100644 --- a/Assets/Res_Addr/Map/Map_Maze.prefab +++ b/Assets/Res_Addr/Map/Map_Maze.prefab @@ -1,215 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &465025944258865131 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7591854783132378543} - - component: {fileID: 644863307661599112} - - component: {fileID: 5280593395979018988} - - component: {fileID: 5973906635127486875} - m_Layer: 0 - m_Name: Cube (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 1 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &7591854783132378543 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 465025944258865131} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 2.54, y: -0, z: 8.22} - m_LocalScale: {x: 40, y: 1, z: 3.5691} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3691145492854616723} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &644863307661599112 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 465025944258865131} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &5280593395979018988 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 465025944258865131} - m_Enabled: 0 - 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: 31321ba15b8f8eb4c954353edc038b1d, 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!65 &5973906635127486875 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 465025944258865131} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &531565165262778941 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7861462519998928664} - - component: {fileID: 1408570869480391592} - - component: {fileID: 998459047496357378} - - component: {fileID: 4812164828209786712} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 1 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &7861462519998928664 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 531565165262778941} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 12.1117, y: -0, z: 1.82} - m_LocalScale: {x: 40, y: 1, z: 3.5691} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3691145492854616723} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1408570869480391592 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 531565165262778941} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &998459047496357378 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 531565165262778941} - m_Enabled: 0 - 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: 31321ba15b8f8eb4c954353edc038b1d, 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!65 &4812164828209786712 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 531565165262778941} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &706421899314511698 GameObject: m_ObjectHideFlags: 0 @@ -303,7 +93,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4988936019660043266 Transform: m_ObjectHideFlags: 0 @@ -321,7 +111,6 @@ Transform: - {fileID: 6555616689825029791} - {fileID: 630869251389221852} - {fileID: 3962944034239099410} - - {fileID: 3691145492854616723} - {fileID: 8331479131730070895} - {fileID: 761360875246530843} - {fileID: 2625221555836016773} @@ -515,6 +304,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4251127085924737396} - {fileID: 9130835170938100205} - {fileID: 4988936019660043266} m_Father: {fileID: 0} @@ -546,111 +336,6 @@ MonoBehaviour: go_mazeNextPortal: {fileID: 2623192537447389001} tf_Farmer: {fileID: 0} tf_Obj: [] ---- !u!1 &1995117903308348714 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5880098288280226379} - - component: {fileID: 3337458234953981560} - - component: {fileID: 56879418779631815} - - component: {fileID: 709211517447827138} - m_Layer: 0 - m_Name: Cube (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 1 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &5880098288280226379 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1995117903308348714} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 12.1117, y: -0, z: 27.5} - m_LocalScale: {x: 40, y: 1, z: 3.5691} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3691145492854616723} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3337458234953981560 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1995117903308348714} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &56879418779631815 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1995117903308348714} - m_Enabled: 0 - 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: 31321ba15b8f8eb4c954353edc038b1d, 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!65 &709211517447827138 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1995117903308348714} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &2026512888517965464 GameObject: m_ObjectHideFlags: 0 @@ -691,41 +376,6 @@ Transform: - {fileID: 1320991024344498113} m_Father: {fileID: 4988936019660043266} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2421158562457527743 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3691145492854616723} - m_Layer: 0 - m_Name: Collider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3691145492854616723 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2421158562457527743} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7861462519998928664} - - {fileID: 7591854783132378543} - - {fileID: 690943275468773943} - - {fileID: 5880098288280226379} - m_Father: {fileID: 4988936019660043266} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4452572112839337098 GameObject: m_ObjectHideFlags: 0 @@ -790,7 +440,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5138613290573964605} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -799,7 +449,7 @@ Transform: - {fileID: 7184490766455500942} - {fileID: 761510286721887316} - {fileID: 3177058509125438875} - m_Father: {fileID: 9130835170938100205} + m_Father: {fileID: 3035956310856022296} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5193090642220991377 GameObject: @@ -860,8 +510,8 @@ Transform: m_GameObject: {fileID: 6147560343883306433} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 2.54, y: -0, z: 8.22} - m_LocalScale: {x: 40, y: 1, z: 3.5691} + m_LocalPosition: {x: 1.9042, y: -0, z: 10.4451} + m_LocalScale: {x: 44.452, y: 1, z: 4.8407702} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4251127085924737396} @@ -1135,7 +785,6 @@ Transform: - {fileID: 4202392274350861204} - {fileID: 5542967222568295125} - {fileID: 5581060199773747455} - - {fileID: 4251127085924737396} - {fileID: 5876604976370247127} - {fileID: 5217492170931712895} - {fileID: 7371856180987711723} @@ -1169,8 +818,8 @@ Transform: m_GameObject: {fileID: 7538028171118542837} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 27.51, y: -0, z: 8.22} - m_LocalScale: {x: 40, y: 1, z: 3.5691} + m_LocalPosition: {x: 28.5545, y: -0, z: 10.3089} + m_LocalScale: {x: 44.176003, y: 1, z: 5.658094} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4251127085924737396} @@ -1274,8 +923,8 @@ Transform: m_GameObject: {fileID: 7795438435949600641} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 12.1117, y: -0, z: 1.82} - m_LocalScale: {x: 40, y: 1, z: 3.5691} + m_LocalPosition: {x: 13.247, y: -0, z: 2.1379} + m_LocalScale: {x: 42.272, y: 1, z: 4.2047567} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4251127085924737396} @@ -1429,8 +1078,8 @@ Transform: m_GameObject: {fileID: 8130345467127229947} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 12.1117, y: -0, z: 27.5} - m_LocalScale: {x: 40, y: 1, z: 3.5691} + m_LocalPosition: {x: 13.1107, y: -0, z: 28.4082} + m_LocalScale: {x: 42, y: 1, z: 5.385415} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4251127085924737396} @@ -1506,111 +1155,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &8511948948393170258 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 690943275468773943} - - component: {fileID: 8985680454902517890} - - component: {fileID: 5170573862106724389} - - component: {fileID: 4611460117378270070} - m_Layer: 0 - m_Name: Cube (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 1 - m_StaticEditorFlags: 8 - m_IsActive: 1 ---- !u!4 &690943275468773943 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8511948948393170258} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 27.51, y: -0, z: 8.22} - m_LocalScale: {x: 40, y: 1, z: 3.5691} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3691145492854616723} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8985680454902517890 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8511948948393170258} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &5170573862106724389 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8511948948393170258} - m_Enabled: 0 - 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: 31321ba15b8f8eb4c954353edc038b1d, 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!65 &4611460117378270070 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8511948948393170258} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &287818275774742511 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Map_Maze/NavMesh.asset b/Assets/Scenes/Map_Maze/NavMesh.asset index a9c39369e..551846a28 100644 Binary files a/Assets/Scenes/Map_Maze/NavMesh.asset and b/Assets/Scenes/Map_Maze/NavMesh.asset differ diff --git a/Assets/Script/Character/Actor.cs b/Assets/Script/Character/Actor.cs index 6ddeef709..2490b2451 100644 --- a/Assets/Script/Character/Actor.cs +++ b/Assets/Script/Character/Actor.cs @@ -1725,6 +1725,8 @@ public class Actor : MyCoroutine public virtual void Set_JoystickStatus(int status) { } public void Set_Warp(Vector3 _pos) { + if (IsDead()) return; + if (m_BoxCollider) m_BoxCollider.enabled = true; m_NavMeshAgent.enabled = true; // 사망 시 off 됨. 다시 세팅될 때 켜줌 m_NavMeshAgent.Warp(_pos); diff --git a/Assets/Script/Character/Mob/MobActor.cs b/Assets/Script/Character/Mob/MobActor.cs index 2779e0d41..c6d02605d 100644 --- a/Assets/Script/Character/Mob/MobActor.cs +++ b/Assets/Script/Character/Mob/MobActor.cs @@ -341,8 +341,6 @@ public class MobActor : Actor if (SceneManager.GetActiveScene().name == "StatTest") return; #endif - m_BoxCollider.enabled = false; - var sdata = ServerInfo.Ins.m_ServerData; m_actDie?.Invoke(m_MonsterTableData.n_MonsterID); sdata.Add_CollectionMobKill(m_MonsterTableData.n_MonsterID); diff --git a/Assets/Script/Info/DungeonInfo.cs b/Assets/Script/Info/DungeonInfo.cs index cbd0c6d37..2c52a34ed 100644 --- a/Assets/Script/Info/DungeonInfo.cs +++ b/Assets/Script/Info/DungeonInfo.cs @@ -57,6 +57,9 @@ public class DungeonInfo : MonoBehaviourSingletonTemplate public void Start_Dungeon() { + m_DieCount = 0; + m_DieCount.RandomizeCryptoKey(); + m_Dungeon = MyValue.MyChoiceMapData.Get_MapData().e_Dungeon; switch (m_Dungeon) { @@ -70,8 +73,6 @@ public class DungeonInfo : MonoBehaviourSingletonTemplate } IEnumerator Co_Update_Mimic() { - m_DieCount = 0; - m_DieCount.RandomizeCryptoKey(); yield return new WaitForSeconds(1f); StartCoroutine(Co_Update_Time()); @@ -100,8 +101,19 @@ public class DungeonInfo : MonoBehaviourSingletonTemplate var dgData = MyValue.MyChoiceMapData.Get_DungeonMapData_orNull(); for (int i = 0; i < dgData.n_MobCount; i++) { - //var mobid = table_monsterlist.Ins.Get_Data_orNull + var mobData = table_monsterlist.Ins.Get_RandomData(eSubRol.None); + AddrResourceMgr.Ins.LoadObject(mobData.s_MonsterPrefab, handle => + { + var mob = DSUtil.Get_Clone(handle.Result); + ActorInfo.Ins.Add_Actor(mob, eRole.Mob, dgData.n_SpawnID, mobData.s_MonsterPrefab); + mob.Set(true, null, null, dgData.n_SpawnID, false); + var rdnpos = DSUtil.Get_RandomPos_onNavMesh(MyValue.MyPC.Get_position(), 10f, 20f); + mob.Set(mobData, rdnpos, Set_MobDie, 0); + mob.m_SubRole = eSubRol.Mimic; + }); } - yield return null; + + yield return new WaitForSeconds(1f); + StartCoroutine(Co_Update_Time()); } } \ No newline at end of file