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

shock near miss

Browse source
This commit is contained in:
minenice55 2024-01-12 01:33:02 -05:00
parent b4ae435d00
commit 7420a61f87
7 changed files with 3950 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assets/Resources/Games/trickClass.prefab
View file

@ -492,7 +492,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -3.99, y: 8.39, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9050201431690794528}
m_RootOrder: 2

3876
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/DodgeNgShock.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/DodgeNgShock.anim.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f85113dceaefabc46a78a97f038baf0c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

29
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/Player.controller
View file

@ -100,6 +100,32 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &2063189850963811223
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DodgeNgShock
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: f85113dceaefabc46a78a97f038baf0c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &3344526055661378143
AnimatorState:
serializedVersion: 6
@ -159,6 +185,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 6654028805906475515}
m_Position: {x: 535, y: 305, z: 0}
- serializedVersion: 1
m_State: {fileID: 2063189850963811223}
m_Position: {x: 570, y: 370, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []

50
Assets/Resources/Sprites/Games/TrickClass/mobTrick_parts00.png.meta
View file

@ -716,7 +716,7 @@ TextureImporter:
width: 656
height: 700
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -737,7 +737,7 @@ TextureImporter:
width: 655
height: 700
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -758,7 +758,7 @@ TextureImporter:
width: 655
height: 700
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -779,7 +779,7 @@ TextureImporter:
width: 655
height: 700
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -800,7 +800,7 @@ TextureImporter:
width: 555
height: 945
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -821,7 +821,7 @@ TextureImporter:
width: 314
height: 411
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -842,7 +842,7 @@ TextureImporter:
width: 205
height: 221
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -863,7 +863,7 @@ TextureImporter:
width: 258
height: 251
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -884,7 +884,7 @@ TextureImporter:
width: 321
height: 339
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -905,7 +905,7 @@ TextureImporter:
width: 684
height: 762
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -926,7 +926,7 @@ TextureImporter:
width: 386
height: 157
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -947,7 +947,7 @@ TextureImporter:
width: 397
height: 167
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -968,8 +968,8 @@ TextureImporter:
width: 200
height: 352
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 42, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
@ -989,7 +989,7 @@ TextureImporter:
width: 184
height: 141
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -1010,7 +1010,7 @@ TextureImporter:
width: 159
height: 118
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -1031,7 +1031,7 @@ TextureImporter:
width: 39
height: 39
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -1052,7 +1052,7 @@ TextureImporter:
width: 39
height: 40
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -1073,7 +1073,7 @@ TextureImporter:
width: 47
height: 48
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -1094,7 +1094,7 @@ TextureImporter:
width: 57
height: 57
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -1115,7 +1115,7 @@ TextureImporter:
width: 47
height: 48
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -1136,7 +1136,7 @@ TextureImporter:
width: 57
height: 56
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -1157,7 +1157,7 @@ TextureImporter:
width: 309
height: 265
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -1178,7 +1178,7 @@ TextureImporter:
width: 48
height: 25
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
@ -1199,7 +1199,7 @@ TextureImporter:
width: 275
height: 401
alignment: 0
pivot: {x: 0, y: 0}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []

18
Assets/Scripts/Games/TrickClass/MobTrickObj.cs
View file

@ -111,10 +111,7 @@ namespace HeavenStudio.Games.Scripts_TrickClass
transform.position = nextPos;
break;
case TrickClass.TrickObjType.Shock:
if (!ng)
{
Destroy(gameObject);
}
Destroy(gameObject);
break;
default:
startBeat += dodgeBeats;
@ -134,10 +131,13 @@ namespace HeavenStudio.Games.Scripts_TrickClass
if (state <= -1f || state >= 1f)
{
//NG
game.PlayerDodgeNg();
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound(GetMissSound(), startBeat + flyBeats, volume: 0.4f),
});
game.PlayerDodgeNg(type is TrickClass.TrickObjType.Shock);
if (type is not TrickClass.TrickObjType.Shock)
{
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound(GetMissSound(), startBeat + flyBeats, volume: 0.4f),
});
}
SoundByte.PlayOneShotGame(GetMissSound(), volume: 0.6f);
SoundByte.PlayOneShot("miss");
DoObjMiss(true);
@ -157,7 +157,7 @@ namespace HeavenStudio.Games.Scripts_TrickClass
{
SoundByte.PlayOneShotGame(GetMissSound());
DoObjMiss(false);
game.PlayerThrough(type == TrickClass.TrickObjType.Shock);
game.PlayerThrough(type is TrickClass.TrickObjType.Shock);
}
public void DodgeThrough(PlayerActionEvent caller) { }

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

@ -310,9 +310,9 @@ namespace HeavenStudio.Games
}
public void PlayerDodgeNg()
public void PlayerDodgeNg(bool shock = false)
{
playerAnim.DoScaledAnimationAsync("DodgeNg");
playerAnim.DoScaledAnimationAsync(shock ? "DodgeNgShock" : "DodgeNg");
playerReady = false;
playerBopStart = Conductor.instance.songPositionInBeatsAsDouble + 0.75f;
playerCanDodge = Conductor.instance.songPositionInBeatsAsDouble + 0.15f;