mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

removed high kick toe swing

Browse source
This commit is contained in:
Rapandrasmus 2023-11-27 21:45:09 +01:00
parent 641f2fe20c
commit 4476b339f8
5 changed files with 25 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Assets/Scenes/Editor.unity
View file

@ -371,9 +371,9 @@ RectTransform:
m_Father: {fileID: 574002313} m_Father: {fileID: 574002313}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -21} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32} m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!114 &9435782 --- !u!114 &9435782
@ -3656,9 +3656,9 @@ RectTransform:
m_Father: {fileID: 539838476} m_Father: {fileID: 539838476}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 32, y: -21} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32} m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &121871281 --- !u!114 &121871281
@ -3801,9 +3801,9 @@ RectTransform:
m_Father: {fileID: 539838476} m_Father: {fileID: 539838476}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 72, y: -21} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32} m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &129013734 --- !u!114 &129013734
@ -3923,9 +3923,9 @@ RectTransform:
m_Father: {fileID: 539838476} m_Father: {fileID: 539838476}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 112, y: -21} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32} m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &151246938 --- !u!114 &151246938
@ -21545,7 +21545,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_categoryRef: {fileID: 167275725} _categoryRef: {fileID: 167275725}
_spacing: -55 _spacing: 55
_headerOffset: 61 _headerOffset: 61
--- !u!1 &889256060 --- !u!1 &889256060
GameObject: GameObject:
@ -21749,7 +21749,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Padding: {x: 0, y: 0, z: 0, w: 0} m_Padding: {x: 0, y: 0, z: 0, w: 1}
m_Softness: {x: 0, y: 0} m_Softness: {x: 0, y: 0}
--- !u!1 &908855313 --- !u!1 &908855313
GameObject: GameObject:
@ -27043,7 +27043,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 199.0612} m_AnchoredPosition: {x: 0, y: 199.06123}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945 --- !u!222 &1154875945
@ -31125,9 +31125,9 @@ RectTransform:
m_Father: {fileID: 574002313} m_Father: {fileID: 574002313}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 40, y: -21} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32} m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1345846031 --- !u!114 &1345846031
@ -39119,9 +39119,9 @@ RectTransform:
m_Father: {fileID: 574002313} m_Father: {fileID: 574002313}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 80, y: -21} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32} m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1783491359 --- !u!114 &1783491359

9
Assets/Scripts/Games/SpaceSoccer/Ball.cs
View file

@ -22,7 +22,6 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
public double startBeat; public double startBeat;
public State state; public State state;
public double nextAnimBeat; public double nextAnimBeat;
public float highKickSwing = 0f;
private float lastSpriteRot; private float lastSpriteRot;
public bool canKick; public bool canKick;
public bool waitKickRelease; public bool waitKickRelease;
@ -81,10 +80,6 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
} }
else else
{ {
highKickSwing = highKicks[i]["swing"];
if (highKickSwing == 0f)
highKickSwing = 0.5f;
if (highKicks[i].beat + GetAnimLength(State.HighKicked) > currentBeat) if (highKicks[i].beat + GetAnimLength(State.HighKicked) > currentBeat)
{ {
//Debug.Log("Setting state to high kick"); //Debug.Log("Setting state to high kick");
@ -272,9 +267,9 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
case State.Kicked: case State.Kicked:
return 1f; return 1f;
case State.HighKicked: case State.HighKicked:
return 2f - highKickSwing; return 1.5f;
case State.Toe: case State.Toe:
return 2f - (1f - highKickSwing); return 1.5f;
default: default:
Debug.LogError("Ball has invalid state. State number: " + (int)anim); Debug.LogError("Ball has invalid state. State number: " + (int)anim);
return 0f; return 0f;

6
Assets/Scripts/Games/SpaceSoccer/Kicker.cs
View file

@ -251,12 +251,6 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer
canHighKick = true; canHighKick = true;
canKick = false; canKick = false;
if (ball)
{
ball.highKickSwing = highKicks[i]["swing"];
if (ball.highKickSwing == 0f)
ball.highKickSwing = 0.5f;
}
break; break;
} }
else else

4
Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs
View file

@ -28,10 +28,6 @@ namespace HeavenStudio.Games.Loaders
new GameAction("high kick-toe!", "High Kick-Toe!") new GameAction("high kick-toe!", "High Kick-Toe!")
{ {
defaultLength = 3f, defaultLength = 3f,
parameters = new List<Param>()
{
new Param("swing", new EntityTypes.Float(0, 1, 0.5f), "Swing", "The amount of swing")
}
}, },
new GameAction("npc kickers enter or exit", "NPC Kickers Enter or Exit") new GameAction("npc kickers enter or exit", "NPC Kickers Enter or Exit")
{ {

4
Assets/Scripts/LevelEditor/EventSelector/GameSelectionCategoryManager.cs
View file

@ -46,7 +46,7 @@ namespace HeavenStudio.Editor
if ((i != 0 && gameName != "gameManager") || (gameName == "gameManager" && i != 1)) if ((i != 0 && gameName != "gameManager") || (gameName == "gameManager" && i != 1))
{ {
Canvas.ForceUpdateCanvases(); Canvas.ForceUpdateCanvases();
currentY += _spacing - lastHeaderObject.GetComponent<RectTransform>().rect.height; currentY -= _spacing + lastHeaderObject.GetComponent<RectTransform>().rect.height;
} }
lastHeader = action.categoryName; lastHeader = action.categoryName;
@ -79,7 +79,7 @@ namespace HeavenStudio.Editor
for (int i = 0; i < _categories.Count; i++) for (int i = 0; i < _categories.Count; i++)
{ {
if (!_categories[i].HeaderIsActive()) sizeY -= _headerOffset; if (!_categories[i].HeaderIsActive()) sizeY -= _headerOffset;
sizeY -= _spacing - _categories[i].GetComponent<RectTransform>().rect.height; sizeY += _spacing + _categories[i].GetComponent<RectTransform>().rect.height;
} }
_rectTransform.sizeDelta = new Vector3(0, sizeY, 0); _rectTransform.sizeDelta = new Vector3(0, sizeY, 0);