diff options
31 files changed, 1856 insertions, 28 deletions
diff --git a/AlienSurvival/Assets/Test/Prefabs/boomerang.prefab b/AlienSurvival/Assets/Test/Prefabs/boomerang.prefab new file mode 100644 index 0000000..a28aa2f --- /dev/null +++ b/AlienSurvival/Assets/Test/Prefabs/boomerang.prefab @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8793587622498110543 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8793587622498110537} + - component: {fileID: 8793587622498110542} + m_Layer: 0 + m_Name: boomerang + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8793587622498110537 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8793587622498110543} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.328, y: 1.086, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8793587622498110542 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8793587622498110543} + 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: b2408a123aae0c64090a7bf85cbfafb3, 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.40625, y: 1.3125} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/AlienSurvival/Assets/Test/Prefabs/boomerang.prefab.meta b/AlienSurvival/Assets/Test/Prefabs/boomerang.prefab.meta new file mode 100644 index 0000000..50c8c2d --- /dev/null +++ b/AlienSurvival/Assets/Test/Prefabs/boomerang.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 606488edded27994bbfddc85154bc71c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Prefabs/explosion.prefab b/AlienSurvival/Assets/Test/Prefabs/explosion.prefab index 183fe5f..3bfc341 100644 --- a/AlienSurvival/Assets/Test/Prefabs/explosion.prefab +++ b/AlienSurvival/Assets/Test/Prefabs/explosion.prefab @@ -233,4 +233,37 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6bde42b3ff5cbc44ca4e036544c3cde9, type: 3} m_Name: m_EditorClassIdentifier: - lifeTime: 0.7 + lifeTime: 0.6 + alphaCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: -0.0023840456 + outSlope: -0.0023840456 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25441495 + value: 0.99939346 + inSlope: Infinity + outSlope: -1.4747988 + tangentMode: 7 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.07760267 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1.340415 + outSlope: -1.340415 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/AlienSurvival/Assets/Test/Res/effects/Animations/explosion2.anim b/AlienSurvival/Assets/Test/Res/effects/Animations/explosion2.anim new file mode 100644 index 0000000..a7b1f68 --- /dev/null +++ b/AlienSurvival/Assets/Test/Res/effects/Animations/explosion2.anim @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: explosion2 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -4625965200364843426, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - time: 0.083333336 + value: {fileID: -208267998733222760, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - time: 0.16666667 + value: {fileID: -6131150567242327500, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - time: 0.25 + value: {fileID: -2092004726081965303, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - time: 0.33333334 + value: {fileID: 321748802186315435, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - time: 0.41666666 + value: {fileID: -4960266159461346474, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - time: 0.5 + value: {fileID: 2643740925410311312, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - time: 0.5833333 + value: {fileID: 6990884901119904045, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - time: 0.6666667 + value: {fileID: 3729883006976011129, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - time: 0.75 + value: {fileID: -6292476449839541965, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - time: 0.8333333 + value: {fileID: 8181503159718755926, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - time: 0.9166667 + value: {fileID: 7055284876575534073, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - time: 1 + value: {fileID: 119788836393304476, guid: df6271647a5b8644891f24540516cd7e, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -4625965200364843426, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - {fileID: -208267998733222760, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - {fileID: -6131150567242327500, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - {fileID: -2092004726081965303, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - {fileID: 321748802186315435, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - {fileID: -4960266159461346474, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - {fileID: 2643740925410311312, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - {fileID: 6990884901119904045, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - {fileID: 3729883006976011129, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - {fileID: -6292476449839541965, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - {fileID: 8181503159718755926, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - {fileID: 7055284876575534073, guid: df6271647a5b8644891f24540516cd7e, type: 3} + - {fileID: 119788836393304476, guid: df6271647a5b8644891f24540516cd7e, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0833334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/AlienSurvival/Assets/Test/Res/effects/Animations/explosion2.anim.meta b/AlienSurvival/Assets/Test/Res/effects/Animations/explosion2.anim.meta new file mode 100644 index 0000000..6d4de73 --- /dev/null +++ b/AlienSurvival/Assets/Test/Res/effects/Animations/explosion2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 600db457f146166439bcbc4ae80c9ae5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Res/effects/Animations/explosion2_0.controller b/AlienSurvival/Assets/Test/Res/effects/Animations/explosion2_0.controller new file mode 100644 index 0000000..cfc6023 --- /dev/null +++ b/AlienSurvival/Assets/Test/Res/effects/Animations/explosion2_0.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: explosion2_0 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2832051287132614224} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &788474257909378154 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: explosion2 + m_Speed: 2 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 600db457f146166439bcbc4ae80c9ae5, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &2832051287132614224 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 788474257909378154} + m_Position: {x: 300, y: 110, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 788474257909378154} diff --git a/AlienSurvival/Assets/Test/Res/effects/Animations/explosion2_0.controller.meta b/AlienSurvival/Assets/Test/Res/effects/Animations/explosion2_0.controller.meta new file mode 100644 index 0000000..f1063f5 --- /dev/null +++ b/AlienSurvival/Assets/Test/Res/effects/Animations/explosion2_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 10263276ae26e9f41a834f037c445537 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Res/effects/Animations/explosion_0.controller b/AlienSurvival/Assets/Test/Res/effects/Animations/explosion_0.controller index 92f27c2..40bf0a9 100644 --- a/AlienSurvival/Assets/Test/Res/effects/Animations/explosion_0.controller +++ b/AlienSurvival/Assets/Test/Res/effects/Animations/explosion_0.controller @@ -52,7 +52,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: explosion - m_Speed: 1.7 + m_Speed: 2 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] diff --git a/AlienSurvival/Assets/Test/Res/effects/explosion2.png b/AlienSurvival/Assets/Test/Res/effects/explosion2.png Binary files differnew file mode 100644 index 0000000..9e21e84 --- /dev/null +++ b/AlienSurvival/Assets/Test/Res/effects/explosion2.png diff --git a/AlienSurvival/Assets/Test/Res/effects/explosion2.png.meta b/AlienSurvival/Assets/Test/Res/effects/explosion2.png.meta new file mode 100644 index 0000000..d6c7ccc --- /dev/null +++ b/AlienSurvival/Assets/Test/Res/effects/explosion2.png.meta @@ -0,0 +1,420 @@ +fileFormatVersion: 2 +guid: df6271647a5b8644891f24540516cd7e +TextureImporter: + internalIDToNameTable: + - first: + 213: -4625965200364843426 + second: explosion2_0 + - first: + 213: -208267998733222760 + second: explosion2_1 + - first: + 213: -6131150567242327500 + second: explosion2_2 + - first: + 213: -2092004726081965303 + second: explosion2_3 + - first: + 213: 321748802186315435 + second: explosion2_4 + - first: + 213: -4960266159461346474 + second: explosion2_5 + - first: + 213: 2643740925410311312 + second: explosion2_6 + - first: + 213: 6990884901119904045 + second: explosion2_7 + - first: + 213: 3729883006976011129 + second: explosion2_8 + - first: + 213: -6292476449839541965 + second: explosion2_9 + - first: + 213: 8181503159718755926 + second: explosion2_10 + - first: + 213: 7055284876575534073 + second: explosion2_11 + - first: + 213: 119788836393304476 + second: explosion2_12 + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + 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: + - serializedVersion: 2 + name: explosion2_0 + rect: + serializedVersion: 2 + x: 376 + y: 0 + width: 376 + height: 376 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e5e4fe0e8254dcfb0800000000000000 + internalID: -4625965200364843426 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: explosion2_1 + rect: + serializedVersion: 2 + x: 752 + y: 0 + width: 376 + height: 376 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 89cbc6dcb551c1df0800000000000000 + internalID: -208267998733222760 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: explosion2_2 + rect: + serializedVersion: 2 + x: 1128 + y: 0 + width: 376 + height: 376 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 43a16171b07c9eaa0800000000000000 + internalID: -6131150567242327500 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: explosion2_3 + rect: + serializedVersion: 2 + x: 1504 + y: 0 + width: 376 + height: 376 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 903327919c4b7f2e0800000000000000 + internalID: -2092004726081965303 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: explosion2_4 + rect: + serializedVersion: 2 + x: 1880 + y: 0 + width: 376 + height: 376 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ba60935b4d4177400800000000000000 + internalID: 321748802186315435 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: explosion2_5 + rect: + serializedVersion: 2 + x: 2256 + y: 0 + width: 376 + height: 376 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6535ae56538992bb0800000000000000 + internalID: -4960266159461346474 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: explosion2_6 + rect: + serializedVersion: 2 + x: 2632 + y: 0 + width: 376 + height: 376 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 09c7e315d5470b420800000000000000 + internalID: 2643740925410311312 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: explosion2_7 + rect: + serializedVersion: 2 + x: 3008 + y: 0 + width: 376 + height: 376 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d29c4ec37cc940160800000000000000 + internalID: 6990884901119904045 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: explosion2_8 + rect: + serializedVersion: 2 + x: 3384 + y: 0 + width: 376 + height: 376 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 97b229445d433c330800000000000000 + internalID: 3729883006976011129 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: explosion2_9 + rect: + serializedVersion: 2 + x: 3760 + y: 0 + width: 376 + height: 376 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3319dc10202aca8a0800000000000000 + internalID: -6292476449839541965 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: explosion2_10 + rect: + serializedVersion: 2 + x: 4136 + y: 0 + width: 376 + height: 376 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 65eb5cbb6c98a8170800000000000000 + internalID: 8181503159718755926 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: explosion2_11 + rect: + serializedVersion: 2 + x: 4512 + y: 0 + width: 376 + height: 376 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9fb6879f63869e160800000000000000 + internalID: 7055284876575534073 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: explosion2_12 + rect: + serializedVersion: 2 + x: 4888 + y: 0 + width: 376 + height: 376 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c91c741ef4399a100800000000000000 + internalID: 119788836393304476 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Res/sprites/building.meta b/AlienSurvival/Assets/Test/Res/sprites/building.meta new file mode 100644 index 0000000..c9063ae --- /dev/null +++ b/AlienSurvival/Assets/Test/Res/sprites/building.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1e931dcb4119e8d42b593744afc5e6a9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Res/sprites/building/house.png b/AlienSurvival/Assets/Test/Res/sprites/building/house.png Binary files differnew file mode 100644 index 0000000..b430a7e --- /dev/null +++ b/AlienSurvival/Assets/Test/Res/sprites/building/house.png diff --git a/AlienSurvival/Assets/Test/Res/sprites/building/house.png.meta b/AlienSurvival/Assets/Test/Res/sprites/building/house.png.meta new file mode 100644 index 0000000..a299e5d --- /dev/null +++ b/AlienSurvival/Assets/Test/Res/sprites/building/house.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: d895a3e2c965b1d489876e7b6659122e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 9 + spritePivot: {x: 0.4967127, y: 0.07499874} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Res/sprites/bullet/bullet.png.meta b/AlienSurvival/Assets/Test/Res/sprites/bullet/bullet.png.meta index 059473f..0a0b45e 100644 --- a/AlienSurvival/Assets/Test/Res/sprites/bullet/bullet.png.meta +++ b/AlienSurvival/Assets/Test/Res/sprites/bullet/bullet.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 9 - spritePivot: {x: 1, y: 0.49999994} + spritePivot: {x: 0, y: 0.49999994} spritePixelsToUnits: 32 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 diff --git a/AlienSurvival/Assets/Test/Res/sprites/projector.meta b/AlienSurvival/Assets/Test/Res/sprites/projector.meta new file mode 100644 index 0000000..ce1c028 --- /dev/null +++ b/AlienSurvival/Assets/Test/Res/sprites/projector.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9265d3e99b53d2649a5ddf5b381f6be5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Res/sprites/projector/boomerang.png b/AlienSurvival/Assets/Test/Res/sprites/projector/boomerang.png Binary files differnew file mode 100644 index 0000000..e2795b8 --- /dev/null +++ b/AlienSurvival/Assets/Test/Res/sprites/projector/boomerang.png diff --git a/AlienSurvival/Assets/Test/Res/sprites/projector/boomerang.png.meta b/AlienSurvival/Assets/Test/Res/sprites/projector/boomerang.png.meta new file mode 100644 index 0000000..9fdee41 --- /dev/null +++ b/AlienSurvival/Assets/Test/Res/sprites/projector/boomerang.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: b2408a123aae0c64090a7bf85cbfafb3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 9 + spritePivot: {x: 0.55451983, y: 0.41548592} + spritePixelsToUnits: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity b/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity index f85b636..dfd7c8e 100644 --- a/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity +++ b/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity @@ -1087,6 +1087,81 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &320299115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 320299116} + - component: {fileID: 320299118} + - component: {fileID: 320299117} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &320299116 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320299115} + 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_Children: [] + m_Father: {fileID: 1523503809} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.00012207031} + m_SizeDelta: {x: -667.99, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &320299117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320299115} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.18792273, g: 0.4029139, b: 0.9716981, 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_Sprite: {fileID: 21300000, guid: be5e635b9d3d6f542ad447f7ae74d785, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &320299118 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320299115} + m_CullTransparentMesh: 1 --- !u!1 &413772983 GameObject: m_ObjectHideFlags: 0 @@ -2526,7 +2601,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!212 &794956712 SpriteRenderer: m_ObjectHideFlags: 0 @@ -2678,6 +2753,7 @@ Transform: - {fileID: 1953037534} - {fileID: 1287672224} - {fileID: 589748201} + - {fileID: 1382489074} m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2716,6 +2792,7 @@ MonoBehaviour: m_Bullet: {fileID: 1287672225} m_Grenade: {fileID: 589748203} m_Zoom: {x: 0.8, y: 1} + m_LaunchVfx: {fileID: 1382489073} --- !u!1 &844062961 GameObject: m_ObjectHideFlags: 0 @@ -3202,6 +3279,85 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &917445573 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 917445574} + - component: {fileID: 917445576} + - component: {fileID: 917445575} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &917445574 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 917445573} + 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_Children: [] + m_Father: {fileID: 1523503809} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 17.199951, y: 0.000061035156} + m_SizeDelta: {x: 160, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &917445575 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 917445573} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: LV.17 +--- !u!222 &917445576 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 917445573} + m_CullTransparentMesh: 1 --- !u!1 &976849203 GameObject: m_ObjectHideFlags: 0 @@ -3584,6 +3740,106 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1127821126 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1127821130} + - component: {fileID: 1127821129} + - component: {fileID: 1127821128} + - component: {fileID: 1127821127} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1127821127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127821126} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1127821128 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127821126} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1127821129 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127821126} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 1856618384} + m_PlaneDistance: 100 + m_PixelPerfect: 1 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1127821130 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127821126} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1523503809} + m_Father: {fileID: 0} + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1179934516 GameObject: m_ObjectHideFlags: 0 @@ -4002,6 +4258,206 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cf74c7651403bc449b55858cefd8debb, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1382489073 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1382489074} + - component: {fileID: 1382489076} + - component: {fileID: 1382489075} + m_Layer: 0 + m_Name: launchVfx + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1382489074 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1382489073} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.05, y: 1.529, z: 0} + m_LocalScale: {x: 0.07, y: 0.04, z: 1} + m_Children: [] + m_Father: {fileID: 813485934} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1382489075 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1382489073} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 10263276ae26e9f41a834f037c445537, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &1382489076 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1382489073} + 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: -4625965200364843426, guid: df6271647a5b8644891f24540516cd7e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 11.772994, y: 11.75} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1406907911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1406907913} + - component: {fileID: 1406907912} + - component: {fileID: 1406907914} + m_Layer: 0 + m_Name: house + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1406907912 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406907911} + 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: d895a3e2c965b1d489876e7b6659122e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 12.8125, y: 9.65625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1406907913 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406907911} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 18.23, y: 7.62, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1875111738} + m_Father: {fileID: 0} + m_RootOrder: 23 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1406907914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406907911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 780072e6ea35d1f4abd930754c5e9c9f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Shadow: {fileID: 1875111738} + m_Height: 0 --- !u!1 &1407365530 GameObject: m_ObjectHideFlags: 0 @@ -4444,6 +4900,83 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 +--- !u!1 &1523503808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1523503809} + - component: {fileID: 1523503811} + - component: {fileID: 1523503810} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1523503809 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523503808} + 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_Children: + - {fileID: 320299116} + - {fileID: 917445574} + m_Father: {fileID: 1127821130} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.0004272461, y: 0} + m_SizeDelta: {x: 0, y: 36.97} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1523503810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523503808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.4056604, g: 0.31492344, b: 0.10524209, 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_Sprite: {fileID: 21300000, guid: be5e635b9d3d6f542ad447f7ae74d785, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1523503811 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523503808} + m_CullTransparentMesh: 1 --- !u!1 &1524953817 GameObject: m_ObjectHideFlags: 0 @@ -5725,6 +6258,72 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 +--- !u!1 &1717389272 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1717389275} + - component: {fileID: 1717389274} + - component: {fileID: 1717389273} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1717389273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1717389272} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1717389274 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1717389272} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1717389275 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1717389272} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 21 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1808103855 GameObject: m_ObjectHideFlags: 0 @@ -6085,6 +6684,171 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 +--- !u!1 &1856618382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1856618385} + - component: {fileID: 1856618384} + - component: {fileID: 1856618383} + m_Layer: 0 + m_Name: UICamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!81 &1856618383 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1856618382} + m_Enabled: 1 +--- !u!20 &1856618384 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1856618382} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 4 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1856618385 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1856618382} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 100.7, y: 41.259594, z: -4.5600586} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 22 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1875111737 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1875111738} + - component: {fileID: 1875111739} + m_Layer: 0 + m_Name: shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1875111738 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1875111737} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.02, y: 0.26, z: 0} + m_LocalScale: {x: 1, y: 0.4656, z: 1} + m_Children: [] + m_Father: {fileID: 1406907913} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1875111739 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1875111737} + 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: d895a3e2c965b1d489876e7b6659122e, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 0.21960784} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 12.8125, y: 9.65625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1886634227 GameObject: m_ObjectHideFlags: 0 diff --git a/AlienSurvival/Assets/Test/Scripts/TestDestroySelf.cs b/AlienSurvival/Assets/Test/Scripts/TestDestroySelf.cs index 0ab48da..1ccd825 100644 --- a/AlienSurvival/Assets/Test/Scripts/TestDestroySelf.cs +++ b/AlienSurvival/Assets/Test/Scripts/TestDestroySelf.cs @@ -6,10 +6,18 @@ public class TestDestroySelf : MonoBehaviour { public float lifeTime; + public AnimationCurve alphaCurve; + + private float time; + + private SpriteRenderer sr; + void Start() { Invoke("DestroySelf", lifeTime); - } + time = 0; + sr = GetComponent<SpriteRenderer>(); + } void DestroySelf() { @@ -17,4 +25,14 @@ public class TestDestroySelf : MonoBehaviour Destroy(this.gameObject); } + void Update() + { + time += Time.deltaTime; + + Color c = sr.color; + c.a = alphaCurve.Evaluate(time / lifeTime); + + sr.color = c; + } + } diff --git a/AlienSurvival/Assets/Test/Scripts/TestMathHelper.cs b/AlienSurvival/Assets/Test/Scripts/TestMathHelper.cs new file mode 100644 index 0000000..e2ca833 --- /dev/null +++ b/AlienSurvival/Assets/Test/Scripts/TestMathHelper.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class TestMathHelper : MonoBehaviour +{ + + public static Vector2 Rotate(Vector2 v, float delta) + { + return new Vector2( + v.x * Mathf.Cos(delta) - v.y * Mathf.Sin(delta), + v.x * Mathf.Sin(delta) + v.y * Mathf.Cos(delta) + ); + } + +}
\ No newline at end of file diff --git a/AlienSurvival/Assets/Test/Scripts/TestMathHelper.cs.meta b/AlienSurvival/Assets/Test/Scripts/TestMathHelper.cs.meta new file mode 100644 index 0000000..872d038 --- /dev/null +++ b/AlienSurvival/Assets/Test/Scripts/TestMathHelper.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c40b8edb8d6570e419f024263e4cc43a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs b/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs index 0af8d53..2ec06e0 100644 --- a/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs +++ b/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs @@ -15,6 +15,7 @@ public class TestPeaceMaker : MonoBehaviour [SerializeField] private TestPeaceMakerBullet m_Bullet; [SerializeField] private TestPeaceMakerGrenade m_Grenade; [SerializeField] private Vector2 m_Zoom; + [SerializeField] private GameObject m_LaunchVfx; private Vector3 zoomIn { @@ -36,6 +37,7 @@ public class TestPeaceMaker : MonoBehaviour private SpriteRenderer m_SpriteRenderer; private TestFakeHeight m_FakeHeight; private Coroutine m_CoFire; + private Coroutine m_CoLaunchGrenade; private Vector3 m_PreMouse; @@ -68,12 +70,11 @@ public class TestPeaceMaker : MonoBehaviour SetAim(); bool isFire = Fire(); - - LaunchGrenade(); + bool isGrenade = LaunchGrenade(); CameraFollow(); - CameraZoom(/*isMove ||*/ isFire); + CameraZoom(/*isMove ||*/ isFire || isGrenade); } void CameraZoom(bool zout) @@ -107,7 +108,9 @@ public class TestPeaceMaker : MonoBehaviour float x = Input.GetAxisRaw("Horizontal"); float y = Input.GetAxisRaw("Vertical"); - if (x != 0 || y != 0) + bool isMove = x != 0 || y != 0; + + if (isMove) { Vector2 direction = new Vector2(x, y).normalized; @@ -129,7 +132,7 @@ public class TestPeaceMaker : MonoBehaviour } } - return x != 0 || y != 0; + return isMove; } void SetAim() @@ -200,24 +203,32 @@ public class TestPeaceMaker : MonoBehaviour return true; } - void LaunchGrenade() + bool LaunchGrenade() { - if (Input.GetButtonDown("Fire2")) + if (Input.GetButtonDown("Fire2") || (Input.GetAxis("BombTrigger") == 1)) { - TestPeaceMakerGrenade grenade = Instantiate<TestPeaceMakerGrenade>(m_Grenade); - - Vector3 position = m_FakeHeight.position + new Vector3(0, 0, 1.8f); - - grenade.Set(position, GetRandomDirection(), Random.Range(8f, 10f)); - - grenade.gameObject.SetActive(true); + if (m_CoLaunchGrenade == null) + { + m_CoLaunchGrenade = StartCoroutine(coLaunchGrenade(0.2f)); + } } + if (!Input.GetButton("Fire2") && (Input.GetAxis("BombTrigger") == 0)) + { + if (m_CoLaunchGrenade != null) + { + StopCoroutine(m_CoLaunchGrenade); + m_CoLaunchGrenade = null; + } + return false; + } + return true; } Vector3 GetRandomDirection() { - Vector3 dirOnPlane = Quaternion.Euler(0, 0, Random.Range(-30f, 30f)) * new Vector3(m_AimDirection.x, m_AimDirection.y, 0); - Vector3 dir = Quaternion.Euler(Random.Range(30f, 80f), 0, 0) * dirOnPlane; + Vector3 dirOnPlane = Quaternion.Euler(0, 0, Random.Range(-15f, 15f)) * new Vector3(m_AimDirection.x, m_AimDirection.y, 0); + dirOnPlane = dirOnPlane.normalized; + Vector3 dir = new Vector3(dirOnPlane.x, dirOnPlane.y, Random.Range(0f,0.5f)).normalized; return dir.normalized; } @@ -225,12 +236,36 @@ public class TestPeaceMaker : MonoBehaviour { while (true) { - TestPeaceMakerBullet bullet = Instantiate<TestPeaceMakerBullet>(m_Bullet); + CreateBullet(m_AimDirection, 12f, 2f); + //CreateBullet(TestMathHelper.Rotate(m_AimDirection, 10 * Mathf.Deg2Rad), 12f, 2f); + //CreateBullet(TestMathHelper.Rotate(m_AimDirection, -10 * Mathf.Deg2Rad), 12f, 2f); - bullet.transform.position = m_Arrow.transform.position + new Vector3(m_AimDirection.x, m_AimDirection.y, 0) * 1f; + yield return new WaitForSeconds(interval); + } + } + + TestPeaceMakerBullet CreateBullet(Vector2 dir, float speed, float lifeTime) + { + TestPeaceMakerBullet bullet = Instantiate<TestPeaceMakerBullet>(m_Bullet); + + bullet.transform.position = m_Arrow.transform.position + new Vector3(m_AimDirection.x, m_AimDirection.y, 0) * -0.3f; - bullet.Set(m_AimDirection, 12f, 2f); - bullet.gameObject.SetActive(true); + bullet.Set(dir, speed, lifeTime); + bullet.gameObject.SetActive(true); + + return bullet; + } + + IEnumerator coLaunchGrenade(float interval) + { + while (true) + { + TestPeaceMakerGrenade grenade = Instantiate<TestPeaceMakerGrenade>(m_Grenade); + + Vector3 position = m_FakeHeight.position + new Vector3(0, 0, 1.8f); + + grenade.Set(position, GetRandomDirection(), Random.Range(8f, 10f)); + grenade.gameObject.SetActive(true); yield return new WaitForSeconds(interval); } diff --git a/AlienSurvival/Assets/Test/Scripts/TestPeaceMakerGrenade.cs b/AlienSurvival/Assets/Test/Scripts/TestPeaceMakerGrenade.cs index 38dc2f5..109e47b 100644 --- a/AlienSurvival/Assets/Test/Scripts/TestPeaceMakerGrenade.cs +++ b/AlienSurvival/Assets/Test/Scripts/TestPeaceMakerGrenade.cs @@ -44,7 +44,7 @@ public class TestPeaceMakerGrenade : MonoBehaviour m_Coords.height += move.z; m_Velocity += GRAVITY * Time.deltaTime; - transform.rotation *= Quaternion.Euler(0, 0, 500 * Time.deltaTime); + transform.rotation *= Quaternion.Euler(0, 0, 100 * m_Velocity.magnitude * Time.deltaTime); } else { diff --git a/AlienSurvival/Assets/Test/Scripts/TestWaspRobot.cs b/AlienSurvival/Assets/Test/Scripts/TestWaspRobot.cs index b310fbd..dafd7e0 100644 --- a/AlienSurvival/Assets/Test/Scripts/TestWaspRobot.cs +++ b/AlienSurvival/Assets/Test/Scripts/TestWaspRobot.cs @@ -50,7 +50,7 @@ public class TestWaspRobot : MonoBehaviour { if(m_State != state) { - Debug.Log(m_State.ToString() + "->" + state.ToString()); + //Debug.Log(m_State.ToString() + "->" + state.ToString()); if(m_Coroutine != null) { diff --git a/AlienSurvival/ProjectSettings/InputManager.asset b/AlienSurvival/ProjectSettings/InputManager.asset index b8a1dd3..3ed6332 100644 --- a/AlienSurvival/ProjectSettings/InputManager.asset +++ b/AlienSurvival/ProjectSettings/InputManager.asset @@ -531,5 +531,21 @@ InputManager: snap: 0 invert: 0 type: 2 - axis: 2 + axis: 9 + joyNum: 0 + - serializedVersion: 3 + m_Name: BombTrigger + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.01 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 8 joyNum: 0 diff --git a/Art/参考/画风/571ded23b39bde12d358a23bf76e417c.jpg b/Art/参考/画风/571ded23b39bde12d358a23bf76e417c.jpg Binary files differnew file mode 100644 index 0000000..f1342ab --- /dev/null +++ b/Art/参考/画风/571ded23b39bde12d358a23bf76e417c.jpg diff --git a/Art/参考/画风/7bd8e4a7ae7d3dc50038bd3940c40109.jpg b/Art/参考/画风/7bd8e4a7ae7d3dc50038bd3940c40109.jpg Binary files differnew file mode 100644 index 0000000..1f1b772 --- /dev/null +++ b/Art/参考/画风/7bd8e4a7ae7d3dc50038bd3940c40109.jpg diff --git a/Art/参考/画风/8f97b4e3f52c86991ebe4b356e229c10.jpg b/Art/参考/画风/8f97b4e3f52c86991ebe4b356e229c10.jpg Binary files differnew file mode 100644 index 0000000..e543489 --- /dev/null +++ b/Art/参考/画风/8f97b4e3f52c86991ebe4b356e229c10.jpg diff --git a/Art/参考/画风/D55PAZEWsAEWkfI.png b/Art/参考/画风/D55PAZEWsAEWkfI.png Binary files differnew file mode 100644 index 0000000..5cfb7ab --- /dev/null +++ b/Art/参考/画风/D55PAZEWsAEWkfI.png diff --git a/Docs/参考/玩法/QQ截图20220417120725.png b/Docs/参考/玩法/QQ截图20220417120725.png Binary files differnew file mode 100644 index 0000000..825910a --- /dev/null +++ b/Docs/参考/玩法/QQ截图20220417120725.png diff --git a/Docs/开发/Controller/XboxOnWin.jpg b/Docs/开发/Controller/XboxOnWin.jpg Binary files differnew file mode 100644 index 0000000..e13d238 --- /dev/null +++ b/Docs/开发/Controller/XboxOnWin.jpg |
