diff options
15 files changed, 424 insertions, 419 deletions
diff --git a/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade.png.meta b/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade.png.meta index c6c205b..ade9d3f 100644 --- a/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade.png.meta +++ b/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade.png.meta @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -44,9 +44,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + alignment: 9 + spritePivot: {x: 0.48601782, y: 0.21787216} + spritePixelsToUnits: 32 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -75,6 +75,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade2.png.meta b/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade2.png.meta index 3202a50..a83e1dd 100644 --- a/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade2.png.meta +++ b/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade2.png.meta @@ -44,8 +44,8 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + alignment: 9 + spritePivot: {x: 0.50654125, y: 0.40927163} spritePixelsToUnits: 32 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 diff --git a/AlienSurvival/Assets/Test/Prefabs/bullet.meta b/AlienSurvival/Assets/Test/Prefabs/bullet.meta new file mode 100644 index 0000000..ea0fd7a --- /dev/null +++ b/AlienSurvival/Assets/Test/Prefabs/bullet.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31eae925cdfd521429ab52284cbf6863 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Prefabs/bullet/bullet.prefab b/AlienSurvival/Assets/Test/Prefabs/bullet/bullet.prefab new file mode 100644 index 0000000..8b0d81d --- /dev/null +++ b/AlienSurvival/Assets/Test/Prefabs/bullet/bullet.prefab @@ -0,0 +1,124 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8728683699403410085 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 578723456960587661} + - component: {fileID: 1621680074769516280} + - component: {fileID: 6050668793531609288} + - component: {fileID: 2848642202402896498} + m_Layer: 0 + m_Name: bullet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &578723456960587661 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8728683699403410085} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 7.95, y: 16.03, z: 0} + m_LocalScale: {x: 3, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1621680074769516280 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8728683699403410085} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 1 + m_Sprite: {fileID: 21300000, guid: f9bf1649db46700479263976bfe6eef9, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.625, y: 0.15625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &6050668793531609288 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8728683699403410085} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf74c7651403bc449b55858cefd8debb, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &2848642202402896498 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8728683699403410085} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.3125, y: 0.000000007450581} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0.49999994} + oldSize: {x: 0.625, y: 0.15625} + newSize: {x: 0.625, y: 0.15625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.625, y: 0.15625} + m_EdgeRadius: 0 diff --git a/AlienSurvival/Assets/Test/Prefabs/bullet/bullet.prefab.meta b/AlienSurvival/Assets/Test/Prefabs/bullet/bullet.prefab.meta new file mode 100644 index 0000000..b5a7666 --- /dev/null +++ b/AlienSurvival/Assets/Test/Prefabs/bullet/bullet.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cb712ea09db7bc740921be46b8726b6d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Prefabs/character/peacemaker.prefab b/AlienSurvival/Assets/Test/Prefabs/character/peacemaker.prefab index 57309a3..48616d4 100644 --- a/AlienSurvival/Assets/Test/Prefabs/character/peacemaker.prefab +++ b/AlienSurvival/Assets/Test/Prefabs/character/peacemaker.prefab @@ -1,5 +1,35 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1494824566 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1494824567} + m_Layer: 0 + m_Name: launch_point + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1494824567 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1494824566} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.033, y: 1.529, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8582758513482715753} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8582758513482715755 GameObject: m_ObjectHideFlags: 0 @@ -35,9 +65,7 @@ Transform: - {fileID: 8582758514010527126} - {fileID: 8582758513714280098} - {fileID: 8582758514488566233} - - {fileID: 8582758515438013607} - - {fileID: 8582758513770679022} - - {fileID: 8582758515125454581} + - {fileID: 1494824567} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -80,7 +108,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -953 + m_SortingOrder: -1703 m_Sprite: {fileID: 21300000, guid: 65e65feb049635344acf9528aedd0195, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -124,10 +152,11 @@ MonoBehaviour: m_Centre: {fileID: 8582758514488566233} m_Arrow: {fileID: 8582758513714280097} m_ArrowRadius: 1 - m_Bullet: {fileID: 8582758515438013606} - m_Grenade: {fileID: 8582758513770679020} + m_Bullet: {fileID: 6050668793531609288, guid: cb712ea09db7bc740921be46b8726b6d, type: 3} + m_Grenade: {fileID: 7513112455920660206, guid: 2197bdf1c76e0394698f175b488828cc, type: 3} m_Zoom: {x: 0.8, y: 1} - m_LaunchVfx: {fileID: 8582758515125454582} + m_LaunchVfx: {fileID: 6028171587937785479, guid: e318e823156c1c542b393914abb1c0b4, type: 3} + m_LaunchPoint: {fileID: 1494824567} --- !u!50 &8582758513482715766 Rigidbody2D: serializedVersion: 4 @@ -247,119 +276,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &8582758513770679008 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8582758513770679022} - - component: {fileID: 8582758513770679023} - - component: {fileID: 8582758513770679021} - - component: {fileID: 8582758513770679020} - m_Layer: 0 - m_Name: grenade - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &8582758513770679022 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8582758513770679008} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.72000027, y: 1.2399998, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 8582758514904128933} - m_Father: {fileID: 8582758513482715753} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8582758513770679023 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8582758513770679008} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: -1077 - m_Sprite: {fileID: 21300000, guid: ae59d9544d36c154fbf896d6894e83d4, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.59375, y: 0.78125} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &8582758513770679021 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8582758513770679008} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 780072e6ea35d1f4abd930754c5e9c9f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Shadow: {fileID: 8582758514904128933} - m_Height: 0 ---- !u!114 &8582758513770679020 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8582758513770679008} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 40fc919f136c67e41a3608549bab3217, type: 3} - m_Name: - m_EditorClassIdentifier: - m_GravityScale: 1 - m_ExplosionEffect: {fileID: 6158943708042931892, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} --- !u!1 &8582758514010527127 GameObject: m_ObjectHideFlags: 0 @@ -472,278 +388,3 @@ Transform: m_Father: {fileID: 8582758513482715753} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8582758514904128934 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8582758514904128933} - - component: {fileID: 8582758514904128931} - m_Layer: 0 - m_Name: grenade (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8582758514904128933 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8582758514904128934} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0.3964, z: 1} - m_Children: [] - m_Father: {fileID: 8582758513770679022} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8582758514904128931 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8582758514904128934} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: ae59d9544d36c154fbf896d6894e83d4, type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 0.13333334} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.59375, y: 0.78125} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &8582758515438013593 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8582758515438013607} - - component: {fileID: 8582758515438013592} - - component: {fileID: 8582758515438013606} - - component: {fileID: 8582758515438013605} - m_Layer: 0 - m_Name: bullet - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &8582758515438013607 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8582758515438013593} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 3, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8582758513482715753} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8582758515438013592 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8582758515438013593} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 1 - m_Sprite: {fileID: 21300000, guid: f9bf1649db46700479263976bfe6eef9, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.625, y: 0.15625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &8582758515438013606 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8582758515438013593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cf74c7651403bc449b55858cefd8debb, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!61 &8582758515438013605 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8582758515438013593} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0.3125, y: 0.000000007450581} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0.49999994} - oldSize: {x: 0.625, y: 0.15625} - newSize: {x: 0.625, y: 0.15625} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.625, y: 0.15625} - m_EdgeRadius: 0 ---- !u!1001 &2644821875093491825 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8582758513482715753} - m_Modifications: - - target: {fileID: 6028171587937785476, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 6028171587937785476, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - propertyPath: m_LocalScale.y - value: 0.04 - objectReference: {fileID: 0} - - target: {fileID: 6028171587937785476, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - propertyPath: m_LocalPosition.x - value: -0.013 - objectReference: {fileID: 0} - - target: {fileID: 6028171587937785476, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - propertyPath: m_LocalPosition.y - value: 1.607 - objectReference: {fileID: 0} - - target: {fileID: 6028171587937785476, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6028171587937785476, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6028171587937785476, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6028171587937785476, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6028171587937785476, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6028171587937785476, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6028171587937785476, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6028171587937785476, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6028171587937785479, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - propertyPath: m_Name - value: launch - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e318e823156c1c542b393914abb1c0b4, type: 3} ---- !u!1 &8582758515125454582 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6028171587937785479, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - m_PrefabInstance: {fileID: 2644821875093491825} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8582758515125454581 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6028171587937785476, guid: e318e823156c1c542b393914abb1c0b4, type: 3} - m_PrefabInstance: {fileID: 2644821875093491825} - m_PrefabAsset: {fileID: 0} diff --git a/AlienSurvival/Assets/Test/Prefabs/effect/explosion.prefab b/AlienSurvival/Assets/Test/Prefabs/effect/eff_explosion.prefab index 3bfc341..8acfbc8 100644 --- a/AlienSurvival/Assets/Test/Prefabs/effect/explosion.prefab +++ b/AlienSurvival/Assets/Test/Prefabs/effect/eff_explosion.prefab @@ -116,7 +116,7 @@ GameObject: - component: {fileID: 5419450612351242614} - component: {fileID: 1226901734} m_Layer: 0 - m_Name: explosion + m_Name: eff_explosion m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/AlienSurvival/Assets/Test/Prefabs/effect/explosion.prefab.meta b/AlienSurvival/Assets/Test/Prefabs/effect/eff_explosion.prefab.meta index 90290ef..90290ef 100644 --- a/AlienSurvival/Assets/Test/Prefabs/effect/explosion.prefab.meta +++ b/AlienSurvival/Assets/Test/Prefabs/effect/eff_explosion.prefab.meta diff --git a/AlienSurvival/Assets/Test/Prefabs/grenade.meta b/AlienSurvival/Assets/Test/Prefabs/grenade.meta new file mode 100644 index 0000000..91c45d3 --- /dev/null +++ b/AlienSurvival/Assets/Test/Prefabs/grenade.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f6c73e17ab1155b49b00fde2bbc72186 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v1.prefab b/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v1.prefab new file mode 100644 index 0000000..7d9d5f6 --- /dev/null +++ b/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v1.prefab @@ -0,0 +1,197 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5159672479249422060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3005261104311357832} + - component: {fileID: 5943453734829882683} + - component: {fileID: 1446587846401758816} + - component: {fileID: 7513112455920660206} + m_Layer: 0 + m_Name: grenade_v1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3005261104311357832 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5159672479249422060} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 8.921, y: 16.27, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_Children: + - {fileID: 613986561398493094} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5943453734829882683 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5159672479249422060} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: -1527 + m_Sprite: {fileID: 21300000, guid: ae59d9544d36c154fbf896d6894e83d4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.59375, y: 0.78125} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &1446587846401758816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5159672479249422060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 780072e6ea35d1f4abd930754c5e9c9f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Shadow: {fileID: 613986561398493094} + m_Height: 0 +--- !u!114 &7513112455920660206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5159672479249422060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40fc919f136c67e41a3608549bab3217, type: 3} + m_Name: + m_EditorClassIdentifier: + m_GravityScale: 1 + m_ExplosionEffect: {fileID: 6158943708042931892, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} +--- !u!1 &8814752922086559144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 613986561398493094} + - component: {fileID: 1283984912465993190} + m_Layer: 0 + m_Name: shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &613986561398493094 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8814752922086559144} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 0.69, z: 1} + m_Children: [] + m_Father: {fileID: 3005261104311357832} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1283984912465993190 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8814752922086559144} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 601505335 + m_SortingLayer: -1 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: ae59d9544d36c154fbf896d6894e83d4, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 0.14117648} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.59375, y: 0.78125} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v1.prefab.meta b/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v1.prefab.meta new file mode 100644 index 0000000..54107af --- /dev/null +++ b/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2197bdf1c76e0394698f175b488828cc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity b/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity index 0a138a2..e2b7482 100644 --- a/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity +++ b/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity @@ -2199,7 +2199,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -1396 + m_SortingOrder: -981 m_Sprite: {fileID: -6997709495448532824, guid: fb08b0f068cbce749917cffaef128c3f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2219,7 +2219,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 231104471} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.49, y: 14.46, z: 0} + m_LocalPosition: {x: 5.43, y: 10.32, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 858498575} @@ -8306,7 +8306,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -860 + m_SortingOrder: -900 m_Sprite: {fileID: -3685877254663532703, guid: a75b74e89c53fb043902fbe6216cd330, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -8326,7 +8326,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 844062961} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.3300002, y: 9.409995, z: 0} + m_LocalPosition: {x: 2.9, y: 9.8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 900101674} @@ -12388,7 +12388,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -1967 + m_SortingOrder: -1017 m_Sprite: {fileID: -6288526288528838362, guid: 180253d8c3a9d7d49ab41c54181dae83, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -12408,7 +12408,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1427931716} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 9.25, y: 21.169998, z: 0} + m_LocalPosition: {x: 8.41, y: 11.66, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 230886355} @@ -14564,7 +14564,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -1676 + m_SortingOrder: -802 m_Sprite: {fileID: 5068832224188716903, guid: f81265fcc613abd44bffbfcb7215359b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -14584,7 +14584,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1655800953} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.0800002, y: 17.760008, z: 0} + m_LocalPosition: {x: -0.37737918, y: 9.020008, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1545137360} @@ -18176,7 +18176,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -1453 + m_SortingOrder: -580 m_Sprite: {fileID: 21300000, guid: 52dab49f83ccd8f4895a647210165e85, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -18196,7 +18196,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2103777676} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.1426206, y: 15.54, z: 0} + m_LocalPosition: {x: -3.6, y: 6.8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 865193497} @@ -18677,11 +18677,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8582758513482715753, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} propertyPath: m_LocalPosition.x - value: 7.95 + value: 8.360001 objectReference: {fileID: 0} - target: {fileID: 8582758513482715753, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} propertyPath: m_LocalPosition.y - value: 10.030001 + value: 6.5700016 objectReference: {fileID: 0} - target: {fileID: 8582758513482715753, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} propertyPath: m_LocalPosition.z @@ -18715,6 +18715,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8582758513482715754, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} + propertyPath: m_SortingOrder + value: -607 + objectReference: {fileID: 0} - target: {fileID: 8582758513482715755, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} propertyPath: m_Name value: peacemaker @@ -18723,9 +18727,5 @@ PrefabInstance: propertyPath: m_Camera value: objectReference: {fileID: 976849206} - - target: {fileID: 8582758515125454582, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} - propertyPath: m_Name - value: eff_launch - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} diff --git a/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs b/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs index b1534f3..784cde8 100644 --- a/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs +++ b/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs @@ -16,6 +16,7 @@ public class TestPeaceMaker : MonoBehaviour [SerializeField] private TestPeaceMakerGrenade m_Grenade; [SerializeField] private Vector2 m_Zoom; [SerializeField] private GameObject m_LaunchVfx; + [SerializeField] private Transform m_LaunchPoint; private Vector3 zoomIn { @@ -269,7 +270,7 @@ public class TestPeaceMaker : MonoBehaviour // vfx GameObject eff = Instantiate<GameObject>(m_LaunchVfx, this.transform); - eff.transform.position = m_LaunchVfx.transform.position; + eff.transform.position = m_LaunchPoint.transform.position; eff.SetActive(true); yield return new WaitForSeconds(interval); diff --git a/Docs/参考/玩法/QQ截图20220419124604.png b/Docs/参考/玩法/QQ截图20220419124604.png Binary files differnew file mode 100644 index 0000000..8575a6c --- /dev/null +++ b/Docs/参考/玩法/QQ截图20220419124604.png diff --git a/Docs/参考/玩法/QQ截图20220419124619.png b/Docs/参考/玩法/QQ截图20220419124619.png Binary files differnew file mode 100644 index 0000000..75dc340 --- /dev/null +++ b/Docs/参考/玩法/QQ截图20220419124619.png |
