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

phone

Browse source
This commit is contained in:
minenice55 2024-01-12 14:35:22 -05:00
parent 7420a61f87
commit 985715e27e
11 changed files with 4330 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -345,6 +345,7 @@ Transform:
- {fileID: 4984981779500137945}
- {fileID: 4887157459228296092}
- {fileID: 3541312439702705548}
- {fileID: 8620437232085832489}
m_Father: {fileID: 7799781267437701720}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1221,9 +1222,12 @@ MonoBehaviour:
flyType: 2
flyBeats: 2
dodgeBeats: 1
gravity: 0
hitLayer: 0
type: 3
justSound: player_dodge_success
missSound: shock_impact
spriteRenderer: {fileID: 0}
--- !u!1 &1928449265059126105
GameObject:
m_ObjectHideFlags: 0
@ -1356,6 +1360,112 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &2309287867142528446
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8620437232085832489}
- component: {fileID: 1306713223359501463}
- component: {fileID: 2733747404620032267}
m_Layer: 0
m_Name: objPhone
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &8620437232085832489
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2309287867142528446}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.455, y: 0.455, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6646177278795284587}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1306713223359501463
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2309287867142528446}
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_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: 10
m_Sprite: {fileID: 1376003920, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 6.4438066, y: 6.183311}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &2733747404620032267
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2309287867142528446}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eb420e9087e23a64eb3ca43a7620c211, type: 3}
m_Name:
m_EditorClassIdentifier:
flyType: 0
flyBeats: 2
dodgeBeats: 1
gravity: 36
hitLayer: -1
type: 4
justSound: player_dodge_success_alt
missSound: chair_impact
spriteRenderer: {fileID: 1306713223359501463}
--- !u!1 &2362150510052593951
GameObject:
m_ObjectHideFlags: 0
@ -2006,7 +2116,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -1
m_SortingOrder: -2
m_Sprite: {fileID: -7631371983786943230, guid: 4777f54c8c25980428a483cf515e981d, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -2429,7 +2539,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: 0
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 9050201431690794528}
m_RootOrder: 4
@ -2552,7 +2662,7 @@ SortingGroup:
m_Enabled: 1
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -4
m_SortingOrder: -5
--- !u!1 &5827926542613868534
GameObject:
m_ObjectHideFlags: 0
@ -2821,9 +2931,12 @@ MonoBehaviour:
flyType: 1
flyBeats: 4
dodgeBeats: 2
gravity: 0
hitLayer: 0
type: 1
justSound: player_dodge_success
missSound: ball_impact
spriteRenderer: {fileID: 0}
--- !u!1 &6218864461676157707
GameObject:
m_ObjectHideFlags: 0
@ -3114,6 +3227,18 @@ MonoBehaviour:
looping: 0
offset: 0
parameters: []
- name: phoneThrow
sequence:
game: 1
force: 1
clips:
- clip: trickClass/girl_toss_phone
beat: 0
pitch: 1
volume: 1
looping: 0
offset: 0
parameters: []
scheduledInputs: []
playerAnim: {fileID: 4171281603420513773}
girlAnim: {fileID: 6570045643125407281}
@ -3123,16 +3248,19 @@ MonoBehaviour:
- {fileID: 6092229326248261130}
- {fileID: 8803031136113842806}
- {fileID: 1807062578198146157}
- {fileID: 2309287867142528446}
objWarnAnim:
- WarnBall
- WarnPlane
- WarnChair
- WarnShock
- WarnPhone
objThrowAnim:
- Throw
- Throw
- ThrowAlt
- ThrowAlt
- Throw
objHolder: {fileID: 6646177278795284587}
ballTossCurve: {fileID: 2490850543769942420}
ballMissCurve: {fileID: 5261772982309671256}
@ -3324,9 +3452,12 @@ MonoBehaviour:
flyType: 0
flyBeats: 2
dodgeBeats: 1
gravity: 0
hitLayer: 0
type: 0
justSound: player_dodge_success
missSound: ball_impact
spriteRenderer: {fileID: 0}
--- !u!1 &7310611812045732801
GameObject:
m_ObjectHideFlags: 0
@ -4019,9 +4150,12 @@ MonoBehaviour:
flyType: 0
flyBeats: 2
dodgeBeats: 1
type: 0
gravity: 0
hitLayer: 0
type: 2
justSound: player_dodge_success
missSound: chair_impact
spriteRenderer: {fileID: 0}
--- !u!1 &9041054952499779364
GameObject:
m_ObjectHideFlags: 0
@ -4160,7 +4294,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -3
m_SortingOrder: -4
m_Sprite: {fileID: -2744129390065220167, guid: 4777f54c8c25980428a483cf515e981d, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0

BIN
Assets/Resources/Sfx/games/trickClass/player_dodge_success_alt.wav Normal file
View file

Binary file not shown.

22
Assets/Resources/Sfx/games/trickClass/player_dodge_success_alt.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: db184e49b54841747828dd71e8a2db04
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

3966
Assets/Resources/Sprites/Games/TrickClass/Anime/Player/DodgeAlt.anim Normal file
View file

File diff suppressed because it is too large Load diff

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

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

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

@ -78,6 +78,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-906070713377663971
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DodgeAlt
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: 02e394438807c5844a2cec902c25f4b1, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@ -188,6 +214,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 2063189850963811223}
m_Position: {x: 570, y: 370, z: 0}
- serializedVersion: 1
m_State: {fileID: -906070713377663971}
m_Position: {x: 605, y: 435, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []

68
Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnPhone.anim Normal file
View file

@ -0,0 +1,68 @@
%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: WarnPhone
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: 1376003920, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
attribute: m_Sprite
path: warnBubble/warnObj
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:
- serializedVersion: 2
path: 1238842833
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 1376003920, guid: 9e4d9259bae08d443835f93cde178f9a, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
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: []

8
Assets/Resources/Sprites/Games/TrickClass/Anime/WarnBubble/WarnPhone.anim.meta Normal file
View file

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

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

@ -150,6 +150,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -4482175379901932263}
m_Position: {x: 310, y: 370, z: 0}
- serializedVersion: 1
m_State: {fileID: 7905119148226771895}
m_Position: {x: 345, y: 435, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -186,3 +189,29 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &7905119148226771895
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: WarnPhone
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: dcbd7609d0f3e704396b51edca46716b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

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

@ -16,13 +16,17 @@ namespace HeavenStudio.Games.Scripts_TrickClass
[SerializeField] public byte flyType;
[SerializeField] float flyBeats;
[SerializeField] float dodgeBeats;
[SerializeField] float gravity;
[SerializeField] int hitLayer;
[SerializeField] TrickClass.TrickObjType type;
[SerializeField] string justSound;
[SerializeField] string missSound;
[SerializeField] SpriteRenderer spriteRenderer;
[NonSerialized] public BezierCurve3D curve;
private TrickClass game;
private float grav;
private void Awake()
{
@ -41,35 +45,43 @@ namespace HeavenStudio.Games.Scripts_TrickClass
var cond = Conductor.instance;
float flyPos = cond.GetPositionFromBeat(startBeat, flyBeats);
if (flyPos <= 1f)
if (curve == null)
{
if (!miss)
{
flyPos *= 0.95f;
}
Vector3 lastPos = transform.position;
Vector3 nextPos = curve.GetPoint(flyPos);
switch (flyType)
{
case 1:
Vector3 direction = (nextPos - lastPos).normalized;
float rotation = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg;
transform.eulerAngles = new Vector3(0, 0, rotation);
break;
case 2:
transform.rotation = Quaternion.identity;
break;
default:
transform.eulerAngles = new Vector3(0, 0, transform.rotation.eulerAngles.z + (360f * Time.deltaTime * cond.SongPitch));
break;
}
transform.position = nextPos;
grav += gravity * Time.deltaTime * cond.SongPitch;
transform.position += new Vector3(0, -grav * Time.deltaTime * cond.SongPitch, 0);
}
else
{
transform.position = curve.GetPoint(miss ? 1f : 0.95f);
if (flyPos <= 1f)
{
if (!miss)
{
flyPos *= 0.95f;
}
Vector3 lastPos = transform.position;
Vector3 nextPos = curve.GetPoint(flyPos);
switch (flyType)
{
case 1:
Vector3 direction = (nextPos - lastPos).normalized;
float rotation = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg;
transform.eulerAngles = new Vector3(0, 0, rotation);
break;
case 2:
transform.rotation = Quaternion.identity;
break;
default:
transform.eulerAngles = new Vector3(0, 0, transform.rotation.eulerAngles.z + (360f * Time.deltaTime * cond.SongPitch));
break;
}
transform.position = nextPos;
}
else
{
transform.position = curve.GetPoint(miss ? 1f : 0.95f);
}
}
if (flyPos > 1f)
@ -145,11 +157,22 @@ namespace HeavenStudio.Games.Scripts_TrickClass
else
{
//just
game.PlayerDodge();
bool phone = type is TrickClass.TrickObjType.Phone;
game.PlayerDodge(phone, phone);
SoundByte.PlayOneShotGame(GetJustSound(), volume: 0.8f, pitch: UnityEngine.Random.Range(0.85f, 1.15f));
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound(GetMissSound(), startBeat + flyBeats, volume: 0.4f),
});
if (phone)
{
transform.position = curve.GetPoint(0.5f);
curve = null;
grav = 0f;
startBeat = Conductor.instance.songPositionInBeatsAsDouble;
flyBeats = 1f;
spriteRenderer.sortingOrder = hitLayer;
}
}
}

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

@ -39,6 +39,14 @@ namespace HeavenStudio.Games.Loaders
},
defaultLength = 2,
},
new GameAction("phone", "Phone")
{
preFunction = delegate
{
TrickClass.PreTossObject(eventCaller.currentEntity.beat, (int)TrickClass.TrickObjType.Phone);
},
defaultLength = 2,
},
new GameAction("shock", "Lightning Bolt")
{
preFunction = delegate
@ -79,7 +87,8 @@ namespace HeavenStudio.Games
Ball,
Plane,
Chair,
Shock
Shock,
Phone
}
public struct QueuedObject
{
@ -298,16 +307,15 @@ namespace HeavenStudio.Games
mobj.SetActive(true);
}
public void PlayerDodge(bool slow = false)
public void PlayerDodge(bool slow = false, bool type = false)
{
if (playerCanDodge > Conductor.instance.songPositionInBeatsAsDouble) return;
//anim
SoundByte.PlayOneShotGame("trickClass/player_dodge");
playerAnim.DoScaledAnimationAsync("Dodge", slow ? 0.6f : 1f);
playerAnim.DoScaledAnimationAsync(type ? "DodgeAlt" : "Dodge", slow ? 0.6f : 1f);
playerBopStart = Conductor.instance.songPositionInBeatsAsDouble + 0.75f;
playerReady = false;
}
public void PlayerDodgeNg(bool shock = false)