etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-10 03:35:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #120 from minenice55/misc-additions-2

Browse source 
Misc Additions #2
This commit is contained in:
minenice55 2022-06-26 00:27:53 -04:00 committed by GitHub
commit 71b42eb577
24 changed files with 3144 additions and 1648 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

173
Assets/Editor/SpritesheetScaler.cs
View file

@ -1,78 +1,111 @@
using UnityEngine;
using UnityEditor;
using System.Collections.Generic;
public class SpritesheetScaler : EditorWindow {
Object source;
int multiplier = 1;
// Creates a new option in "Windows"
[MenuItem ("Window/Scale spritesheet pivots and slices")]
static void Init () {
// Get existing open window or if none, make a new one:
SpritesheetScaler window = (SpritesheetScaler)EditorWindow.GetWindow (typeof (SpritesheetScaler));
window.Show();
}
void OnGUI () {
GUILayout.BeginHorizontal ();
GUILayout.Label ("Source texture:", EditorStyles.boldLabel);
source = EditorGUILayout.ObjectField(source, typeof(Texture2D), false, GUILayout.Width(220));
GUILayout.EndHorizontal ();
GUILayout.BeginHorizontal ();
GUILayout.Label ("Multiplier:", EditorStyles.boldLabel);
multiplier = EditorGUILayout.IntField(multiplier, GUILayout.Width(220));
GUILayout.EndHorizontal ();
GUILayout.Space (25f);
if (GUILayout.Button ("Scale pivots and slices")) {
ScalePivotsAndSlices();
}
}
void ScalePivotsAndSlices()
{
if (!source || (multiplier <= 0)) {
Debug.Log("Missing one object");
return;
}
if (source.GetType () != typeof(Texture2D)) {
Debug.Log (source + "needs to be Texture2D!");
return;
}
string sourcePath = AssetDatabase.GetAssetPath(source);
TextureImporter ti1 = AssetImporter.GetAtPath(sourcePath) as TextureImporter;
bool wasReadable = ti1.isReadable;
ti1.isReadable = true;
ti1.spritePixelsPerUnit *= multiplier;
List <SpriteMetaData> newData = new List <SpriteMetaData> ();
Debug.Log ("Amount of slices found: " + ti1.spritesheet.Length);
for (int i = 0; i < ti1.spritesheet.Length; i++) {
SpriteMetaData d = ti1.spritesheet[i];
d.rect = ScaleRect(d.rect, multiplier);
d.border *= multiplier;
newData.Add(d);
}
public class SpritesheetScaler : EditorWindow
{
ti1.spritesheet = newData.ToArray();
Object source;
int multiplier = 1;
int inflateX = 0;
int inflateY = 0;
ti1.isReadable = wasReadable;
AssetDatabase.ImportAsset(sourcePath, ImportAssetOptions.ForceUpdate);
}
// Creates a new option in "Windows"
[MenuItem("Window/Scale spritesheet pivots and slices")]
static void Init()
{
// Get existing open window or if none, make a new one:
SpritesheetScaler window = (SpritesheetScaler)EditorWindow.GetWindow(typeof(SpritesheetScaler));
window.Show();
}
Rect ScaleRect(Rect source, int mult)
{
var newRect = new Rect();
newRect.Set(source.x * mult, source.y * mult, source.width * mult, source.height * mult);
return newRect;
}
void OnGUI()
{
GUILayout.BeginHorizontal();
GUILayout.Label("Source texture:", EditorStyles.boldLabel);
source = EditorGUILayout.ObjectField(source, typeof(Texture2D), false, GUILayout.Width(220));
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal();
GUILayout.Label("Multiplier:", EditorStyles.boldLabel);
multiplier = EditorGUILayout.IntField(multiplier, GUILayout.Width(220));
GUILayout.EndHorizontal();
GUILayout.Space(5f);
GUILayout.BeginHorizontal();
GUILayout.Label("Inflate Quads:", EditorStyles.boldLabel);
GUILayout.EndHorizontal();
GUILayout.BeginHorizontal();
GUILayout.Label("X", EditorStyles.label);
inflateX = EditorGUILayout.IntField(inflateX, GUILayout.Width(220/2));
GUILayout.Label("Y", EditorStyles.label);
inflateY = EditorGUILayout.IntField(inflateY, GUILayout.Width(220/2));
GUILayout.EndHorizontal();
GUILayout.Space(25f);
if (GUILayout.Button("Scale pivots and slices"))
{
ScalePivotsAndSlices();
}
}
void ScalePivotsAndSlices()
{
if (!source || (multiplier <= 0))
{
Debug.Log("Missing one object");
return;
}
if (source.GetType() != typeof(Texture2D))
{
Debug.Log(source + "needs to be Texture2D!");
return;
}
string sourcePath = AssetDatabase.GetAssetPath(source);
TextureImporter ti1 = AssetImporter.GetAtPath(sourcePath) as TextureImporter;
bool wasReadable = ti1.isReadable;
ti1.isReadable = true;
ti1.spritePixelsPerUnit *= multiplier;
List<SpriteMetaData> newData = new List<SpriteMetaData>();
Debug.Log("Amount of slices found: " + ti1.spritesheet.Length);
for (int i = 0; i < ti1.spritesheet.Length; i++)
{
SpriteMetaData d = ti1.spritesheet[i];
Vector2 oldPivot = Rect.NormalizedToPoint(d.rect, d.pivot) * multiplier;
d.rect = ScaleRect(d.rect, multiplier, inflateX, inflateY);
d.border.x += d.border.x > 0 ? inflateX : 0;
d.border.y += d.border.y > 0 ? inflateY : 0;
d.border.z += d.border.z > 0 ? inflateX : 0;
d.border.w += d.border.w > 0 ? inflateY : 0;
if (inflateX > 0 || inflateY > 0)
{
d.alignment = (int)SpriteAlignment.Custom;
d.pivot = Rect.PointToNormalized(d.rect, oldPivot);
}
d.border *= multiplier;
newData.Add(d);
}
ti1.spritesheet = newData.ToArray();
ti1.isReadable = wasReadable;
AssetDatabase.ImportAsset(sourcePath, ImportAssetOptions.ForceUpdate);
}
Rect ScaleRect(Rect source, int mult, int inflateX, int inflateY)
{
var newRect = new Rect();
newRect.Set((source.x - inflateX) * mult, (source.y - inflateY) * mult, (source.width + inflateX*2) * mult, (source.height + inflateY*2) * mult);
return newRect;
}
}

1436
Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic.asset
View file

File diff suppressed because one or more lines are too long

16
Assets/Resources/Prefabs/Games/PajamaParty/Monkey.prefab
View file

@ -76,7 +76,7 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.28, y: 0.28}
m_Size: {x: 0.6, y: 0.6}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
@ -235,7 +235,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1000
m_Sprite: {fileID: 21300000, guid: 64a73a36aceb02c47b5aadf50e08a3ad, type: 3}
m_Sprite: {fileID: 21300000, guid: de2ae5d798220f142b028c0f9ae29ddd, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.41960785}
m_FlipX: 0
m_FlipY: 0
@ -463,7 +463,7 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.21, y: 0.47}
m_Size: {x: 1.53, y: 0.79}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
@ -857,7 +857,7 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.28, y: 0.28}
m_Size: {x: 0.6, y: 0.6}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
@ -1053,7 +1053,7 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.21, y: 0.47}
m_Size: {x: 1.53, y: 0.79}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
@ -1135,7 +1135,7 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.19, y: 0.19}
m_Size: {x: 0.51, y: 0.51}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
@ -1299,7 +1299,7 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.07, y: 0.46}
m_Size: {x: 1.39, y: 0.78}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
@ -1381,7 +1381,7 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.19, y: 0.19}
m_Size: {x: 0.51, y: 0.51}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0

986
Assets/Resources/Sprites/Games/FanClub/fanClub_IdolParts.png.meta
View file

File diff suppressed because it is too large Load diff

96
Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump02.anim
View file

@ -432,35 +432,35 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.12, y: 1.22, z: 0}
value: {x: 0.1, y: 1.285, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: 0.59999937, z: 0}
outSlope: {x: 0, y: 0.5250013, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
value: {x: 0.12, y: 1.26, z: 0}
inSlope: {x: -0, y: 0.59999937, z: -0}
outSlope: {x: 0, y: 0.9000009, z: 0}
value: {x: 0.1, y: 1.32, z: 0}
inSlope: {x: -0, y: 0.5250013, z: -0}
outSlope: {x: 0, y: 0.59999937, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
value: {x: 0.12, y: 1.32, z: 0}
inSlope: {x: -0, y: 0.9000009, z: -0}
outSlope: {x: 0, y: 1.199999, z: 0}
value: {x: 0.1, y: 1.36, z: 0}
inSlope: {x: -0, y: 0.59999937, z: -0}
outSlope: {x: 0, y: 1.5000005, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.2
value: {x: 0.12, y: 1.4, z: 0}
inSlope: {x: -0, y: 1.199999, z: -0}
value: {x: 0.1, y: 1.46, z: 0}
inSlope: {x: -0, y: 1.5000005, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -468,9 +468,9 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.33333334
value: {x: 0.12, y: 1.4, z: 0}
value: {x: 0.1, y: 1.46, z: 0}
inSlope: {x: -0, y: -0, z: -0}
outSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0.14999996, y: -0.45000044, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -486,15 +486,15 @@ AnimationClip:
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 1, y: -0.39999998, z: 0}
outSlope: {x: 1.3, y: -0.6285, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.2
value: {x: 0.2, y: -0.08, z: 0}
inSlope: {x: 1, y: -0.39999998, z: -0}
value: {x: 0.26, y: -0.1257, z: 0}
inSlope: {x: 1.3, y: -0.6285, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -511,15 +511,15 @@ AnimationClip:
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: -1.5, y: -0.45000002, z: 0}
outSlope: {x: -1.25, y: -0.59349996, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.2
value: {x: -0.3, y: -0.09, z: 0}
inSlope: {x: -1.5, y: -0.45000002, z: -0}
value: {x: -0.25, y: -0.1187, z: 0}
inSlope: {x: -1.25, y: -0.59349996, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -3203,7 +3203,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.12
value: 0.1
inSlope: Infinity
outSlope: 0
tangentMode: 69
@ -3212,7 +3212,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0.12
value: 0.1
inSlope: -0
outSlope: 0
tangentMode: 69
@ -3221,7 +3221,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0.12
value: 0.1
inSlope: -0
outSlope: 0
tangentMode: 69
@ -3230,7 +3230,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 0.12
value: 0.1
inSlope: -0
outSlope: 0
tangentMode: 69
@ -3239,9 +3239,9 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 0.12
value: 0.1
inSlope: -0
outSlope: 0
outSlope: 0.14999996
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
@ -3258,35 +3258,35 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.22
value: 1.285
inSlope: Infinity
outSlope: 0.59999937
outSlope: 0.5250013
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 1.26
inSlope: 0.59999937
outSlope: 0.9000009
value: 1.32
inSlope: 0.5250013
outSlope: 0.59999937
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 1.32
inSlope: 0.9000009
outSlope: 1.199999
value: 1.36
inSlope: 0.59999937
outSlope: 1.5000005
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 1.4
inSlope: 1.199999
value: 1.46
inSlope: 1.5000005
outSlope: 0
tangentMode: 69
weightedMode: 0
@ -3294,9 +3294,9 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 1.4
value: 1.46
inSlope: -0
outSlope: 0
outSlope: -0.45000044
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
@ -3503,15 +3503,15 @@ AnimationClip:
time: 0
value: 0
inSlope: Infinity
outSlope: 1
outSlope: 1.3
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 0.2
inSlope: 1
value: 0.26
inSlope: 1.3
outSlope: 0
tangentMode: 69
weightedMode: 0
@ -3531,15 +3531,15 @@ AnimationClip:
time: 0
value: 0
inSlope: Infinity
outSlope: -0.39999998
outSlope: -0.6285
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: -0.08
inSlope: -0.39999998
value: -0.1257
inSlope: -0.6285
outSlope: 0
tangentMode: 69
weightedMode: 0
@ -3729,15 +3729,15 @@ AnimationClip:
time: 0
value: 0
inSlope: Infinity
outSlope: -1.5
outSlope: -1.25
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: -0.3
inSlope: -1.5
value: -0.25
inSlope: -1.25
outSlope: 0
tangentMode: 69
weightedMode: 0
@ -3757,15 +3757,15 @@ AnimationClip:
time: 0
value: 0
inSlope: Infinity
outSlope: -0.45000002
outSlope: -0.59349996
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: -0.09
inSlope: -0.45000002
value: -0.1187
inSlope: -0.59349996
outSlope: 0
tangentMode: 69
weightedMode: 0

758
Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump03.anim
View file

@ -432,35 +432,35 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.12, y: 1.22, z: 0}
value: {x: 0.1, y: 1.285, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 0, y: 0.59999937, z: 0}
outSlope: {x: 0, y: 0.5250013, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
value: {x: 0.12, y: 1.26, z: 0}
inSlope: {x: -0, y: 0.59999937, z: -0}
outSlope: {x: 0, y: 0.9000009, z: 0}
value: {x: 0.1, y: 1.32, z: 0}
inSlope: {x: -0, y: 0.5250013, z: -0}
outSlope: {x: 0, y: 0.59999937, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
value: {x: 0.12, y: 1.32, z: 0}
inSlope: {x: -0, y: 0.9000009, z: -0}
outSlope: {x: 0, y: 1.199999, z: 0}
value: {x: 0.1, y: 1.36, z: 0}
inSlope: {x: -0, y: 0.59999937, z: -0}
outSlope: {x: 0, y: 1.5000005, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.2
value: {x: 0.12, y: 1.4, z: 0}
inSlope: {x: -0, y: 1.199999, z: -0}
value: {x: 0.1, y: 1.46, z: 0}
inSlope: {x: -0, y: 1.5000005, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -468,9 +468,9 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.33333334
value: {x: 0.12, y: 1.4, z: 0}
value: {x: 0.1, y: 1.46, z: 0}
inSlope: {x: -0, y: -0, z: -0}
outSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0.14999996, y: -0.45000044, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@ -486,15 +486,15 @@ AnimationClip:
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: 1, y: -0.39999998, z: 0}
outSlope: {x: 1.3, y: -0.6285, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.2
value: {x: 0.2, y: -0.08, z: 0}
inSlope: {x: 1, y: -0.39999998, z: -0}
value: {x: 0.26, y: -0.1257, z: 0}
inSlope: {x: 1.3, y: -0.6285, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -511,15 +511,15 @@ AnimationClip:
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: -1.5, y: -0.45000002, z: 0}
outSlope: {x: -1.25, y: -0.59349996, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.2
value: {x: -0.3, y: -0.09, z: 0}
inSlope: {x: -1.5, y: -0.45000002, z: -0}
value: {x: -0.25, y: -0.1187, z: 0}
inSlope: {x: -1.25, y: -0.59349996, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -3245,7 +3245,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.12
value: 0.1
inSlope: Infinity
outSlope: 0
tangentMode: 69
@ -3254,7 +3254,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 0.12
value: 0.1
inSlope: -0
outSlope: 0
tangentMode: 69
@ -3263,7 +3263,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0.12
value: 0.1
inSlope: -0
outSlope: 0
tangentMode: 69
@ -3272,7 +3272,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 0.12
value: 0.1
inSlope: -0
outSlope: 0
tangentMode: 69
@ -3281,9 +3281,9 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 0.12
value: 0.1
inSlope: -0
outSlope: 0
outSlope: 0.14999996
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
@ -3300,35 +3300,35 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.22
value: 1.285
inSlope: Infinity
outSlope: 0.59999937
outSlope: 0.5250013
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 1.26
inSlope: 0.59999937
outSlope: 0.9000009
value: 1.32
inSlope: 0.5250013
outSlope: 0.59999937
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 1.32
inSlope: 0.9000009
outSlope: 1.199999
value: 1.36
inSlope: 0.59999937
outSlope: 1.5000005
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 1.4
inSlope: 1.199999
value: 1.46
inSlope: 1.5000005
outSlope: 0
tangentMode: 69
weightedMode: 0
@ -3336,9 +3336,9 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 1.4
value: 1.46
inSlope: -0
outSlope: 0
outSlope: -0.45000044
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
@ -3545,15 +3545,15 @@ AnimationClip:
time: 0
value: 0
inSlope: Infinity
outSlope: 1
outSlope: 1.3
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 0.2
inSlope: 1
value: 0.26
inSlope: 1.3
outSlope: 0
tangentMode: 69
weightedMode: 0
@ -3573,15 +3573,15 @@ AnimationClip:
time: 0
value: 0
inSlope: Infinity
outSlope: -0.39999998
outSlope: -0.6285
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: -0.08
inSlope: -0.39999998
value: -0.1257
inSlope: -0.6285
outSlope: 0
tangentMode: 69
weightedMode: 0
@ -3771,15 +3771,15 @@ AnimationClip:
time: 0
value: 0
inSlope: Infinity
outSlope: -1.5
outSlope: -1.25
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: -0.3
inSlope: -1.5
value: -0.25
inSlope: -1.25
outSlope: 0
tangentMode: 69
weightedMode: 0
@ -3799,15 +3799,15 @@ AnimationClip:
time: 0
value: 0
inSlope: Infinity
outSlope: -0.45000002
outSlope: -0.59349996
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: -0.09
inSlope: -0.45000002
value: -0.1187
inSlope: -0.59349996
outSlope: 0
tangentMode: 69
weightedMode: 0
@ -4808,26 +4808,6 @@ AnimationClip:
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: ArmL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: ArmL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
@ -4835,316 +4815,6 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: ArmL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: ArmL/ArmAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: ArmL/ArmAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: ArmL/ArmAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: ArmR
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: ArmR
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: ArmR
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: ArmR/ArmAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: ArmR/ArmAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: ArmR/ArmAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Body
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Body
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Body
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: BodyOther
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: BodyOther
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: BodyOther
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Head
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Head
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Head
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Head/HeadAttatchL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Head/HeadAttatchL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Head/HeadAttatchL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Head/HeadAttatchR
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Head/HeadAttatchR
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Head/HeadAttatchR
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Leg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Leg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Leg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Leg/LegAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Leg/LegAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Leg/LegAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: LegOther
classID: 4
script: {fileID: 0}
@ -5164,10 +4834,340 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
attribute: m_LocalEulerAngles.x
path: LegOther
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: ArmL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: ArmL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: ArmL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: ArmL/ArmAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: ArmL/ArmAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: ArmL/ArmAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: ArmR
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: ArmR
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: ArmR
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: ArmR/ArmAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: ArmR/ArmAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: ArmR/ArmAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Body
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Body
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Body
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: BodyOther
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: BodyOther
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: BodyOther
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Head
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Head
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Head
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Head/HeadAttatchL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Head/HeadAttatchL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Head/HeadAttatchL
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Head/HeadAttatchR
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Head/HeadAttatchR
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Head/HeadAttatchR
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Leg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Leg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Leg
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Leg/LegAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Leg/LegAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Leg/LegAttatch
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []

18
Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyReadySleep.anim
View file

@ -560,15 +560,15 @@ AnimationClip:
time: 0.31666666
value: {x: 0.02, y: 1.538, z: 0}
inSlope: {x: -0, y: 1.1699994, z: -0}
outSlope: {x: 1.4999989, y: -1.0799994, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.33333334
value: {x: 0.045, y: 1.52, z: 0}
inSlope: {x: 1.4999989, y: -1.0799994, z: -0}
value: {x: 0.02, y: 1.538, z: 0}
inSlope: {x: -0, y: -0, z: -0}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
@ -3793,15 +3793,15 @@ AnimationClip:
time: 0.31666666
value: 0.02
inSlope: -0
outSlope: 1.4999989
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 0.045
inSlope: 1.4999989
value: 0.02
inSlope: -0
outSlope: Infinity
tangentMode: 69
weightedMode: 0
@ -3866,15 +3866,15 @@ AnimationClip:
time: 0.31666666
value: 1.538
inSlope: 1.1699994
outSlope: -1.0799994
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 1.52
inSlope: -1.0799994
value: 1.538
inSlope: -0
outSlope: Infinity
tangentMode: 69
weightedMode: 0

1026
Assets/Resources/Sprites/Games/PajamaParty/pillow_obj.png.meta
View file

File diff suppressed because it is too large Load diff

123
Assets/Resources/Sprites/Games/RhythmSomen/Animations/Sweat.controller
View file

@ -1,57 +1,13 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Sweat
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 7746455235394996756}
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!1107 &7746455235394996756
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: 8020205864861736811}
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: 8020205864861736811}
--- !u!1102 &8020205864861736811
--- !u!1102 &-6697072708767678652
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: teststs
m_Name: BlobSweating
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@ -64,9 +20,82 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 8ef3150a73054154e86f00c94273349b, type: 2}
m_Motion: {fileID: 7400000, guid: 49dbc1758c8095040b83b37106b417e2, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-19641165761514187
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BlobNothing
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: d547354621aa67644bfe852277f517fa, 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: Sweat
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 4794652093112339212}
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!1107 &4794652093112339212
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: -6697072708767678652}
m_Position: {x: 200, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: -19641165761514187}
m_Position: {x: 235, y: 65, 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: -19641165761514187}

2
Assets/Resources/Sprites/Games/RhythmSomen/Animations/Sweat.controller.meta
View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 25a71f038b410b6488f7350f85de852c
guid: f383738438c8c364a99ba374f24c2b05
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000

91
Assets/Resources/Games/Sweat.controller → Assets/Resources/Sprites/Games/RhythmSomen/Animations/TestSweat.controller
View file

@ -1,70 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-6697072708767678652
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BlobSweating
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: 49dbc1758c8095040b83b37106b417e2, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-19641165761514187
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BlobNothing
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: d547354621aa67644bfe852277f517fa, 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: Sweat
m_Name: TestSweat
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 4794652093112339212}
m_StateMachine: {fileID: 7746455235394996756}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
@ -74,7 +22,7 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1107 &4794652093112339212
--- !u!1107 &7746455235394996756
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
@ -84,11 +32,8 @@ AnimatorStateMachine:
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -6697072708767678652}
m_State: {fileID: 8020205864861736811}
m_Position: {x: 200, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: -19641165761514187}
m_Position: {x: 235, y: 65, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -98,4 +43,30 @@ AnimatorStateMachine:
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: -19641165761514187}
m_DefaultState: {fileID: 8020205864861736811}
--- !u!1102 &8020205864861736811
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: teststs
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: 8ef3150a73054154e86f00c94273349b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

2
Assets/Resources/Games/Sweat.controller.meta → Assets/Resources/Sprites/Games/RhythmSomen/Animations/TestSweat.controller.meta
View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f383738438c8c364a99ba374f24c2b05
guid: 25a71f038b410b6488f7350f85de852c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000

2
Assets/Scripts/Games/PajamaParty/CtrPillowPlayer.cs
View file

@ -378,7 +378,7 @@ namespace HeavenStudio.Games.Scripts_PajamaParty
}
),
new BeatAction.Action(
beat + 8f,
beat + (longSleep ? 4f : 8f),
delegate {
canCharge = true;
canJump = true;

3
Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiChild.cs
View file

@ -5,9 +5,6 @@ using System;
using System.Collections.Generic;
using UnityEngine;
using DG.Tweening;
using NaughtyBezierCurves;
namespace HeavenStudio.Games.Scripts_NtrSamurai
{
public class NtrSamuraiChild : MonoBehaviour

3
Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiObject.cs
View file

@ -5,9 +5,6 @@ using System;
using System.Collections.Generic;
using UnityEngine;
using DG.Tweening;
using NaughtyBezierCurves;
namespace HeavenStudio.Games.Scripts_NtrSamurai
{
public class NtrSamuraiObject : MonoBehaviour

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

@ -132,7 +132,7 @@ namespace HeavenStudio.Games.Scripts_TrickClass
{
//just
game.PlayerDodge();
Jukebox.PlayOneShotGame("trickClass/player_dodge_success", volume: 0.8f, pitch: UnityEngine.Random.Range(0.95f, 1.15f));
Jukebox.PlayOneShotGame("trickClass/player_dodge_success", volume: 0.8f, pitch: UnityEngine.Random.Range(0.85f, 1.15f));
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound(GetDodgeSound(), startBeat + flyBeats, volume: 0.4f),
});

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

@ -96,6 +96,7 @@ namespace HeavenStudio.Games
{
var e = tossEvents[i];
float timeToEvent = e.beat - cond.songPositionInBeats;
warnAnim.Play("NoPose", -1, 0);
if (timeToEvent > 0f && timeToEvent <= 1f)
{
string anim = "WarnBall";

BIN
Assets/StreamingAssets/StreamingAssets
View file

Binary file not shown.

2
Assets/StreamingAssets/StreamingAssets.manifest
View file

@ -1,5 +1,5 @@
ManifestFileVersion: 0
CRC: 910537049
CRC: 3049528508
AssetBundleManifest:
AssetBundleInfos:
Info_0:

BIN
Assets/StreamingAssets/ctrpillow/common
View file

Binary file not shown.

4
Assets/StreamingAssets/ctrpillow/common.manifest
View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 425013723
CRC: 2012087739
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: dcbd8744429187a825ae682efdf68324
Hash: 8b334bb89c2bd50abd515949ade25271
TypeTreeHash:
serializedVersion: 2
Hash: 77ce82dcd01e7c9c803f77daf119d967

BIN
Assets/StreamingAssets/ntridol/common
View file

Binary file not shown.

4
Assets/StreamingAssets/ntridol/common.manifest
View file

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 3488102225
CRC: 2010253220
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 2247cb6467f6af3d83446b34bd34fe23
Hash: 3e555585e70be6acd65ba10c73ef4544
TypeTreeHash:
serializedVersion: 2
Hash: d5bdda7523be8cdc2ec1df479dc7821d

44
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View file

File diff suppressed because one or more lines are too long