diff options
56 files changed, 2294 insertions, 228 deletions
diff --git a/AlienSurvival/Assets/Scripts/Physics/AABBShape.cs b/AlienSurvival/Assets/Scripts/Physics/AABBShape.cs new file mode 100644 index 0000000..5105c72 --- /dev/null +++ b/AlienSurvival/Assets/Scripts/Physics/AABBShape.cs @@ -0,0 +1,45 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +#if UNITY_EDITOR +using UnityEditor; +#endif + +[RequireComponent(typeof(TopDownTransform))] +public class AABBShape : ShapeBase +{ + + [Tooltip("ĵ㣨Դ˽ڵƫƣ")] + [SerializeField] private Vector2 m_Centre; + public Vector2 centre { get { return m_Centre;} set { m_Centre = value; } } + + [Tooltip("СTopDownռ£")] + [SerializeField] private Vector2 m_Size; + public Vector2 size { get { return m_Size; } set { m_Size = value; } } + + private TopDownTransform m_TopDownTransform; + private TopDownTransform topdownTransform + { + get + { + if(m_TopDownTransform == null) + { + m_TopDownTransform = GetComponent<TopDownTransform>(); + } + + return m_TopDownTransform; + } + } + +#if UNITY_EDITOR + + private void OnDrawGizmos() + { + Vector3 pos = topdownTransform.Get3DPosition(); + Handles.color = Color.green; + Handles.DrawWireCube(pos + new Vector3(m_Centre.x, m_Centre.y, 0), new Vector3(size.x, size.y, 0)); + } + +#endif + +}
\ No newline at end of file diff --git a/AlienSurvival/Assets/Scripts/Physics/AABBShape.cs.meta b/AlienSurvival/Assets/Scripts/Physics/AABBShape.cs.meta new file mode 100644 index 0000000..e7c4f4f --- /dev/null +++ b/AlienSurvival/Assets/Scripts/Physics/AABBShape.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b0b865519e5d4f647a0dd9ea2df1236e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Scripts/Physics/BoxShape.cs b/AlienSurvival/Assets/Scripts/Physics/BoxShape.cs new file mode 100644 index 0000000..b5a4e7b --- /dev/null +++ b/AlienSurvival/Assets/Scripts/Physics/BoxShape.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(TopDownTransform))] +public class BoxShape : ShapeBase +{ + + +}
\ No newline at end of file diff --git a/AlienSurvival/Assets/Scripts/Physics/BoxShape.cs.meta b/AlienSurvival/Assets/Scripts/Physics/BoxShape.cs.meta new file mode 100644 index 0000000..03de3e1 --- /dev/null +++ b/AlienSurvival/Assets/Scripts/Physics/BoxShape.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bdcf6431eefbc384b8c38c8323bb1c89 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Scripts/Physics/CircleShape.cs b/AlienSurvival/Assets/Scripts/Physics/CircleShape.cs new file mode 100644 index 0000000..3626598 --- /dev/null +++ b/AlienSurvival/Assets/Scripts/Physics/CircleShape.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(TopDownTransform))] +public class CircleShape : ShapeBase +{ + [Tooltip("ԲģԴ˽ڵƫƣ")] + [SerializeField] private Vector2 m_Centre; + public Vector2 centre { get { return m_Centre; } set { m_Centre = value; } } + + [Tooltip("뾶TopDownռ£")] + [SerializeField] private float m_Radius; + public float radius { get { return m_Radius; } set { m_Radius = value; } } + + + +}
\ No newline at end of file diff --git a/AlienSurvival/Assets/Scripts/Physics/CircleShape.cs.meta b/AlienSurvival/Assets/Scripts/Physics/CircleShape.cs.meta new file mode 100644 index 0000000..814087d --- /dev/null +++ b/AlienSurvival/Assets/Scripts/Physics/CircleShape.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2a0bd7154c667b741961ea5ed11902e5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Scripts/Physics/PhysicsHelper.cs b/AlienSurvival/Assets/Scripts/Physics/PhysicsHelper.cs new file mode 100644 index 0000000..907ca05 --- /dev/null +++ b/AlienSurvival/Assets/Scripts/Physics/PhysicsHelper.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PhysicsHelper : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/AlienSurvival/Assets/Scripts/Physics/PhysicsHelper.cs.meta b/AlienSurvival/Assets/Scripts/Physics/PhysicsHelper.cs.meta new file mode 100644 index 0000000..8fa3233 --- /dev/null +++ b/AlienSurvival/Assets/Scripts/Physics/PhysicsHelper.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7f9f362c9de0e554a86367b068464b72 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Scripts/Physics/PolygonShape.cs b/AlienSurvival/Assets/Scripts/Physics/PolygonShape.cs new file mode 100644 index 0000000..ce17bfe --- /dev/null +++ b/AlienSurvival/Assets/Scripts/Physics/PolygonShape.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PolygonShape : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/AlienSurvival/Assets/Scripts/Physics/PolygonShape.cs.meta b/AlienSurvival/Assets/Scripts/Physics/PolygonShape.cs.meta new file mode 100644 index 0000000..6116bdb --- /dev/null +++ b/AlienSurvival/Assets/Scripts/Physics/PolygonShape.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0cb3172194a30a741861e9cbb48bfb67 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Scripts/Physics/ShapeBase.cs b/AlienSurvival/Assets/Scripts/Physics/ShapeBase.cs new file mode 100644 index 0000000..a0eba25 --- /dev/null +++ b/AlienSurvival/Assets/Scripts/Physics/ShapeBase.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ShapeBase : MonoBehaviour +{ + + +}
\ No newline at end of file diff --git a/AlienSurvival/Assets/Scripts/Physics/ShapeBase.cs.meta b/AlienSurvival/Assets/Scripts/Physics/ShapeBase.cs.meta new file mode 100644 index 0000000..3942766 --- /dev/null +++ b/AlienSurvival/Assets/Scripts/Physics/ShapeBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 765f0727121051042866a2c615ab2560 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs b/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs index e027771..6741275 100644 --- a/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs +++ b/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs @@ -21,7 +21,7 @@ public class TopDownShadowCaster : MonoBehaviour m_ShadowRenderer.flipX = flip; } - private void Start() + private void Awake() { m_Coord = GetComponent<TopDownTransform>(); m_SpriteRenderer = GetComponent<SpriteRenderer>(); @@ -42,6 +42,10 @@ public class TopDownShadowCaster : MonoBehaviour } } + private void Start() + { + } + private void Update() { if (m_Shadow == null) diff --git a/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs b/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs index db52445..b1fdefe 100644 --- a/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs +++ b/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs @@ -91,16 +91,35 @@ public class TopDownTransform : MonoBehaviour } } + // ر꣨Topdownռ䣩 + public Vector3 positionOnGround + { + set + { + Vector3 pos = position; + pos.x = value.x; + pos.y = value.y; + position = pos; + Project(); + } + get + { + Vector3 pos = position; + pos.z = 0; + return pos; + } + } + /// <summary> /// ͶӰתTransform /// </summary> public void Project() { - Vector3 pos = transform.position; + Vector3 pos = transform.localPosition; pos.x = m_LocalPosition.x; pos.y = m_LocalPosition.y + m_LocalPosition.z; - transform.position = pos; + transform.localPosition = pos; } private void Start() @@ -118,23 +137,29 @@ public class TopDownTransform : MonoBehaviour Project(); } + #region ת3Dѿռ public Vector3 Get3DPosition() { Vector3 pos = new Vector3(); pos.x = m_LocalPosition.x; pos.y = m_LocalPosition.y + m_LocalPosition.z; - pos.z = transform.position.z; + pos.z = transform.localPosition.z; return pos; } + /// <summary> + /// ע3Dռ + /// </summary> + /// <returns></returns> public Vector3 GetGround3DPosition() { Vector3 pos = new Vector3(); pos.x = m_LocalPosition.x; pos.y = m_LocalPosition.y ; - pos.z = transform.position.z; + pos.z = transform.localPosition.z; return pos; } + #endregion #if UNITY_EDITOR private void OnDrawGizmos() diff --git a/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam.anim b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam.anim new file mode 100644 index 0000000..f125f26 --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam.anim @@ -0,0 +1,95 @@ +%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: settle_beam + 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: 5314183497454637948, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - time: 0.083333336 + value: {fileID: 7114747689158101480, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - time: 0.16666667 + value: {fileID: -546730677062208037, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - time: 0.25 + value: {fileID: -3077315751541924578, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - time: 0.33333334 + value: {fileID: -6849051045364015085, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - time: 0.41666666 + value: {fileID: 2765575634951249348, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - time: 0.5 + value: {fileID: -5122767704905205251, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - time: 0.5833333 + value: {fileID: 8419926606265118939, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - time: 0.6666667 + value: {fileID: 4994827094868810135, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - time: 0.75 + value: {fileID: 5888369556829365987, guid: ee48f27c61e2ab242af1fef22b11ab9e, 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: 5314183497454637948, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - {fileID: 7114747689158101480, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - {fileID: -546730677062208037, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - {fileID: -3077315751541924578, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - {fileID: -6849051045364015085, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - {fileID: 2765575634951249348, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - {fileID: -5122767704905205251, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - {fileID: 8419926606265118939, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - {fileID: 4994827094868810135, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + - {fileID: 5888369556829365987, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8333333 + 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/Art/effects/Animations/settle_beam.anim.meta b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam.anim.meta new file mode 100644 index 0000000..c1fe8ae --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ec019e10c7e48e241aa264009f1aa48e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0 1.controller b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0 1.controller new file mode 100644 index 0000000..1cabcd2 --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0 1.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: settle_beam_0 1 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 8875476717530128124} + 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 &2383679504719575121 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: settle_beam + m_Speed: 5 + 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: ec019e10c7e48e241aa264009f1aa48e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &8875476717530128124 +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: 2383679504719575121} + m_Position: {x: 200, y: 0, 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: 2383679504719575121} diff --git a/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0 1.controller.meta b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0 1.controller.meta new file mode 100644 index 0000000..7655509 --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0 1.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 34baf969c85f0d948814f3e3f3d66f03 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0 2.controller b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0 2.controller new file mode 100644 index 0000000..1b685e3 --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0 2.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-48560227384164824 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: settle_beam + m_Speed: 1 + 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: ec019e10c7e48e241aa264009f1aa48e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: settle_beam_0 2 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 9218773850321429949} + 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!1107 &9218773850321429949 +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: -48560227384164824} + m_Position: {x: 200, y: 0, 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: -48560227384164824} diff --git a/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0 2.controller.meta b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0 2.controller.meta new file mode 100644 index 0000000..3c03f46 --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0 2.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b7e0bd4dc6bfe8f4ca820e86941fad76 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0.controller b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0.controller new file mode 100644 index 0000000..ab4447a --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-3208378665334903798 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: settle_beam + m_Speed: 3 + 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: ec019e10c7e48e241aa264009f1aa48e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: settle_beam_0 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 5256281377461985600} + 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!1107 &5256281377461985600 +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: -3208378665334903798} + m_Position: {x: 200, y: 0, 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: -3208378665334903798} diff --git a/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0.controller.meta b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0.controller.meta new file mode 100644 index 0000000..36c715d --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/effects/Animations/settle_beam_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e3eaeb54e1a4264ea38d71084ed1d29 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Art/effects/settle_beam.png b/AlienSurvival/Assets/Test/Art/effects/settle_beam.png Binary files differnew file mode 100644 index 0000000..dcd6ec1 --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/effects/settle_beam.png diff --git a/AlienSurvival/Assets/Test/Art/effects/settle_beam.png.meta b/AlienSurvival/Assets/Test/Art/effects/settle_beam.png.meta new file mode 100644 index 0000000..dd543a7 --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/effects/settle_beam.png.meta @@ -0,0 +1,348 @@ +fileFormatVersion: 2 +guid: ee48f27c61e2ab242af1fef22b11ab9e +TextureImporter: + internalIDToNameTable: + - first: + 213: 5314183497454637948 + second: settle_beam_0 + - first: + 213: 7114747689158101480 + second: settle_beam_1 + - first: + 213: -546730677062208037 + second: settle_beam_2 + - first: + 213: -3077315751541924578 + second: settle_beam_3 + - first: + 213: -6849051045364015085 + second: settle_beam_4 + - first: + 213: 2765575634951249348 + second: settle_beam_5 + - first: + 213: -5122767704905205251 + second: settle_beam_6 + - first: + 213: 8419926606265118939 + second: settle_beam_7 + - first: + 213: 4994827094868810135 + second: settle_beam_8 + - first: + 213: 5888369556829365987 + second: settle_beam_9 + 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: settle_beam_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 100 + height: 340 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c73d6053cb5cfb940800000000000000 + internalID: 5314183497454637948 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: settle_beam_1 + rect: + serializedVersion: 2 + x: 100 + y: 0 + width: 100 + height: 340 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8e9ccc6e359acb260800000000000000 + internalID: 7114747689158101480 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: settle_beam_2 + rect: + serializedVersion: 2 + x: 200 + y: 0 + width: 100 + height: 340 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bd5f5ed885f9968f0800000000000000 + internalID: -546730677062208037 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: settle_beam_3 + rect: + serializedVersion: 2 + x: 300 + y: 0 + width: 100 + height: 340 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e1d11a7d0ad2b45d0800000000000000 + internalID: -3077315751541924578 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: settle_beam_4 + rect: + serializedVersion: 2 + x: 400 + y: 0 + width: 100 + height: 340 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3106f80bc5843f0a0800000000000000 + internalID: -6849051045364015085 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: settle_beam_5 + rect: + serializedVersion: 2 + x: 500 + y: 0 + width: 100 + height: 340 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4cd9eb8236c416620800000000000000 + internalID: 2765575634951249348 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: settle_beam_6 + rect: + serializedVersion: 2 + x: 600 + y: 0 + width: 100 + height: 340 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: df9384af9e548e8b0800000000000000 + internalID: -5122767704905205251 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: settle_beam_7 + rect: + serializedVersion: 2 + x: 700 + y: 0 + width: 100 + height: 340 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: bd0fa4143a699d470800000000000000 + internalID: 8419926606265118939 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: settle_beam_8 + rect: + serializedVersion: 2 + x: 800 + y: 0 + width: 100 + height: 340 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 799d62077c0315540800000000000000 + internalID: 4994827094868810135 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: settle_beam_9 + rect: + serializedVersion: 2 + x: 900 + y: 0 + width: 100 + height: 340 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3e6e90df9e0b7b150800000000000000 + internalID: 5888369556829365987 + 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/Art/sprites/grenade/grenade.png b/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade.png Binary files differindex 95b7c83..dcc28b2 100644 --- a/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade.png +++ b/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade.png diff --git a/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade.png.meta b/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade.png.meta index ade9d3f..a83e1dd 100644 --- a/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade.png.meta +++ b/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ae59d9544d36c154fbf896d6894e83d4 +guid: d6ae1501103f7f84497a41f5044f648b TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,7 +45,7 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 9 - spritePivot: {x: 0.48601782, y: 0.21787216} + 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/Art/sprites/grenade/grenade2.png b/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade2.png Binary files differindex dcc28b2..95b7c83 100644 --- a/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade2.png +++ b/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade2.png diff --git a/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade2.png.meta b/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade2.png.meta index a83e1dd..ade9d3f 100644 --- a/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade2.png.meta +++ b/AlienSurvival/Assets/Test/Art/sprites/grenade/grenade2.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d6ae1501103f7f84497a41f5044f648b +guid: ae59d9544d36c154fbf896d6894e83d4 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,7 +45,7 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 9 - spritePivot: {x: 0.50654125, y: 0.40927163} + spritePivot: {x: 0.48601782, y: 0.21787216} spritePixelsToUnits: 32 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 diff --git a/AlienSurvival/Assets/Test/Art/sprites/weapons/b2.png b/AlienSurvival/Assets/Test/Art/sprites/weapons/b2.png Binary files differnew file mode 100644 index 0000000..5dc875f --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/sprites/weapons/b2.png diff --git a/AlienSurvival/Assets/Test/Art/sprites/weapons/b2.png.meta b/AlienSurvival/Assets/Test/Art/sprites/weapons/b2.png.meta new file mode 100644 index 0000000..850f26c --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/sprites/weapons/b2.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: e7b5e5f7550c67a41b99a2802198901f +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: 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: [] + 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/Art/ui.meta b/AlienSurvival/Assets/Test/Art/ui.meta new file mode 100644 index 0000000..bba71bc --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/ui.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ef33a0840ff07a142b4271456c59735c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Art/ui/skillicon.meta b/AlienSurvival/Assets/Test/Art/ui/skillicon.meta new file mode 100644 index 0000000..07da78f --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/ui/skillicon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b3de6ce6b3012e6469449df0534692bc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Art/ui/skillicon/plane.png b/AlienSurvival/Assets/Test/Art/ui/skillicon/plane.png Binary files differnew file mode 100644 index 0000000..2e8399b --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/ui/skillicon/plane.png diff --git a/AlienSurvival/Assets/Test/Art/ui/skillicon/plane.png.meta b/AlienSurvival/Assets/Test/Art/ui/skillicon/plane.png.meta new file mode 100644 index 0000000..740a92d --- /dev/null +++ b/AlienSurvival/Assets/Test/Art/ui/skillicon/plane.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 54562072a24f4294ab8c6d1ff34e989d +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: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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/Prefabs/character/peacemaker.prefab b/AlienSurvival/Assets/Test/Prefabs/character/peacemaker.prefab index 306d249..abe4688 100644 --- a/AlienSurvival/Assets/Test/Prefabs/character/peacemaker.prefab +++ b/AlienSurvival/Assets/Test/Prefabs/character/peacemaker.prefab @@ -141,6 +141,8 @@ MonoBehaviour: m_Zoom: {x: 0.8, y: 1} m_LaunchVfx: {fileID: 6028171587937785479, guid: e318e823156c1c542b393914abb1c0b4, type: 3} m_LaunchPoint: {fileID: 1494824567} + m_B2: {fileID: 7590146165444391131, guid: 32b87453d68755c408daadfa092ce683, type: 3} + m_SpaceBeam: {fileID: 7039965570506506514, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3} --- !u!114 &1688045720 MonoBehaviour: m_ObjectHideFlags: 0 @@ -153,7 +155,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3} m_Name: m_EditorClassIdentifier: - m_LocalPosition: {x: 7.7344294, y: 3.3912501, z: 0.9101057} + m_LocalPosition: {x: 7.7344294, y: 3.99, z: 0.9101057} m_LocalRotation: 0 m_LocalScale: {x: 0, y: 0} --- !u!114 &1688045719 diff --git a/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v1.prefab b/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v1.prefab index 81bf1e2..93193c0 100644 --- a/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v1.prefab +++ b/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v1.prefab @@ -9,11 +9,11 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3005261104311357832} + - component: {fileID: 60231121481819659} - component: {fileID: 5943453734829882683} - component: {fileID: 7513112455920660206} - component: {fileID: 6724550094487552171} - component: {fileID: 4270562339666559877} - - component: {fileID: 60231121481819659} m_Layer: 0 m_Name: grenade_v1 m_TagString: Untagged @@ -35,6 +35,21 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &60231121481819659 +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: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LocalPosition: {x: 0, y: 2.4751804, z: 0} + m_LocalRotation: 0 + m_LocalScale: {x: 0, y: 0} --- !u!212 &5943453734829882683 SpriteRenderer: m_ObjectHideFlags: 0 @@ -75,7 +90,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -1527 - m_Sprite: {fileID: 21300000, guid: ae59d9544d36c154fbf896d6894e83d4, type: 3} + m_Sprite: {fileID: 21300000, guid: d6ae1501103f7f84497a41f5044f648b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -126,18 +141,3 @@ MonoBehaviour: m_EditorClassIdentifier: m_Color: {r: 0, g: 0, b: 0, a: 0.22745098} m_Scale: {x: 1, y: 0.5} ---- !u!114 &60231121481819659 -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: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_LocalPosition: {x: 0, y: 2.4751804, z: 0} - m_LocalRotation: 0 - m_LocalScale: {x: 0, y: 0} diff --git a/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v2.prefab b/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v2.prefab new file mode 100644 index 0000000..1675d9f --- /dev/null +++ b/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v2.prefab @@ -0,0 +1,143 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7267266743187280249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 789404665169286685} + - component: {fileID: 2564142152358404510} + - component: {fileID: 8159170123667978926} + - component: {fileID: 9084381671418316606} + - component: {fileID: 1730586785962640400} + - component: {fileID: 3320513471953641861} + m_Layer: 0 + m_Name: grenade_v2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &789404665169286685 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7267266743187280249} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 2.4751804, 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!114 &2564142152358404510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7267266743187280249} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LocalPosition: {x: 0, y: 2.4751804, z: 0} + m_LocalRotation: 0 + m_LocalScale: {x: 0, y: 0} +--- !u!212 &8159170123667978926 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7267266743187280249} + 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 &9084381671418316606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7267266743187280249} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a9f0293bd6e86e43bbbefc99b5e2722, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1730586785962640400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7267266743187280249} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1ce201566412034c99687a8c5b94075, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Color: {r: 0, g: 0, b: 0, a: 0.09803922} + m_Scale: {x: 1, y: 0.5} +--- !u!114 &3320513471953641861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7267266743187280249} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0bb267c6728269489ed4f713b032db5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_GravityScale: 1 + m_ExplosionEffect: {fileID: 6158943708042931892, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} diff --git a/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v2.prefab.meta b/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v2.prefab.meta new file mode 100644 index 0000000..d091666 --- /dev/null +++ b/AlienSurvival/Assets/Test/Prefabs/grenade/grenade_v2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1f4bac184169e124eb0fc85486ec7219 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Prefabs/weapon/b2.prefab b/AlienSurvival/Assets/Test/Prefabs/weapon/b2.prefab new file mode 100644 index 0000000..428662d --- /dev/null +++ b/AlienSurvival/Assets/Test/Prefabs/weapon/b2.prefab @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7590146165232662683 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7590146165232662681} + - component: {fileID: 7590146165232662682} + m_Layer: 0 + m_Name: shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7590146165232662681 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7590146165232662683} + 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: 7590146165444391124} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7590146165232662682 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7590146165232662683} + 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: e7b5e5f7550c67a41b99a2802198901f, 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: 8.8125, y: 10.375} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7590146165444391125 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7590146165444391124} + - component: {fileID: 7590146165444391131} + m_Layer: 0 + m_Name: b2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7590146165444391124 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7590146165444391125} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.86, y: 4.17, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7590146165232662681} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7590146165444391131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7590146165444391125} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a908894d8ef917543ad67959640ec30b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Bomb: {fileID: 3320513471953641861, guid: 1f4bac184169e124eb0fc85486ec7219, type: 3} + m_Speed: 0 diff --git a/AlienSurvival/Assets/Test/Prefabs/weapon/b2.prefab.meta b/AlienSurvival/Assets/Test/Prefabs/weapon/b2.prefab.meta new file mode 100644 index 0000000..96e75f3 --- /dev/null +++ b/AlienSurvival/Assets/Test/Prefabs/weapon/b2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 32b87453d68755c408daadfa092ce683 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Prefabs/weapon/space_beam.prefab b/AlienSurvival/Assets/Test/Prefabs/weapon/space_beam.prefab new file mode 100644 index 0000000..acdbbb9 --- /dev/null +++ b/AlienSurvival/Assets/Test/Prefabs/weapon/space_beam.prefab @@ -0,0 +1,194 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &833378180519843410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8544638475443893113} + - component: {fileID: 856522015641562580} + - component: {fileID: 7449380312019425346} + - component: {fileID: 6595285140424657013} + - component: {fileID: 3972855973997788431} + m_Layer: 0 + m_Name: beam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8544638475443893113 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 833378180519843410} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 3.0223687} + m_LocalScale: {x: 0.8, y: 1.5, z: 1} + m_Children: [] + m_Father: {fileID: 2384770310529106985} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &856522015641562580 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 833378180519843410} + 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: 5314183497454637948, guid: ee48f27c61e2ab242af1fef22b11ab9e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.125, y: 10.625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &7449380312019425346 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 833378180519843410} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b7e0bd4dc6bfe8f4ca820e86941fad76, 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!114 &6595285140424657013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 833378180519843410} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: 0 + m_LocalScale: {x: 0, y: 0} +--- !u!114 &3972855973997788431 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 833378180519843410} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a9f0293bd6e86e43bbbefc99b5e2722, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2384770310529106990 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2384770310529106985} + - component: {fileID: 988214588} + - component: {fileID: 7039965570506506514} + m_Layer: 0 + m_Name: space_beam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2384770310529106985 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2384770310529106990} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7.0633717, y: 2.2460508, z: -3.0223687} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8544638475443893113} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &988214588 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2384770310529106990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LocalPosition: {x: 7.5824533, y: 2.2287643, z: 0} + m_LocalRotation: 0 + m_LocalScale: {x: 0, y: 0} +--- !u!114 &7039965570506506514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2384770310529106990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 345857a5337aab0458bb084b716eccdc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Beam: {fileID: 833378180519843410} diff --git a/AlienSurvival/Assets/Test/Prefabs/weapon/space_beam.prefab.meta b/AlienSurvival/Assets/Test/Prefabs/weapon/space_beam.prefab.meta new file mode 100644 index 0000000..c4c8051 --- /dev/null +++ b/AlienSurvival/Assets/Test/Prefabs/weapon/space_beam.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: aaee1eb6bb697a34c822ff018eca2fdf +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 d8684d9..13847c3 100644 --- a/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity +++ b/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity @@ -321,108 +321,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 ---- !u!1 &230886352 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 230886355} - - component: {fileID: 230886354} - - component: {fileID: 230886353} - m_Layer: 0 - m_Name: shadow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!95 &230886353 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 230886352} - m_Enabled: 0 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 3cbc284c6a7bd0c4ab52befd69554f58, 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 &230886354 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 230886352} - 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: -6288526288528838362, guid: 180253d8c3a9d7d49ab41c54181dae83, type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 0.28235295} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.35, y: 0.35} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &230886355 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 230886352} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -1.4899998, z: 0} - m_LocalScale: {x: 1, y: 0.6747, z: 1} - m_Children: [] - m_Father: {fileID: 1427931719} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &231104471 GameObject: m_ObjectHideFlags: 0 @@ -522,7 +420,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 231104471} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.5282884, y: 8.676869, z: 0} + m_LocalPosition: {x: 4.5282884, y: 8.813862, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -566,7 +464,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3} m_Name: m_EditorClassIdentifier: - m_LocalPosition: {x: 4.5282884, y: 8.05027, z: 0.6265991} + m_LocalPosition: {x: 4.5282884, y: 8.05027, z: 0.76359224} m_LocalRotation: 0 m_LocalScale: {x: 0, y: 0} --- !u!1 &248224694 @@ -1029,63 +927,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 320299115} m_CullTransparentMesh: 1 ---- !u!1001 &343426271 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} - propertyPath: m_RootOrder - value: 19 - objectReference: {fileID: 0} - - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6158943708042931892, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} - propertyPath: m_Name - value: eff_explosion - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} --- !u!1 &414827375 GameObject: m_ObjectHideFlags: 0 @@ -1100,6 +941,7 @@ GameObject: - component: {fileID: 414827380} - component: {fileID: 414827383} - component: {fileID: 414827381} + - component: {fileID: 414827378} m_Layer: 0 m_Name: bucket (1) m_TagString: Untagged @@ -1166,12 +1008,26 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 414827375} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 5.46383, y: 4.505465, z: 0} + m_LocalPosition: {x: 4.9995747, y: 4.5185165, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &414827378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 414827375} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0b865519e5d4f647a0dd9ea2df1236e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Centre: {x: 0, y: 0.23} + m_Size: {x: 0.8, y: 0.5} --- !u!114 &414827380 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1209,7 +1065,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3} m_Name: m_EditorClassIdentifier: - m_LocalPosition: {x: 5.46383, y: 4.505465, z: 0} + m_LocalPosition: {x: 4.9995747, y: 4.5185165, z: 0} m_LocalRotation: 0 m_LocalScale: {x: 0, y: 0} --- !u!114 &414827383 @@ -2377,7 +2233,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 844062961} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.0113106, y: 7.0797606, z: 0} + m_LocalPosition: {x: 2.1415555, y: 8.509748, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -2421,7 +2277,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3} m_Name: m_EditorClassIdentifier: - m_LocalPosition: {x: 2.0113106, y: 6.301758, z: 0.778003} + m_LocalPosition: {x: 2.1415555, y: 6.2179737, z: 2.2917752} m_LocalRotation: 0 m_LocalScale: {x: 0, y: 0} --- !u!1 &917445573 @@ -2706,6 +2562,126 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 +--- !u!1 &1038914700 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1038914701} + - component: {fileID: 1038914704} + - component: {fileID: 1038914703} + - component: {fileID: 1038914702} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1038914701 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038914700} + 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: 1999573813} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -241, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1038914702 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038914700} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 1 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1038914703} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1038914703 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038914700} + 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: 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_Sprite: {fileID: 21300000, guid: 54562072a24f4294ab8c6d1ff34e989d, 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 &1038914704 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038914700} + m_CullTransparentMesh: 1 --- !u!1 &1114703345 GameObject: m_ObjectHideFlags: 0 @@ -2880,6 +2856,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1523503809} + - {fileID: 1999573813} m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3240,15 +3217,17 @@ GameObject: - component: {fileID: 1427931719} - component: {fileID: 1427931718} - component: {fileID: 1427931717} - - component: {fileID: 1427931720} - component: {fileID: 1427931721} + - component: {fileID: 1427931723} + - component: {fileID: 1427931722} + - component: {fileID: 1427931720} m_Layer: 0 m_Name: wasp (robot_s_0) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!95 &1427931717 Animator: serializedVersion: 3 @@ -3327,10 +3306,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1427931716} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 7.23, y: 11.84, z: 0} + m_LocalPosition: {x: 7.306535, y: 10.096827, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 230886355} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3343,12 +3321,11 @@ MonoBehaviour: m_GameObject: {fileID: 1427931716} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 780072e6ea35d1f4abd930754c5e9c9f, type: 3} + m_Script: {fileID: 11500000, guid: f1ce201566412034c99687a8c5b94075, type: 3} m_Name: m_EditorClassIdentifier: - m_Shadow: {fileID: 230886355} - m_Coord: {x: 0, y: 0, z: 0} - m_Height: 1.49 + m_Color: {r: 0, g: 0, b: 0, a: 0.22745098} + m_Scale: {x: 1, y: 0.5} --- !u!114 &1427931721 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3361,8 +3338,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 37e797e79063cdf4883cf54509d9ddc3, type: 3} m_Name: m_EditorClassIdentifier: - m_Follow: {fileID: 0} - m_Shadow: {fileID: 230886354} + m_Follow: {fileID: 1688045720} m_MoveSpeed: 3 m_Radius: 1 m_Sprites: @@ -3378,6 +3354,33 @@ MonoBehaviour: - {fileID: 9042566863165104875, guid: 180253d8c3a9d7d49ab41c54181dae83, type: 3} - {fileID: -8864411382570001971, guid: 180253d8c3a9d7d49ab41c54181dae83, type: 3} - {fileID: 5890319961958191015, guid: 180253d8c3a9d7d49ab41c54181dae83, type: 3} +--- !u!114 &1427931722 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1427931716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a9f0293bd6e86e43bbbefc99b5e2722, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1427931723 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1427931716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LocalPosition: {x: 7.306535, y: 8.888659, z: 1.2081676} + m_LocalRotation: 0 + m_LocalScale: {x: 0, y: 0} --- !u!1 &1494583546 GameObject: m_ObjectHideFlags: 0 @@ -3571,12 +3574,12 @@ GameObject: - component: {fileID: 1523503811} - component: {fileID: 1523503810} m_Layer: 5 - m_Name: Image + m_Name: LevelBar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1523503809 RectTransform: m_ObjectHideFlags: 0 @@ -4142,6 +4145,126 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1625536119 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1625536120} + - component: {fileID: 1625536122} + - component: {fileID: 1625536121} + - component: {fileID: 1625536123} + m_Layer: 5 + m_Name: Skill_Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1625536120 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625536119} + 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: 1999573813} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -400, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1625536121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625536119} + 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: 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_Sprite: {fileID: 21300000, guid: 54562072a24f4294ab8c6d1ff34e989d, 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 &1625536122 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625536119} + m_CullTransparentMesh: 1 +--- !u!114 &1625536123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625536119} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 1 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1625536121} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1655800953 GameObject: m_ObjectHideFlags: 0 @@ -4387,6 +4510,17 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1688045720 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1688045720, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} + m_PrefabInstance: {fileID: 8582758514292956423} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1698128100 GameObject: m_ObjectHideFlags: 0 @@ -4924,22 +5058,13 @@ GameObject: 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 + m_IsActive: 1 --- !u!20 &1856618384 Camera: m_ObjectHideFlags: 0 @@ -5441,6 +5566,52 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 +--- !u!1 &1999573812 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1999573813} + - component: {fileID: 1999573815} + m_Layer: 5 + m_Name: SkillBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1999573813 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1999573812} + 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: 1625536120} + - {fileID: 1038914701} + m_Father: {fileID: 1127821130} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 32, y: -28} + m_SizeDelta: {x: 926, y: 100} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1999573815 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1999573812} + m_CullTransparentMesh: 1 --- !u!1 &2099529917 GameObject: m_ObjectHideFlags: 0 @@ -5666,7 +5837,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8582758513482715753, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} propertyPath: m_LocalPosition.y - value: 4.301356 + value: 4.9001055 objectReference: {fileID: 0} - target: {fileID: 8582758513482715753, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} propertyPath: m_LocalPosition.z @@ -5708,9 +5879,5 @@ PrefabInstance: propertyPath: m_Camera value: objectReference: {fileID: 976849206} - - target: {fileID: 8582758513714280099, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} diff --git a/AlienSurvival/Assets/Test/Scripts/TestB2.cs b/AlienSurvival/Assets/Test/Scripts/TestB2.cs new file mode 100644 index 0000000..532c254 --- /dev/null +++ b/AlienSurvival/Assets/Test/Scripts/TestB2.cs @@ -0,0 +1,79 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class TestB2 : MonoBehaviour +{ + [SerializeField] private TestBomb m_Bomb; + [SerializeField] private float m_Speed; + + private Vector3 m_From; + private Vector3 m_To; + + private Coroutine m_CoBomb; + + Vector3 direction + { + get + { + return (m_To - m_From).normalized; + } + } + + /// <summary> + /// from to 3dռ + /// </summary> + /// <param name="from"></param> + /// <param name="to"></param> + public void Set(Vector3 from, Vector3 to, float speed, float lifeTime) + { + m_From = from; + m_To = to; + m_Speed = speed; + + transform.position = from; + + this.gameObject.SetActive(true); + + m_CoBomb = StartCoroutine(coBomb(0.1f)); + + Invoke("DestroySelf", lifeTime); + } + + void DestroySelf() + { + if (m_CoBomb != null) + { + StopCoroutine(m_CoBomb); + m_CoBomb = null; + } + this.gameObject.SetActive(false); + Destroy(this.gameObject); + } + + private void Update() + { + Vector3 pos = transform.position; + pos += direction * m_Speed * Time.deltaTime; + + transform.position = pos; + } + + IEnumerator coBomb(float interval) + { + while (true) + { + Vector3 pos = transform.position; + for(int i = 0; i < 1; ++i) + { + TestBomb grenade = Instantiate<TestBomb>(m_Bomb); + Vector3 position = new Vector3(pos.x + Random.Range(-3, 3), pos.y + Random.Range(-5f, 5f), 7f); + grenade.Set(position, new Vector3(0, 0, -1f), Random.Range(8f, 10f)); + grenade.gameObject.SetActive(true); + } + + yield return new WaitForSeconds(interval); + } + } + +} diff --git a/AlienSurvival/Assets/Test/Scripts/TestB2.cs.meta b/AlienSurvival/Assets/Test/Scripts/TestB2.cs.meta new file mode 100644 index 0000000..1e507c7 --- /dev/null +++ b/AlienSurvival/Assets/Test/Scripts/TestB2.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a908894d8ef917543ad67959640ec30b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Scripts/TestBomb.cs b/AlienSurvival/Assets/Test/Scripts/TestBomb.cs new file mode 100644 index 0000000..77933f4 --- /dev/null +++ b/AlienSurvival/Assets/Test/Scripts/TestBomb.cs @@ -0,0 +1,67 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class TestBomb : MonoBehaviour +{ + + [SerializeField] private float m_GravityScale = 1f; + + [SerializeField] private GameObject m_ExplosionEffect; + + private TopDownTransform m_Coords; + + private Vector3 GRAVITY = new Vector3(0, 0, -9.8f); + + private Vector3 m_Velocity; // x, y, fakeHeight + + /// <summary> + /// óʼfakeռ + /// </summary> + /// <param name="initPosition"></param> + /// <param name="initDirection"></param> + /// <param name="initSpeed"></param> + public void Set(Vector3 initPosition, Vector3 initDirection, float initSpeed) + { + m_Coords = GetComponent<TopDownTransform>(); + m_Coords.position = initPosition; + + m_Velocity = initDirection * initSpeed; + } + + private void Update() + { + Vector3 move = m_Velocity * Time.deltaTime; + + if (m_Velocity.magnitude > 0 && m_Coords.z + move.z >= 0) + { + m_Coords.x += move.x; + m_Coords.y += move.y; + m_Coords.z += move.z; + m_Velocity += GRAVITY * Time.deltaTime; + + //transform.rotation *= Quaternion.Euler(0, 0, 20 * m_Velocity.magnitude * Time.deltaTime); + } + else + { + m_Velocity = Vector3.zero; + + this.gameObject.SetActive(false); + Destroy(this.gameObject); + PlayExplosion(); + } + } + + private void PlayExplosion() + { + GameObject exp = Instantiate<GameObject>(m_ExplosionEffect); + + TopDownTransform coord = exp.GetComponent<TopDownTransform>(); + coord.position = m_Coords.position; + + exp.GetComponent<TopDownSorting>().Sorting(); + + exp.SetActive(true); + } + +} diff --git a/AlienSurvival/Assets/Test/Scripts/TestBomb.cs.meta b/AlienSurvival/Assets/Test/Scripts/TestBomb.cs.meta new file mode 100644 index 0000000..06d61d2 --- /dev/null +++ b/AlienSurvival/Assets/Test/Scripts/TestBomb.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c0bb267c6728269489ed4f713b032db5 +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 9e47407..f685e15 100644 --- a/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs +++ b/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs @@ -16,6 +16,8 @@ public class TestPeaceMaker : MonoBehaviour [SerializeField] private Vector2 m_Zoom; [SerializeField] private GameObject m_LaunchVfx; [SerializeField] private Transform m_LaunchPoint; + [SerializeField] private TestB2 m_B2; + [SerializeField] private TestSpaceBeam m_SpaceBeam; private Vector3 zoomIn { @@ -76,6 +78,10 @@ public class TestPeaceMaker : MonoBehaviour bool isFire = Fire(); bool isGrenade = LaunchGrenade(); + CallB2(); + + //SpaceBeam(); + CameraFollow(); CameraZoom(/*isMove ||*/ isFire || isGrenade); @@ -280,4 +286,26 @@ public class TestPeaceMaker : MonoBehaviour } } + void CallB2() + { + if(Input.GetButtonDown("Fire3")) + { + TestB2 b2 = Instantiate<TestB2>(m_B2); + + Vector3 pos3D = m_Coord.Get3DPosition(); + b2.Set(pos3D + new Vector3(-15, 0,0 ), pos3D + new Vector3(15, 0,0 ), 20f, 3f); + } + } + + void SpaceBeam() + { + if (Input.GetButtonDown("Fire3")) + { + TestSpaceBeam beam = Instantiate<TestSpaceBeam>(m_SpaceBeam); + + Vector3 pos3D = m_Coord.position; + beam.Set(pos3D + new Vector3(3, 0, 0)); + } + } + } diff --git a/AlienSurvival/Assets/Test/Scripts/TestSpaceBeam.cs b/AlienSurvival/Assets/Test/Scripts/TestSpaceBeam.cs new file mode 100644 index 0000000..3683e43 --- /dev/null +++ b/AlienSurvival/Assets/Test/Scripts/TestSpaceBeam.cs @@ -0,0 +1,70 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// ̫ +/// </summary> +public class TestSpaceBeam : MonoBehaviour +{ + [SerializeField] private GameObject m_Beam; + + TopDownTransform m_Coord; + + List<GameObject> m_Beams = new List<GameObject>(); + + float m_RotateSpeed = 5f; + + float m_Radius = 1f; + + int count = 8; + + float m_CurrentAngle = 0; + + private void Awake() + { + m_Coord = GetComponent<TopDownTransform>(); + } + + public void Set(Vector3 posTDS) + { + m_Coord.position = posTDS; + + Vector3 groundPos = m_Coord.positionOnGround; + + for(int i = 0; i < count; ++i) + { + float angle = Mathf.PI * 2f / (float)count * i; + Vector3 pos = /*groundPos +*/ new Vector3(m_Radius * Mathf.Cos(angle), m_Radius * Mathf.Sin(angle), 0f); + GameObject beam = Instantiate<GameObject>(m_Beam, this.transform); + beam.GetComponent<TopDownTransform>().position = pos; + beam.SetActive(true); + m_Beams.Add(beam); + } + } + + void Update() + { + m_CurrentAngle += m_RotateSpeed * Time.deltaTime; + + RotateBeams(m_CurrentAngle); + } + + /// <summary> + /// ת + /// </summary> + /// <param name="angle"></param> + void RotateBeams(float angle) + { + Vector3 groundPos = m_Coord.positionOnGround; + + for (int i = 0; i < m_Beams.Count; ++i) + { + float rad = angle + Mathf.PI * 2f / (float)count * i; + Vector3 pos = /*groundPos + */new Vector3(m_Radius * Mathf.Cos(rad), m_Radius * Mathf.Sin(rad), 0f); + m_Beams[i].GetComponent<TopDownTransform>().position = pos; + } + + } + +} diff --git a/AlienSurvival/Assets/Test/Scripts/TestSpaceBeam.cs.meta b/AlienSurvival/Assets/Test/Scripts/TestSpaceBeam.cs.meta new file mode 100644 index 0000000..3e008d2 --- /dev/null +++ b/AlienSurvival/Assets/Test/Scripts/TestSpaceBeam.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 345857a5337aab0458bb084b716eccdc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AlienSurvival/Assets/Test/Scripts/TestWaspRobot.cs b/AlienSurvival/Assets/Test/Scripts/TestWaspRobot.cs index 665c406..3a73d21 100644 --- a/AlienSurvival/Assets/Test/Scripts/TestWaspRobot.cs +++ b/AlienSurvival/Assets/Test/Scripts/TestWaspRobot.cs @@ -4,14 +4,12 @@ using UnityEngine; public class TestWaspRobot : MonoBehaviour { - [SerializeField] private TestFakeHeight m_Follow; - - [SerializeField] private SpriteRenderer m_Shadow; + [SerializeField] private TopDownTransform m_Follow; [SerializeField] private float m_MoveSpeed; private SpriteRenderer m_SpriteRenderer; - private TestFakeHeight m_Coords; + private TopDownTransform m_Coords; // wasp [SerializeField] private float m_Radius; @@ -38,7 +36,7 @@ public class TestWaspRobot : MonoBehaviour private void Start() { m_SpriteRenderer = GetComponent<SpriteRenderer>(); - m_Coords = GetComponent<TestFakeHeight>(); + m_Coords = GetComponent<TopDownTransform>(); m_Following = false; m_Angle = 0; @@ -94,8 +92,6 @@ public class TestWaspRobot : MonoBehaviour float rad = GetAngleToTarget(); - Debug.Log(rad * Mathf.Rad2Deg); - int index = GetSpriteIndex(rad); SetSprite(index); } @@ -144,7 +140,6 @@ public class TestWaspRobot : MonoBehaviour void SetSprite(int index) { m_SpriteRenderer.sprite = m_Sprites[index]; - m_Shadow.sprite = m_Sprites[index]; } } diff --git a/AlienSurvival/Assets/Tools/EditorGUIHelper/Editor/EditorHandlesHelper.cs b/AlienSurvival/Assets/Tools/EditorGUIHelper/Editor/EditorHandlesHelper.cs index fb9fb53..6a07ab4 100644 --- a/AlienSurvival/Assets/Tools/EditorGUIHelper/Editor/EditorHandlesHelper.cs +++ b/AlienSurvival/Assets/Tools/EditorGUIHelper/Editor/EditorHandlesHelper.cs @@ -8,6 +8,7 @@ using UnityEditor; // Scene视图中的自定义handles public static class EditorHandlesHelper { + static int s_ValueScaleHandleHash; static int s_PositionArrowHandleHash; diff --git a/Art/源文件/特效/settle_beam-Sheet.png b/Art/源文件/特效/settle_beam-Sheet.png Binary files differnew file mode 100644 index 0000000..6fca301 --- /dev/null +++ b/Art/源文件/特效/settle_beam-Sheet.png diff --git a/Art/源文件/特效/settle_beam-Sheet_pure.png b/Art/源文件/特效/settle_beam-Sheet_pure.png Binary files differnew file mode 100644 index 0000000..09b8014 --- /dev/null +++ b/Art/源文件/特效/settle_beam-Sheet_pure.png diff --git a/Art/源文件/特效/settle_beam-Sheet_pure_small.png b/Art/源文件/特效/settle_beam-Sheet_pure_small.png Binary files differnew file mode 100644 index 0000000..b4fa8dd --- /dev/null +++ b/Art/源文件/特效/settle_beam-Sheet_pure_small.png diff --git a/Art/源文件/特效/settle_beam.gif b/Art/源文件/特效/settle_beam.gif Binary files differnew file mode 100644 index 0000000..cd159c2 --- /dev/null +++ b/Art/源文件/特效/settle_beam.gif |
