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

assign the stuff, a little bit of rotation

Browse source
This commit is contained in:
AstrlJelly 2023-06-29 00:52:44 -04:00
parent 09727f8ed8
commit d8dc27cc58
8 changed files with 76 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Assets/Resources/Games/monkeyWatch.prefab
View file

@ -24055,10 +24055,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
rotation: 0
MonkeyAnim: {fileID: 0}
MonkeyAnim: {fileID: 4873567491568184609}
ClickerAnim: {fileID: 0}
YellowStars: {fileID: 0}
PinkStars: {fileID: 0}
YellowStars: {fileID: 8899231323861109608}
PinkStars: {fileID: 5162462144302245337}
--- !u!95 &910339928251400446
Animator:
serializedVersion: 5

2
Assets/Resources/Games/monkeyWatch.prefab.meta
View file

@ -3,5 +3,5 @@ guid: 283e98c411594d9489a3ac2de4efcee2
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleName: rvlwatch/common
assetBundleVariant:

57
Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/Clap.anim → Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/Click.anim
View file

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Clap
m_Name: Click
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
@ -16,26 +16,7 @@ AnimationClip:
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -5.71
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: rotation
path:
classID: 114
script: {fileID: 11500000, guid: c7855e771979ce7448c422fd15a506e1, type: 3}
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@ -43,14 +24,7 @@ AnimationClip:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 696031473
script: {fileID: 11500000, guid: c7855e771979ce7448c422fd15a506e1, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@ -62,7 +36,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
@ -72,26 +46,7 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -5.71
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: rotation
path:
classID: 114
script: {fileID: 11500000, guid: c7855e771979ce7448c422fd15a506e1, type: 3}
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
@ -100,6 +55,6 @@ AnimationClip:
functionName: UpdateRotation
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
floatParameter: 6
intParameter: 0
messageOptions: 0

2
Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/Clap.anim.meta → Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/Click.anim.meta
View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: cf83bd7b64a2c86498891d2b6e711c8a
guid: 47659b5f650ff9941b0fba524192854c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000

58
Assets/Resources/Sprites/Games/MonkeyWatch/Animations/MonkeyClicker/MonkeyClickerAnim.controller
View file

@ -1,5 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-1699384699004828011
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Click
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: 47659b5f650ff9941b0fba524192854c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-1618668153596642209
AnimatorStateMachine:
serializedVersion: 6
@ -9,12 +35,12 @@ AnimatorStateMachine:
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 7801864362704695150}
m_Position: {x: 290, y: 80, z: 0}
- serializedVersion: 1
m_State: {fileID: 1342921268367174585}
m_Position: {x: 30, y: 180, z: 0}
- serializedVersion: 1
m_State: {fileID: -1699384699004828011}
m_Position: {x: 65, y: 245, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -73,29 +99,3 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &7801864362704695150
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Clap
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: cf83bd7b64a2c86498891d2b6e711c8a, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

9
Assets/Resources/Sprites/Games/MonkeyWatch/Animations/PlayerMonkey/PlayerClap.anim
View file

@ -2713,4 +2713,11 @@ AnimationClip:
script: {fileID: 0}
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
m_Events:
- time: 0
functionName:
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0

17
Assets/Scripts/Games/MonkeyWatch/MonkeyClicker.cs
View file

@ -35,12 +35,6 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch
}
// animation event
public void UpdateRotation()
{
//var rot = gameObject.transform;
}
private void Miss(PlayerActionEvent caller)
{
@ -50,5 +44,16 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch
{
}
// animation events
public void UpdateRotation(float rot)
{
gameObject.transform.localEulerAngles -= new Vector3(0, 0, rot);
}
public void PlayAnimation(string anim)
{
ClickerAnim.DoScaledAnimationAsync(anim, 0.5f);
}
}
}

22
Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs
View file

@ -63,10 +63,10 @@ namespace HeavenStudio.Games.Loaders
//preFunction = delegate { var e = eventCaller.currentEntity; MonkeyWatch.OnbeatSwitch(e.beat); },
defaultLength = 2f
},
},
}/*,
new List<string>() {"rvl", "keep"},
"rvlwatch", "en",
new List<string>() {}
new List<string>() {} */
);
}
}
@ -226,7 +226,7 @@ namespace HeavenStudio.Games
{
if (offbeatMonkeys[i].beat == beat) {
PinkMonkeys(beat, offbeatMonkeys[i].length, offbeatMonkeys[i].mute, offbeatMonkeys[i].monkeys);
PinkMonkeySFX(beat, offbeatMonkeys[i].length, offbeatMonkeys[i].mute, (offbeatMonkeys[i].monkeys.Length == 0));
PinkMonkeySFX(beat, offbeatMonkeys[i].length, offbeatMonkeys[i].mute, (offbeatMonkeys[i].monkeys == null));
}
}
@ -312,7 +312,6 @@ namespace HeavenStudio.Games
void Just(float state, bool isYellow)
{
lastMonkeyClapped++;
monkeyPlayer.UpdateRotation();
string whichAnim = "PlayerClap";
if (state >= 1f || state <= -1f) {
SoundByte.PlayOneShot("miss");
@ -322,13 +321,26 @@ namespace HeavenStudio.Games
if (!isYellow) whichAnim += "Big";
}
monkeyPlayer.MonkeyAnim.DoScaledAnimationAsync(whichAnim, 0.5f);
monkeyPlayer.UpdateRotation(6);
}
public void Miss(PlayerActionEvent caller)
{
SoundByte.PlayOneShot("miss");
monkeyPlayer.UpdateRotation(6);
}
public void Nothing(PlayerActionEvent caller) {}
/* starting from the first monkey, these are the amount of monkeys clapped before the prepare animation switches.
4 +
8 +
7 +
8 +
7 +
8 +
7 +
7 +
4
*/
}
}