FUUUUUUUUUUUCK

2022-04-03 18:53:48 +03:00 · 2022-04-03 18:53:48 +03:00 · a27511b6f5
commit a27511b6f5
parent 507cbfea2b
14 changed files with 933056 additions and 29 deletions
--- a/ldjam50/Assets/Scenes/MainGui.unity
+++ b/ldjam50/Assets/Scenes/MainGui.unity
--- a/ldjam50/Assets/Scenes/SampleScene.unity
+++ b/ldjam50/Assets/Scenes/SampleScene.unity
--- a/ldjam50/Assets/Scripts/OverMind.cs
+++ b/ldjam50/Assets/Scripts/OverMind.cs
@ -146,7 +146,7 @@ IEnumerator spawnMobsCourutine()
            // mobToSpawn.parent = activeMobs.transform;
            // mobToSpawn.gameObject.SetActive(true);
            
-            var mobToSpawn = mobs[Random.Range(0, mobs.Count-1)];
+            var mobToSpawn = mobs[Random.Range(0, mobs.Count)];
            var mobToSpawnObject = Instantiate(mobToSpawn.mobPrefab ,activeMobs.transform);
            mobToSpawnObject.transform.position = GenerateRandomSpawnMobPoint();
            mobToSpawnObject.GetComponent<Mob>().SetupMob(mobToSpawn, balanceScale);
--- a/ldjam50/Assets/Sprites/Bosses/Heavy/BossHeavyAnimation.anim
+++ b/ldjam50/Assets/Sprites/Bosses/Heavy/BossHeavyAnimation.anim
@ -21,19 +21,19 @@ AnimationClip:
  - curve:
    - time: 0
      value: {fileID: 2961329756998060182, guid: 272c463bbd609914c9d0e2d70a2ec943, type: 3}
-    - time: 0.1
+    - time: 0.15
      value: {fileID: -6282326837379962671, guid: 272c463bbd609914c9d0e2d70a2ec943, type: 3}
-    - time: 0.18333334
+    - time: 0.28333333
      value: {fileID: -8331126229531950116, guid: 272c463bbd609914c9d0e2d70a2ec943, type: 3}
-    - time: 0.3
+    - time: 0.43333334
      value: {fileID: 4919586636285625377, guid: 272c463bbd609914c9d0e2d70a2ec943, type: 3}
-    - time: 0.36666667
-      value: {fileID: 4886104921339420682, guid: 272c463bbd609914c9d0e2d70a2ec943, type: 3}
-    - time: 0.48333332
-      value: {fileID: -578039315847237803, guid: 272c463bbd609914c9d0e2d70a2ec943, type: 3}
    - time: 0.56666666
+      value: {fileID: 4886104921339420682, guid: 272c463bbd609914c9d0e2d70a2ec943, type: 3}
+    - time: 0.71666664
+      value: {fileID: -578039315847237803, guid: 272c463bbd609914c9d0e2d70a2ec943, type: 3}
+    - time: 0.85
      value: {fileID: -1046419000732479770, guid: 272c463bbd609914c9d0e2d70a2ec943, type: 3}
-    - time: 0.6666667
+    - time: 1
      value: {fileID: 3440945694892755173, guid: 272c463bbd609914c9d0e2d70a2ec943, type: 3}
    attribute: m_Sprite
    path: 
@ -67,12 +67,12 @@ AnimationClip:
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 0.68333334
+    m_StopTime: 1.0166667
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
    m_HasAdditiveReferencePose: 0
-    m_LoopTime: 0
+    m_LoopTime: 1
    m_LoopBlend: 0
    m_LoopBlendOrientation: 0
    m_LoopBlendPositionY: 0
--- a/ldjam50/Assets/Sprites/Bosses/Light/BossLightAnimation.anim
+++ b/ldjam50/Assets/Sprites/Bosses/Light/BossLightAnimation.anim
@ -17,26 +17,62 @@ AnimationClip:
  m_PositionCurves: []
  m_ScaleCurves: []
  m_FloatCurves: []
-  m_PPtrCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: -8129587171578952369, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    - time: 0.1
+      value: {fileID: 5456488274361416681, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    - time: 0.18333334
+      value: {fileID: -1931385951837208587, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    - time: 0.28333333
+      value: {fileID: 8226744794059525854, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    - time: 0.38333333
+      value: {fileID: 3540418157204534381, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    - time: 0.48333332
+      value: {fileID: -8448095662877769638, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    - time: 0.56666666
+      value: {fileID: 781807465550901527, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    - time: 0.6666667
+      value: {fileID: 5798827823292422518, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
  m_SampleRate: 60
  m_WrapMode: 0
  m_Bounds:
    m_Center: {x: 0, y: 0, z: 0}
    m_Extent: {x: 0, y: 0, z: 0}
  m_ClipBindingConstant:
-    genericBindings: []
-    pptrCurveMapping: []
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: -8129587171578952369, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    - {fileID: 5456488274361416681, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    - {fileID: -1931385951837208587, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    - {fileID: 8226744794059525854, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    - {fileID: 3540418157204534381, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    - {fileID: -8448095662877769638, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    - {fileID: 781807465550901527, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
+    - {fileID: 5798827823292422518, guid: 0a57305d7518c6945b16f14d37160840, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 1
+    m_StopTime: 0.68333334
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
    m_HasAdditiveReferencePose: 0
-    m_LoopTime: 0
+    m_LoopTime: 1
    m_LoopBlend: 0
    m_LoopBlendOrientation: 0
    m_LoopBlendPositionY: 0
--- a/ldjam50/Assets/Sprites/Bosses/Light/BossShruner-Sheet.png.meta
+++ b/ldjam50/Assets/Sprites/Bosses/Light/BossShruner-Sheet.png.meta
@ -70,7 +70,7 @@ TextureImporter:
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 32
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
--- a/ldjam50/Assets/Sprites/Bosses/Light/BossShruner-Sheet_0.controller
+++ b/ldjam50/Assets/Sprites/Bosses/Light/BossShruner-Sheet_0.controller
@ -0,0 +1,130 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-2100805714540644578
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BossHeavyAnimation 0
+  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: 32a0d89a8ad2d064eac98a3af491543a, 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: BossShruner-Sheet_0
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 5734240447823216507}
+    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 &2222293541394385025
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BossHeavyAnimation
+  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: 32a0d89a8ad2d064eac98a3af491543a, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &3272349088039254510
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BossLightAnimation
+  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: 36cc0252a29f2934e9210126e366a4e9, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &5734240447823216507
+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: 3272349088039254510}
+    m_Position: {x: 200, y: 0, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 2222293541394385025}
+    m_Position: {x: 235, y: 65, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -2100805714540644578}
+    m_Position: {x: 270, y: 130, 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: 3272349088039254510}
--- a/ldjam50/Assets/Sprites/Bosses/Light/BossShruner-Sheet_0.controller.meta
+++ b/ldjam50/Assets/Sprites/Bosses/Light/BossShruner-Sheet_0.controller.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: da18a3739de59b549908c6e65097ad78
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ldjam50/Assets/Sprites/Bosses/Standart/BossShroom1-Sheet.png.meta
+++ b/ldjam50/Assets/Sprites/Bosses/Standart/BossShroom1-Sheet.png.meta
@ -70,7 +70,7 @@ TextureImporter:
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 32
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
--- a/ldjam50/Assets/Sprites/Bosses/Standart/BossShroom1-Sheet_0.controller
+++ b/ldjam50/Assets/Sprites/Bosses/Standart/BossShroom1-Sheet_0.controller
@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-4183244340457146821
+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: -3107369224605799043}
+    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: -3107369224605799043}
+--- !u!1102 &-3107369224605799043
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BossStandartAnimation
+  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: 1e29a5f61f217764d9bd159885d88836, 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: BossShroom1-Sheet_0
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -4183244340457146821}
+    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}
--- a/ldjam50/Assets/Sprites/Bosses/Standart/BossShroom1-Sheet_0.controller.meta
+++ b/ldjam50/Assets/Sprites/Bosses/Standart/BossShroom1-Sheet_0.controller.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2120be3ca9410bf46a72ec8fc59e30fc
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ldjam50/Assets/Sprites/Bosses/Standart/BossStandartAnimController.controller
+++ b/ldjam50/Assets/Sprites/Bosses/Standart/BossStandartAnimController.controller
@ -94,7 +94,7 @@ AnimatorStateTransition:
  m_Name: 
  m_Conditions:
  - m_ConditionMode: 1
-    m_ConditionEvent: IsDeath
+    m_ConditionEvent: IsDead
    m_EventTreshold: 0
  m_DstStateMachine: {fileID: 0}
  m_DstState: {fileID: 5583808380826847305}
--- a/ldjam50/Assets/Sprites/Bosses/Standart/BossStandartAnimation.anim
+++ b/ldjam50/Assets/Sprites/Bosses/Standart/BossStandartAnimation.anim
@ -17,26 +17,62 @@ AnimationClip:
  m_PositionCurves: []
  m_ScaleCurves: []
  m_FloatCurves: []
-  m_PPtrCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 6843756305149519188, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    - time: 0.1
+      value: {fileID: 2300099083444590717, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    - time: 0.18333334
+      value: {fileID: 3645689210918985698, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    - time: 0.28333333
+      value: {fileID: -6736534473010391469, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    - time: 0.38333333
+      value: {fileID: -8117332548661113499, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    - time: 0.48333332
+      value: {fileID: -3582962525681649468, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    - time: 0.56666666
+      value: {fileID: 4299732811064663078, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    - time: 0.6666667
+      value: {fileID: 421302558740379040, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
  m_SampleRate: 60
  m_WrapMode: 0
  m_Bounds:
    m_Center: {x: 0, y: 0, z: 0}
    m_Extent: {x: 0, y: 0, z: 0}
  m_ClipBindingConstant:
-    genericBindings: []
-    pptrCurveMapping: []
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 6843756305149519188, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    - {fileID: 2300099083444590717, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    - {fileID: 3645689210918985698, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    - {fileID: -6736534473010391469, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    - {fileID: -8117332548661113499, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    - {fileID: -3582962525681649468, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    - {fileID: 4299732811064663078, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
+    - {fileID: 421302558740379040, guid: 044cdda437b738b46b315e124c0dfa0f, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 1
+    m_StopTime: 0.68333334
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
    m_HasAdditiveReferencePose: 0
-    m_LoopTime: 0
+    m_LoopTime: 1
    m_LoopBlend: 0
    m_LoopBlendOrientation: 0
    m_LoopBlendPositionY: 0
--- a/ldjam50/Assets/Sprites/Effects/Expl32Blue-Green.png.meta
+++ b/ldjam50/Assets/Sprites/Effects/Expl32Blue-Green.png.meta
@ -70,7 +70,7 @@ TextureImporter:
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 32
+  spritePixelsToUnits: 16
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1