diff --git a/Assets/GameMain/DataTables/tbentityconfig.bytes b/Assets/GameMain/DataTables/tbentityconfig.bytes index 287e4c8..dcccc79 100644 --- a/Assets/GameMain/DataTables/tbentityconfig.bytes +++ b/Assets/GameMain/DataTables/tbentityconfig.bytes @@ -1,4 +1,3 @@ - FollowCameraFollowCamera.prefabPlayer Player.prefab + FollowCameraFollowCamera.prefabPlayer Player.prefab MeleeEnemyMeleeEnemy.prefab RemoteEnemyRemoteEnemy.prefab WeaponKnifeWeaponKnife.prefab WeaponHandgunWeaponHandgun.prefab WeaponSlashWeaponSlash.prefabWeaponLightningWeaponLightning.prefab WeaponLanceWeaponLance.prefab -DropEntityDropEntity.prefab -ProjectileProjectile.prefab \ No newline at end of file +ProjectileProjectile.prefab DropEntity01Drop/DropEntity01.prefab DropEntity02Drop/DropEntity02.prefab DropEntity03Drop/DropEntity03.prefab \ No newline at end of file diff --git a/Assets/GameMain/Entities/Drop.meta b/Assets/GameMain/Entities/Drop.meta new file mode 100644 index 0000000..3786662 --- /dev/null +++ b/Assets/GameMain/Entities/Drop.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 04562a88c52cd2f449a6f5f52a1afb13 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Entities/Drop/DropEntity01.prefab b/Assets/GameMain/Entities/Drop/DropEntity01.prefab new file mode 100644 index 0000000..8346a54 --- /dev/null +++ b/Assets/GameMain/Entities/Drop/DropEntity01.prefab @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1008105315272539365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1936384946241160746} + - component: {fileID: 628759564136564965} + - component: {fileID: 3413110330421916486} + m_Layer: 13 + m_Name: DropEntity01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1936384946241160746 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008105315272539365} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &628759564136564965 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008105315272539365} + m_Mesh: {fileID: -2437261350238378569, guid: b0df1c310a0f037418a05a052bb085bb, type: 3} +--- !u!23 &3413110330421916486 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008105315272539365} + 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: 4cbf218826364797b5f9e4bd8ff5b674, 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} diff --git a/Assets/GameMain/Entities/DropEntity.prefab.meta b/Assets/GameMain/Entities/Drop/DropEntity01.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/DropEntity.prefab.meta rename to Assets/GameMain/Entities/Drop/DropEntity01.prefab.meta diff --git a/Assets/GameMain/Entities/Drop/DropEntity02.prefab b/Assets/GameMain/Entities/Drop/DropEntity02.prefab new file mode 100644 index 0000000..0eb9a4b --- /dev/null +++ b/Assets/GameMain/Entities/Drop/DropEntity02.prefab @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1008105315272539365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1936384946241160746} + - component: {fileID: 628759564136564965} + - component: {fileID: 3413110330421916486} + m_Layer: 13 + m_Name: DropEntity02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1936384946241160746 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008105315272539365} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &628759564136564965 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008105315272539365} + m_Mesh: {fileID: 306618357957470380, guid: 716b72b19369a9948b5d72eddab06c30, type: 3} +--- !u!23 &3413110330421916486 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008105315272539365} + 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: 4cbf218826364797b5f9e4bd8ff5b674, 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} diff --git a/Assets/GameMain/Entities/Drop/DropEntity02.prefab.meta b/Assets/GameMain/Entities/Drop/DropEntity02.prefab.meta new file mode 100644 index 0000000..c4b1011 --- /dev/null +++ b/Assets/GameMain/Entities/Drop/DropEntity02.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8c3c1389c3a6f76468cc3539ba3319d4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Entities/Drop/DropEntity03.prefab b/Assets/GameMain/Entities/Drop/DropEntity03.prefab new file mode 100644 index 0000000..2841f29 --- /dev/null +++ b/Assets/GameMain/Entities/Drop/DropEntity03.prefab @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1008105315272539365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1936384946241160746} + - component: {fileID: 628759564136564965} + - component: {fileID: 3413110330421916486} + m_Layer: 13 + m_Name: DropEntity03 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1936384946241160746 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008105315272539365} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &628759564136564965 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008105315272539365} + m_Mesh: {fileID: -1072659629790535479, guid: 395ec7c091a772848a2b259af5f78ca3, type: 3} +--- !u!23 &3413110330421916486 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008105315272539365} + 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: 4cbf218826364797b5f9e4bd8ff5b674, 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} diff --git a/Assets/GameMain/Entities/Drop/DropEntity03.prefab.meta b/Assets/GameMain/Entities/Drop/DropEntity03.prefab.meta new file mode 100644 index 0000000..5a3c4eb --- /dev/null +++ b/Assets/GameMain/Entities/Drop/DropEntity03.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 63f13262ef86e934a8b333528fc2219d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Entities/DropEntity.prefab b/Assets/GameMain/Entities/DropEntity.prefab deleted file mode 100644 index f31d8e4..0000000 --- a/Assets/GameMain/Entities/DropEntity.prefab +++ /dev/null @@ -1,189 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1008105315272539365 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1936384946241160746} - - component: {fileID: 329236603994037521} - - component: {fileID: 972481648254179963} - - component: {fileID: 1416665683957493982} - - component: {fileID: 8311088257134752687} - m_Layer: 13 - m_Name: DropEntity - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1936384946241160746 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1008105315272539365} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 3234774818843687234} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &329236603994037521 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1008105315272539365} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &972481648254179963 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1008105315272539365} - 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: 2257393dd6ed51a49a6c3fd178382b59, 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!54 &1416665683957493982 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1008105315272539365} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!135 &8311088257134752687 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1008105315272539365} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &8058217899104858011 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3234774818843687234} - - component: {fileID: 5442478298252225551} - m_Layer: 13 - m_Name: Board - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3234774818843687234 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8058217899104858011} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1936384946241160746} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &5442478298252225551 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8058217899104858011} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 1 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 128 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/GameMain/Entities/Monsters.meta b/Assets/GameMain/Entities/Monster.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters.meta rename to Assets/GameMain/Entities/Monster.meta diff --git a/Assets/GameMain/Entities/Monsters/Alien.prefab b/Assets/GameMain/Entities/Monster/Alien.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Alien.prefab rename to Assets/GameMain/Entities/Monster/Alien.prefab diff --git a/Assets/GameMain/Entities/Monsters/Alien.prefab.meta b/Assets/GameMain/Entities/Monster/Alien.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Alien.prefab.meta rename to Assets/GameMain/Entities/Monster/Alien.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Alien_Tall.prefab b/Assets/GameMain/Entities/Monster/Alien_Tall.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Alien_Tall.prefab rename to Assets/GameMain/Entities/Monster/Alien_Tall.prefab diff --git a/Assets/GameMain/Entities/Monsters/Alien_Tall.prefab.meta b/Assets/GameMain/Entities/Monster/Alien_Tall.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Alien_Tall.prefab.meta rename to Assets/GameMain/Entities/Monster/Alien_Tall.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Bat.prefab b/Assets/GameMain/Entities/Monster/Bat.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Bat.prefab rename to Assets/GameMain/Entities/Monster/Bat.prefab diff --git a/Assets/GameMain/Entities/Monsters/Bat.prefab.meta b/Assets/GameMain/Entities/Monster/Bat.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Bat.prefab.meta rename to Assets/GameMain/Entities/Monster/Bat.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Bee.prefab b/Assets/GameMain/Entities/Monster/Bee.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Bee.prefab rename to Assets/GameMain/Entities/Monster/Bee.prefab diff --git a/Assets/GameMain/Entities/Monsters/Bee.prefab.meta b/Assets/GameMain/Entities/Monster/Bee.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Bee.prefab.meta rename to Assets/GameMain/Entities/Monster/Bee.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Cactus.prefab b/Assets/GameMain/Entities/Monster/Cactus.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Cactus.prefab rename to Assets/GameMain/Entities/Monster/Cactus.prefab diff --git a/Assets/GameMain/Entities/Monsters/Cactus.prefab.meta b/Assets/GameMain/Entities/Monster/Cactus.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Cactus.prefab.meta rename to Assets/GameMain/Entities/Monster/Cactus.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Chicken.prefab b/Assets/GameMain/Entities/Monster/Chicken.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Chicken.prefab rename to Assets/GameMain/Entities/Monster/Chicken.prefab diff --git a/Assets/GameMain/Entities/Monsters/Chicken.prefab.meta b/Assets/GameMain/Entities/Monster/Chicken.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Chicken.prefab.meta rename to Assets/GameMain/Entities/Monster/Chicken.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Crab.prefab b/Assets/GameMain/Entities/Monster/Crab.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Crab.prefab rename to Assets/GameMain/Entities/Monster/Crab.prefab diff --git a/Assets/GameMain/Entities/Monsters/Crab.prefab.meta b/Assets/GameMain/Entities/Monster/Crab.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Crab.prefab.meta rename to Assets/GameMain/Entities/Monster/Crab.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Cthulhu.prefab b/Assets/GameMain/Entities/Monster/Cthulhu.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Cthulhu.prefab rename to Assets/GameMain/Entities/Monster/Cthulhu.prefab diff --git a/Assets/GameMain/Entities/Monsters/Cthulhu.prefab.meta b/Assets/GameMain/Entities/Monster/Cthulhu.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Cthulhu.prefab.meta rename to Assets/GameMain/Entities/Monster/Cthulhu.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Cyclops.prefab b/Assets/GameMain/Entities/Monster/Cyclops.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Cyclops.prefab rename to Assets/GameMain/Entities/Monster/Cyclops.prefab diff --git a/Assets/GameMain/Entities/Monsters/Cyclops.prefab.meta b/Assets/GameMain/Entities/Monster/Cyclops.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Cyclops.prefab.meta rename to Assets/GameMain/Entities/Monster/Cyclops.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Deer.prefab b/Assets/GameMain/Entities/Monster/Deer.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Deer.prefab rename to Assets/GameMain/Entities/Monster/Deer.prefab diff --git a/Assets/GameMain/Entities/Monsters/Deer.prefab.meta b/Assets/GameMain/Entities/Monster/Deer.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Deer.prefab.meta rename to Assets/GameMain/Entities/Monster/Deer.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Demon.prefab b/Assets/GameMain/Entities/Monster/Demon.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Demon.prefab rename to Assets/GameMain/Entities/Monster/Demon.prefab diff --git a/Assets/GameMain/Entities/Monsters/Demon.prefab.meta b/Assets/GameMain/Entities/Monster/Demon.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Demon.prefab.meta rename to Assets/GameMain/Entities/Monster/Demon.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Ghost.prefab b/Assets/GameMain/Entities/Monster/Ghost.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Ghost.prefab rename to Assets/GameMain/Entities/Monster/Ghost.prefab diff --git a/Assets/GameMain/Entities/Monsters/Ghost.prefab.meta b/Assets/GameMain/Entities/Monster/Ghost.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Ghost.prefab.meta rename to Assets/GameMain/Entities/Monster/Ghost.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/GreenDemon.prefab b/Assets/GameMain/Entities/Monster/GreenDemon.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/GreenDemon.prefab rename to Assets/GameMain/Entities/Monster/GreenDemon.prefab diff --git a/Assets/GameMain/Entities/Monsters/GreenDemon.prefab.meta b/Assets/GameMain/Entities/Monster/GreenDemon.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/GreenDemon.prefab.meta rename to Assets/GameMain/Entities/Monster/GreenDemon.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Mushroom.prefab b/Assets/GameMain/Entities/Monster/Mushroom.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Mushroom.prefab rename to Assets/GameMain/Entities/Monster/Mushroom.prefab diff --git a/Assets/GameMain/Entities/Monsters/Mushroom.prefab.meta b/Assets/GameMain/Entities/Monster/Mushroom.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Mushroom.prefab.meta rename to Assets/GameMain/Entities/Monster/Mushroom.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Panda.prefab b/Assets/GameMain/Entities/Monster/Panda.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Panda.prefab rename to Assets/GameMain/Entities/Monster/Panda.prefab diff --git a/Assets/GameMain/Entities/Monsters/Panda.prefab.meta b/Assets/GameMain/Entities/Monster/Panda.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Panda.prefab.meta rename to Assets/GameMain/Entities/Monster/Panda.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Penguin.prefab b/Assets/GameMain/Entities/Monster/Penguin.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Penguin.prefab rename to Assets/GameMain/Entities/Monster/Penguin.prefab diff --git a/Assets/GameMain/Entities/Monsters/Penguin.prefab.meta b/Assets/GameMain/Entities/Monster/Penguin.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Penguin.prefab.meta rename to Assets/GameMain/Entities/Monster/Penguin.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Pig.prefab b/Assets/GameMain/Entities/Monster/Pig.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Pig.prefab rename to Assets/GameMain/Entities/Monster/Pig.prefab diff --git a/Assets/GameMain/Entities/Monsters/Pig.prefab.meta b/Assets/GameMain/Entities/Monster/Pig.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Pig.prefab.meta rename to Assets/GameMain/Entities/Monster/Pig.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Skull.prefab b/Assets/GameMain/Entities/Monster/Skull.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Skull.prefab rename to Assets/GameMain/Entities/Monster/Skull.prefab diff --git a/Assets/GameMain/Entities/Monsters/Skull.prefab.meta b/Assets/GameMain/Entities/Monster/Skull.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Skull.prefab.meta rename to Assets/GameMain/Entities/Monster/Skull.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Tree.prefab b/Assets/GameMain/Entities/Monster/Tree.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Tree.prefab rename to Assets/GameMain/Entities/Monster/Tree.prefab diff --git a/Assets/GameMain/Entities/Monsters/Tree.prefab.meta b/Assets/GameMain/Entities/Monster/Tree.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Tree.prefab.meta rename to Assets/GameMain/Entities/Monster/Tree.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/YellowDragon.prefab b/Assets/GameMain/Entities/Monster/YellowDragon.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/YellowDragon.prefab rename to Assets/GameMain/Entities/Monster/YellowDragon.prefab diff --git a/Assets/GameMain/Entities/Monsters/YellowDragon.prefab.meta b/Assets/GameMain/Entities/Monster/YellowDragon.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/YellowDragon.prefab.meta rename to Assets/GameMain/Entities/Monster/YellowDragon.prefab.meta diff --git a/Assets/GameMain/Entities/Monsters/Yeti.prefab b/Assets/GameMain/Entities/Monster/Yeti.prefab similarity index 100% rename from Assets/GameMain/Entities/Monsters/Yeti.prefab rename to Assets/GameMain/Entities/Monster/Yeti.prefab diff --git a/Assets/GameMain/Entities/Monsters/Yeti.prefab.meta b/Assets/GameMain/Entities/Monster/Yeti.prefab.meta similarity index 100% rename from Assets/GameMain/Entities/Monsters/Yeti.prefab.meta rename to Assets/GameMain/Entities/Monster/Yeti.prefab.meta diff --git a/Assets/GameMain/Meshes/crystal_18.fbx b/Assets/GameMain/Meshes/crystal_18.fbx new file mode 100644 index 0000000..7461e32 Binary files /dev/null and b/Assets/GameMain/Meshes/crystal_18.fbx differ diff --git a/Assets/GameMain/Meshes/crystal_18.fbx.meta b/Assets/GameMain/Meshes/crystal_18.fbx.meta new file mode 100644 index 0000000..afd2195 --- /dev/null +++ b/Assets/GameMain/Meshes/crystal_18.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 395ec7c091a772848a2b259af5f78ca3 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 0.15 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 0.15 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Meshes/crystal_4.fbx b/Assets/GameMain/Meshes/crystal_4.fbx new file mode 100644 index 0000000..a9d8357 Binary files /dev/null and b/Assets/GameMain/Meshes/crystal_4.fbx differ diff --git a/Assets/GameMain/Meshes/crystal_4.fbx.meta b/Assets/GameMain/Meshes/crystal_4.fbx.meta new file mode 100644 index 0000000..d69c6fa --- /dev/null +++ b/Assets/GameMain/Meshes/crystal_4.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: b0df1c310a0f037418a05a052bb085bb +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 0.15 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 0.15 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Meshes/crystal_7.fbx b/Assets/GameMain/Meshes/crystal_7.fbx new file mode 100644 index 0000000..cb91e03 Binary files /dev/null and b/Assets/GameMain/Meshes/crystal_7.fbx differ diff --git a/Assets/GameMain/Meshes/crystal_7.fbx.meta b/Assets/GameMain/Meshes/crystal_7.fbx.meta new file mode 100644 index 0000000..6ed7b58 --- /dev/null +++ b/Assets/GameMain/Meshes/crystal_7.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 716b72b19369a9948b5d72eddab06c30 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 0.15 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 0.15 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: