you really gotta calm down, marisa...

This commit is contained in:
Sylvia 2026-02-13 00:21:59 -08:00
parent 13bb58ea03
commit b9fb490dce
68 changed files with 990 additions and 44 deletions

View file

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &4806008101797467748 --- !u!1 &554774547771524288
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -8,40 +8,37 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 8258649627709469250} - component: {fileID: 4845256703653450112}
- component: {fileID: 6349442989841225491} - component: {fileID: 3366910313495688115}
- component: {fileID: 4462715779770199878}
- component: {fileID: 4942254205620830605}
- component: {fileID: 41144518337917555}
m_Layer: 7 m_Layer: 7
m_Name: BasicProjectile m_Name: Sprite
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &8258649627709469250 --- !u!4 &4845256703653450112
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4806008101797467748} m_GameObject: {fileID: 554774547771524288}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.6, y: 0.2, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 8258649627709469250}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &6349442989841225491 --- !u!212 &3366910313495688115
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4806008101797467748} m_GameObject: {fileID: 554774547771524288}
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
@ -90,6 +87,41 @@ SpriteRenderer:
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!1 &4806008101797467748
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8258649627709469250}
- component: {fileID: 4462715779770199878}
- component: {fileID: 4942254205620830605}
- component: {fileID: 41144518337917555}
m_Layer: 7
m_Name: BasicProjectile
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8258649627709469250
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4806008101797467748}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.6, y: 0.2, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4845256703653450112}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &4462715779770199878 --- !u!50 &4462715779770199878
Rigidbody2D: Rigidbody2D:
serializedVersion: 5 serializedVersion: 5

View file

@ -78,7 +78,7 @@ SpriteRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} m_Sprite: {fileID: -7312781290140997224, guid: 422cf2b841091f2878beffe6b9721e13, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
@ -127,7 +127,7 @@ BoxCollider2D:
m_SpriteTilingProperty: m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 1} oldSize: {x: 0.32, y: 0.32}
newSize: {x: 1, y: 1} newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5 adaptiveTilingThreshold: 0.5
drawMode: 0 drawMode: 0

View file

@ -605,9 +605,9 @@ MonoBehaviour:
inputHandler: {fileID: 4421559795750709312} inputHandler: {fileID: 4421559795750709312}
thisPlayer: {fileID: 5275979051295637757} thisPlayer: {fileID: 5275979051295637757}
mainAttack: {fileID: 8579369158027197764, guid: d695e39a8ed83e67aa09d75b33cf7bb3, type: 3} mainAttack: {fileID: 8579369158027197764, guid: d695e39a8ed83e67aa09d75b33cf7bb3, type: 3}
secondaryAttack: {fileID: 8579369158027197764, guid: d695e39a8ed83e67aa09d75b33cf7bb3, type: 3} secondaryAttack: {fileID: 8579369158027197764, guid: fc8f0e7853997c463b72085306621f40, type: 3}
spellA: {fileID: 2212103048918046095, guid: 2d849b52879286a90a56fa3955e0adb6, type: 3} spellA: {fileID: 2212103048918046095, guid: 2d849b52879286a90a56fa3955e0adb6, type: 3}
spellB: {fileID: 8579369158027197764, guid: d695e39a8ed83e67aa09d75b33cf7bb3, type: 3} spellB: {fileID: 2202756030888818067, guid: 91297fef450704432837e8de1bda05d7, type: 3}
mainAttackInstance: {fileID: 0} mainAttackInstance: {fileID: 0}
secondaryAttackInstance: {fileID: 0} secondaryAttackInstance: {fileID: 0}
spellAInstance: {fileID: 0} spellAInstance: {fileID: 0}
@ -834,8 +834,8 @@ MonoBehaviour:
speed: 8 speed: 8
cam: {fileID: 0} cam: {fileID: 0}
mouseWorldPos: {x: 0, y: 0} mouseWorldPos: {x: 0, y: 0}
firingPoint: {fileID: 6266582235186827771}
firingPointBase: {fileID: 1955417614592701310} firingPointBase: {fileID: 1955417614592701310}
firingPoint: {fileID: 6266582235186827771}
--- !u!1 &6396436912902618782 --- !u!1 &6396436912902618782
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View file

@ -0,0 +1,109 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3204262992054338593
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6210518781829362723}
- component: {fileID: 2202756030888818067}
m_Layer: 0
m_Name: Nondirectional Laser
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6210518781829362723
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3204262992054338593}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7779692706452483871}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2202756030888818067
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3204262992054338593}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b2d9c1454ecf94f459c14e302b316986, type: 3}
m_Name:
m_EditorClassIdentifier:
abilityName: Non-Directional Laser
abilityIcon: {fileID: 0}
thisPlayer: {fileID: 0}
canCooldown: 1
cooldown: 4
power: 0
projectileCount: 0
length: 10
width: 1
duration: 6
beamObject: {fileID: 9142983110258810315, guid: 5c95f1061d0b0a13694b57cb8a14866c, type: 3}
turnSpeed: 90
offset: 1
enemyList: []
damageDebounceTime: 1
beamCount: 3
beamRoot: {fileID: 7779692706452483871}
--- !u!1 &9084770363101550945
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7779692706452483871}
- component: {fileID: 5508965572157376725}
m_Layer: 0
m_Name: BeamRoot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7779692706452483871
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9084770363101550945}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6210518781829362723}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5508965572157376725
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9084770363101550945}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 367cdbe920b6609c2a25c4624980f56a, type: 3}
m_Name:
m_EditorClassIdentifier:
rotationSpeed: 360

View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 91297fef450704432837e8de1bda05d7
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,228 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4806008101797467748
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8258649627709469250}
- component: {fileID: 4462715779770199878}
- component: {fileID: 4942254205620830605}
- component: {fileID: 41144518337917555}
m_Layer: 7
m_Name: StarProjectile
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8258649627709469250
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4806008101797467748}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.8, y: 0.8, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6967225298403824989}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &4462715779770199878
Rigidbody2D:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4806008101797467748}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDamping: 0
m_AngularDamping: 0.05
m_GravityScale: 0
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!61 &4942254205620830605
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4806008101797467748}
m_Enabled: 1
serializedVersion: 3
m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ForceSendLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ForceReceiveLayers:
serializedVersion: 2
m_Bits: 4294967295
m_ContactCaptureLayers:
serializedVersion: 2
m_Bits: 4294967295
m_CallbackLayers:
serializedVersion: 2
m_Bits: 4294967295
m_IsTrigger: 1
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 0.87333333, y: 0.80833334}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Size: {x: 0.8, y: 0.8}
m_EdgeRadius: 0
--- !u!114 &41144518337917555
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4806008101797467748}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e66b3403d93ec8803822e3a85537224b, type: 3}
m_Name:
m_EditorClassIdentifier:
damage: 0
speed: 0
pierceAmount: 0
lifetime: 0
rb: {fileID: 4462715779770199878}
--- !u!1 &7745693115359622977
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6967225298403824989}
- component: {fileID: 8600968611477201350}
- component: {fileID: 3448069185617087958}
m_Layer: 7
m_Name: ProjectileSprite
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6967225298403824989
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7745693115359622977}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8258649627709469250}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8600968611477201350
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7745693115359622977}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 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: 4815476061570213978, guid: 04471894fe003265dad2be86950ab969, type: 3}
m_Color: {r: 1, g: 0.982556, b: 0.4009434, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &3448069185617087958
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7745693115359622977}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 367cdbe920b6609c2a25c4624980f56a, type: 3}
m_Name:
m_EditorClassIdentifier:
rotationSpeed: 270

View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8bf6ae3b3a5d1e7a784e85e314faf58a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,61 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3204262992054338593
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6210518781829362723}
- component: {fileID: 8579369158027197764}
m_Layer: 0
m_Name: Stardust
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6210518781829362723
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3204262992054338593}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8579369158027197764
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3204262992054338593}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62c2c7dce05d07c06b237843ff48ab2e, type: 3}
m_Name:
m_EditorClassIdentifier:
abilityName: Stardust
abilityIcon: {fileID: 0}
thisPlayer: {fileID: 0}
canCooldown: 1
cooldown: 0.1
power: 10
projectileCount: 3
pierceAmount: 0
accuracy: 60
bulletLifetime: 3
projectileSpeed: 20
fireMode: 1
offset: {x: 1, y: 1}
angle: 0
projectile: {fileID: 41144518337917555, guid: 8bf6ae3b3a5d1e7a784e85e314faf58a, type: 3}

View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fc8f0e7853997c463b72085306621f40
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1587,6 +1587,37 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 641813897} m_GameObject: {fileID: 641813897}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &689402300
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 689402301}
m_Layer: 0
m_Name: Pickup
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &689402301
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 689402300}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.4307132, y: -0.1515338, z: 0.6842527}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &720841234 --- !u!1 &720841234
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5958,3 +5989,4 @@ SceneRoots:
- {fileID: 844020320} - {fileID: 844020320}
- {fileID: 1319590957} - {fileID: 1319590957}
- {fileID: 1935311237} - {fileID: 1935311237}
- {fileID: 689402301}

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ce5b9aa19d661c5e2b40ef0a74d1989c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1,4 +1,5 @@
using System; using System;
using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
@ -19,9 +20,18 @@ public class AbilityManager : MonoBehaviour
} }
#endregion #endregion
public class StoredUpgrade
{
public AbilityUpgrade upgrade;
public int count;
}
public MarisaAbilityHandler player; public MarisaAbilityHandler player;
public AbilityUpgrade upgradeToAdd; public AbilityUpgrade upgradeToAdd;
public Button upgradeButton; public Button upgradeButton;
[Header("Upgrades")]
public List<StoredUpgrade> upgradesInventory;
private void Start() private void Start()
{ {
upgradeButton.onClick.AddListener((() => AddUpgrade(upgradeToAdd, player.mainAttackInstance))); upgradeButton.onClick.AddListener((() => AddUpgrade(upgradeToAdd, player.mainAttackInstance)));

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fe5e49884c882fcd5b60c9d30927a02f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -9,17 +9,16 @@ public class Laser : PlayerAbility
public float length; public float length;
public float width; public float width;
public float duration; public float duration;
private float currentDuration; protected float currentDuration;
[Header("Beam")] [Header("Beam")]
[SerializeField] private BeamCollider beamObject; [SerializeField] protected BeamCollider beamObject;
private BeamCollider beamObjectInstance; private BeamCollider beamObjectInstance;
public float turnSpeed; public float turnSpeed;
public float offset; public float offset;
[Header("Weapon Properties")] [Header("Weapon Properties")]
[HideInInspector] public List<Entity> enemyList = new(); [HideInInspector] public List<Entity> enemyList = new();
public float damageDebounceTime; public float damageDebounceTime;
private float currentDebounce; protected float currentDebounce;
public float damage;
private void Start() private void Start()
{ {
CreateBeam(); CreateBeam();
@ -36,6 +35,7 @@ public class Laser : PlayerAbility
protected override void Update() protected override void Update()
{ {
base.Update();
if (currentDuration > 0) if (currentDuration > 0)
{ {
Vector3 direction = (thisPlayer.mouseWorldPos - (Vector2)transform.position).normalized; Vector3 direction = (thisPlayer.mouseWorldPos - (Vector2)transform.position).normalized;
@ -54,7 +54,7 @@ public class Laser : PlayerAbility
enemyList.Remove(enemy); enemyList.Remove(enemy);
continue; continue;
} }
enemy.TakeDamage(damage); enemy.TakeDamage(power);
} }
currentDebounce = damageDebounceTime; currentDebounce = damageDebounceTime;
} }
@ -67,7 +67,7 @@ public class Laser : PlayerAbility
} }
} }
private void CreateBeam() protected virtual void CreateBeam()
{ {
beamObjectInstance = Instantiate(beamObject, transform.position, Quaternion.identity); beamObjectInstance = Instantiate(beamObject, transform.position, Quaternion.identity);
beamObjectInstance.transform.SetParent(transform); beamObjectInstance.transform.SetParent(transform);
@ -76,4 +76,6 @@ public class Laser : PlayerAbility
beamObjectInstance.thisLaser = this; beamObjectInstance.thisLaser = this;
beamObjectInstance.gameObject.SetActive(false); beamObjectInstance.gameObject.SetActive(false);
} }
//maybe we should've made this a projectile instead of an ability lol
//its ok we can work with this still
} }

View file

@ -0,0 +1,66 @@
using System.Collections.Generic;
using UnityEngine;
public class NondirectionalLaser : Laser
{
[SerializeField] private int beamCount = 1;
[SerializeField] private Transform beamRoot;
private List<BeamCollider> beamInstances = new();
protected override void AbilityEffects()
{
canCooldown = false;
currentDuration = duration;
currentDebounce = damageDebounceTime;
beamRoot.gameObject.SetActive(true);
}
protected override void Update()
{
//we're doing this the stupid way i guess because i am stupid
if (currentCooldown > 0)
{
currentCooldown -= Time.deltaTime;
}
if (currentDuration > 0)
{
// i think i can just put spinobject in it and that'll work lol
if (currentDebounce > 0)
{
currentDebounce -= Time.deltaTime;
if (currentDebounce <= 0)
{
foreach (Entity enemy in enemyList.ToArray())
{
if (!enemy)
{
enemyList.Remove(enemy);
continue;
}
enemy.TakeDamage(power);
}
currentDebounce = damageDebounceTime;
}
}
if (currentDuration <= 0)
{
canCooldown = true;
beamRoot.gameObject.SetActive(false);
}
}
}
protected override void CreateBeam()
{
float rotationAmount = 360f / beamCount;
for (int i = 0; i < beamCount; i++)
{
BeamCollider newBeamObjectInstance = Instantiate(beamObject, transform.position, Quaternion.identity);
beamInstances.Add(newBeamObjectInstance);
newBeamObjectInstance.transform.SetParent(beamRoot);
newBeamObjectInstance.transform.localScale = new Vector3(length, width, 1);
newBeamObjectInstance.transform.Translate(Vector3.right * (newBeamObjectInstance.transform.localScale.x * 0.5f) + new Vector3(offset, 0, 0));
newBeamObjectInstance.transform.RotateAround(beamRoot.position, Vector3.forward, rotationAmount * i);
newBeamObjectInstance.thisLaser = this;
}
beamRoot.gameObject.SetActive(false);
}
}

View file

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: b2d9c1454ecf94f459c14e302b316986

View file

@ -11,7 +11,7 @@ public class PlayerAbility : MonoBehaviour
[Header("Cooldown")] [Header("Cooldown")]
public bool canCooldown = true; public bool canCooldown = true;
public float cooldown; public float cooldown;
private float currentCooldown; protected float currentCooldown;
[Header("Stats")] [Header("Stats")]
public float power; public float power;
public float projectileCount; public float projectileCount;

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d560cfe20a1ec7b0581a0390c4d45434
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,10 @@
using UnityEngine;
public class UpgradePickup : ItemPickup
{
public AbilityUpgrade upgradeDropped;
protected override void PickupEffects()
{
}
}

View file

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 414126e6ddc5f8085af89e294a8deb38

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6183f2d2f1a7e93008ff448fa746c3d4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 899dfdf2c7b4ad4718c8f5ee206bdf9a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -18,7 +18,12 @@ public class ItemPickup : MonoBehaviour
private void OnTriggerEnter2D(Collider2D other) private void OnTriggerEnter2D(Collider2D other)
{ {
//pick up PickupEffects();
Destroy(gameObject); Destroy(gameObject);
} }
protected virtual void PickupEffects()
{
}
} }

View file

@ -0,0 +1,10 @@
using UnityEngine;
public class PowerPickup : ItemPickup
{
[SerializeField] private float powerAmount;
protected override void PickupEffects()
{
}
}

View file

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: dac707185c38816bbb658ebbb2885694

View file

@ -1,16 +0,0 @@
using UnityEngine;
public class MasterSpark : MonoBehaviour
{
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

View file

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: e3b3742e855c4c7b499ab482efa2143e

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: edb470ba0d075ab9d88588b4dc6d02b5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,10 @@
using UnityEngine;
public class SpinSprite : MonoBehaviour
{
[SerializeField] private float rotationSpeed;
void Update()
{
transform.eulerAngles = new Vector3(0, 0, transform.eulerAngles.z + (rotationSpeed * Time.deltaTime));
}
}

View file

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 367cdbe920b6609c2a25c4624980f56a

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 B

View file

@ -0,0 +1,156 @@
fileFormatVersion: 2
guid: 422cf2b841091f2878beffe6b9721e13
TextureImporter:
internalIDToNameTable:
- first:
213: -7312781290140997224
second: mastersparkbeam_0
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: mastersparkbeam_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 32
height: 32
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 899e5015928c38a90800000000000000
internalID: -7312781290140997224
vertices: []
indices:
edges: []
weights: []
outline: []
customData:
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable:
mastersparkbeam_0: -7312781290140997224
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Sprites/star.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View file

@ -0,0 +1,156 @@
fileFormatVersion: 2
guid: 04471894fe003265dad2be86950ab969
TextureImporter:
internalIDToNameTable:
- first:
213: 4815476061570213978
second: star_0
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
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: 600
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: star_0
rect:
serializedVersion: 2
x: 38
y: 57
width: 524
height: 485
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: a582a4ae6f104d240800000000000000
internalID: 4815476061570213978
vertices: []
indices:
edges: []
weights: []
outline: []
customData:
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable:
star_0: 4815476061570213978
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant: