Merge branch 'Testy' of https://github.com/RaffyTaffy14/HS into Testy

This commit is contained in:
RaffyTaffy14 2024-01-20 00:36:08 -05:00
commit c68f3b8a93
618 changed files with 8227 additions and 1841 deletions

View file

@ -2,7 +2,7 @@ name: Build Heaven Studio
on: on:
push: push:
branches: [ "master", "release_1", "actions_rework" ] branches: [ "master", "release_1_patches" ]
workflow_dispatch: {} workflow_dispatch: {}
jobs: jobs:

View file

@ -1,12 +1,10 @@
using System.IO; using System.IO;
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEditor; using UnityEditor;
using UnityEditor.Build;
using UnityEditor.Build.Reporting;
using UnityEngine; using UnityEngine;
using SatorImaging.UnitySourceGenerator.Editor;
using HeavenStudio;
public class CreateAssetBundles public class CreateAssetBundles
{ {
[MenuItem("Assets/Build AssetBundles/Current Platform")] [MenuItem("Assets/Build AssetBundles/Current Platform")]
@ -17,6 +15,8 @@ public class CreateAssetBundles
{ {
Directory.CreateDirectory(assetBundleDirectory); Directory.CreateDirectory(assetBundleDirectory);
} }
AssetDatabase.Refresh();
USGUtility.ForceGenerateByType(typeof(Minigames));
BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, EditorUserBuildSettings.activeBuildTarget); BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, EditorUserBuildSettings.activeBuildTarget);
} }
@ -28,6 +28,8 @@ public class CreateAssetBundles
{ {
Directory.CreateDirectory(assetBundleDirectory); Directory.CreateDirectory(assetBundleDirectory);
} }
AssetDatabase.Refresh();
USGUtility.ForceGenerateByType(typeof(Minigames));
BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneWindows); BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneWindows);
} }
@ -39,6 +41,8 @@ public class CreateAssetBundles
{ {
Directory.CreateDirectory(assetBundleDirectory); Directory.CreateDirectory(assetBundleDirectory);
} }
AssetDatabase.Refresh();
USGUtility.ForceGenerateByType(typeof(Minigames));
BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneLinux64); BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneLinux64);
} }
@ -50,6 +54,8 @@ public class CreateAssetBundles
{ {
Directory.CreateDirectory(assetBundleDirectory); Directory.CreateDirectory(assetBundleDirectory);
} }
AssetDatabase.Refresh();
USGUtility.ForceGenerateByType(typeof(Minigames));
BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneOSX); BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneOSX);
} }
} }

View file

@ -0,0 +1,14 @@
using UnityEngine;
using UnityEditor;
using SatorImaging.UnitySourceGenerator.Editor;
public class CreateMinigameScriptTemplate
{
[MenuItem("Assets/Heaven Studio/Create Minigame Script From Template", priority = 0)]
public static void CreateMinigameScript()
{
ProjectWindowUtil.CreateScriptAssetFromTemplateFile("Assets/Editor/ScriptTemplates/MinigameScriptTemplate.txt", "NewMinigame.cs");
AssetDatabase.Refresh();
USGUtility.ForceGenerateByType(typeof(HeavenStudio.Minigames));
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 24bc0d119c30f3a41aee57b4e85dbf64
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 12ec433916efb3c4a895be2ac0dd6935
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,52 @@
using System;
using System.Linq;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using HeavenStudio.Util;
using HeavenStudio.InputSystem;
using Jukebox;
namespace HeavenStudio.Games.Loaders
{
using static Minigames;
/// Minigame loaders handle the setup of your minigame.
/// Here, you designate the game prefab, define entities, and mark what AssetBundle to load
/// Names of minigame loaders follow a specific naming convention of `PlatformcodeNameLoader`, where:
/// `Platformcode` is a three-leter platform code with the minigame's origin
/// `Name` is a short internal name
/// `Loader` is the string "Loader"
/// Platform codes are as follows:
/// Agb: Gameboy Advance ("Advance Gameboy")
/// Ntr: Nintendo DS ("Nitro")
/// Rvl: Nintendo Wii ("Revolution")
/// Ctr: Nintendo 3DS ("Centrair")
/// Mob: Mobile
/// Pco: PC / Other
/// Fill in the loader class label, "*prefab name*", and "*Display Name*" with the relevant information
/// For help, feel free to reach out to us on our discord, in the #development channel.
public static class _______________
{
public static Minigame AddGame(EventCaller eventCaller)
{
return new Minigame("*prefab name*", "*Display Name*", "ffffff", false, false, new List<GameAction>()
{
}
);
}
}
}
namespace HeavenStudio.Games
{
/// This class handles the minigame logic.
/// Minigame inherits directly from MonoBehaviour, and adds Heaven Studio specific methods to override.
public class #SCRIPTNAME# : Minigame
{
}
}

View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a701bb5358c08074b991f83428d52446
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -77,7 +77,8 @@ public class SpritesheetScaler : EditorWindow
for (int i = 0; i < ti1.spritesheet.Length; i++) for (int i = 0; i < ti1.spritesheet.Length; i++)
{ {
SpriteMetaData d = ti1.spritesheet[i]; SpriteMetaData d = ti1.spritesheet[i];
Vector2 oldPivot = Rect.NormalizedToPoint(d.rect, d.pivot) * multiplier; // pivot relative to the origin of the rect in pixels
Vector2 oldPivot = new Vector2(d.pivot.x * d.rect.width, d.pivot.y * d.rect.height);
d.rect = ScaleRect(d.rect, multiplier, inflateX, inflateY); d.rect = ScaleRect(d.rect, multiplier, inflateX, inflateY);
d.border.x += d.border.x > 0 ? inflateX : 0; d.border.x += d.border.x > 0 ? inflateX : 0;
@ -85,10 +86,12 @@ public class SpritesheetScaler : EditorWindow
d.border.z += d.border.z > 0 ? inflateX : 0; d.border.z += d.border.z > 0 ? inflateX : 0;
d.border.w += d.border.w > 0 ? inflateY : 0; d.border.w += d.border.w > 0 ? inflateY : 0;
if (inflateX > 0 || inflateY > 0) if (d.alignment != (int)SpriteAlignment.Center && (inflateX > 0 || inflateY > 0))
{ {
d.alignment = (int)SpriteAlignment.Custom; d.alignment = (int)SpriteAlignment.Custom;
d.pivot = Rect.PointToNormalized(d.rect, oldPivot); oldPivot += new Vector2(inflateX, inflateY);
Vector2 newPivot = oldPivot * multiplier;
d.pivot = new Vector2(newPivot.x / d.rect.width, newPivot.y / d.rect.height);
} }
d.border *= multiplier; d.border *= multiplier;

View file

@ -7,7 +7,6 @@
-<indent=5%>Mytiaoga</indent> -<indent=5%>Mytiaoga</indent>
-<indent=5%>Carson</indent> -<indent=5%>Carson</indent>
-<indent=5%>saladplainzone</indent> -<indent=5%>saladplainzone</indent>
-<indent=5%>Pengu123</indent>
-<indent=5%>Krıspy Kreme</indent> -<indent=5%>Krıspy Kreme</indent>
-<indent=5%>DPS2004</indent> -<indent=5%>DPS2004</indent>
-<indent=5%>Jellirby</indent> -<indent=5%>Jellirby</indent>
@ -18,7 +17,7 @@
-<indent=5%>Maddy / saladplainzone</indent> -<indent=5%>Maddy / saladplainzone</indent>
-<indent=5%>NoahAmp</indent> -<indent=5%>NoahAmp</indent>
-<indent=5%>Bhaos</indent> -<indent=5%>Bhaos</indent>
-<indent=5%>Raffy</indent> -<indent=5%>RaffyTaffy14</indent>
-<indent=5%>Thinedave</indent> -<indent=5%>Thinedave</indent>
<align="center"><b>Artwork</b></align> <align="center"><b>Artwork</b></align>
@ -54,7 +53,7 @@
-<indent=5%>Butternnife</indent> -<indent=5%>Butternnife</indent>
-<indent=5%>Minesweeper95</indent> -<indent=5%>Minesweeper95</indent>
-<indent=5%>mizuno</indent> -<indent=5%>mizuno</indent>
-<indent=5%>Flowercardiganwillow</indent> -<indent=5%>Malleable Frog</indent>
-<indent=5%>vincells</indent> -<indent=5%>vincells</indent>
<align="center"><b>Music</b></align> <align="center"><b>Music</b></align>

View file

@ -0,0 +1,501 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &-9022938225433809117
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: buttonIcons Material
m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _CullMode: 0
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84a92b25f83d49b9bc132d206b370281, type: 3}
m_Name: Buttons
m_EditorClassIdentifier:
m_Version: 1.1.0
m_FaceInfo:
m_FaceIndex: 0
m_FamilyName:
m_StyleName:
m_PointSize: 0
m_Scale: 0
m_UnitsPerEM: 0
m_LineHeight: 0
m_AscentLine: 0
m_CapLine: 0
m_MeanLine: 0
m_Baseline: 0
m_DescentLine: 0
m_SuperscriptOffset: 0
m_SuperscriptSize: 0
m_SubscriptOffset: 0
m_SubscriptSize: 0
m_UnderlineOffset: 0
m_UnderlineThickness: 0
m_StrikethroughOffset: 0
m_StrikethroughThickness: 0
m_TabWidth: 0
m_Material: {fileID: 2100000, guid: 0035f9ee73a3659488de4969ea48d035, type: 2}
spriteSheet: {fileID: 2800000, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
m_SpriteCharacterTable:
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 0
m_Scale: 1
m_Name: ButtonOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 1
m_Scale: 1
m_Name: ShoulderLeftOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 2
m_Scale: 1
m_Name: ShoulderRightOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 3
m_Scale: 1
m_Name: ShouldersOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 4
m_Scale: 1
m_Name: ShouldersRightOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 5
m_Scale: 1
m_Name: Pad
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 6
m_Scale: 1
m_Name: Face
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 7
m_Scale: 1
m_Name: ButtonOff
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 8
m_Scale: 1
m_Name: EastOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 9
m_Scale: 1
m_Name: SouthOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 10
m_Scale: 1
m_Name: NorthOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 11
m_Scale: 1
m_Name: WestOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 12
m_Scale: 1
m_Name: ShoulderLeftOff
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 13
m_Scale: 1
m_Name: ShoulderRightOff
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 14
m_Scale: 1
m_Name: ShouldersOff
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 15
m_Scale: 1
m_Name: ShouldersLeftOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 16
m_Scale: 1
m_Name: RightOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 17
m_Scale: 1
m_Name: DownOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 18
m_Scale: 1
m_Name: LeftOn
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 19
m_Scale: 1
m_Name: UpOn
m_GlyphTable:
- m_Index: 0
m_Metrics:
m_Width: 38
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 151
m_Y: 984
m_Width: 38
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -6506423922138132652, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 1
m_Metrics:
m_Width: 38
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 511
m_Y: 984
m_Width: 38
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -598839719690993186, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 2
m_Metrics:
m_Width: 38
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 551
m_Y: 984
m_Width: 38
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 7882489078324362733, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 3
m_Metrics:
m_Width: 78
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 591
m_Y: 984
m_Width: 78
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -7444272823696498285, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 4
m_Metrics:
m_Width: 78
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 671
m_Y: 984
m_Width: 78
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 5518843884416884346, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 5
m_Metrics:
m_Width: 67
m_Height: 67
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 2
m_Y: 955
m_Width: 67
m_Height: 67
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 6719230046462009688, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 6
m_Metrics:
m_Width: 78
m_Height: 78
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 71
m_Y: 944
m_Width: 78
m_Height: 78
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 3826735276939671808, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 7
m_Metrics:
m_Width: 38
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 151
m_Y: 944
m_Width: 38
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -7319796363159512643, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 8
m_Metrics:
m_Width: 78
m_Height: 78
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 191
m_Y: 944
m_Width: 78
m_Height: 78
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 8406874011085310447, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 9
m_Metrics:
m_Width: 78
m_Height: 78
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 271
m_Y: 944
m_Width: 78
m_Height: 78
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 111238229322356548, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 10
m_Metrics:
m_Width: 78
m_Height: 78
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 351
m_Y: 944
m_Width: 78
m_Height: 78
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 8017398019882363653, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 11
m_Metrics:
m_Width: 78
m_Height: 78
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 431
m_Y: 944
m_Width: 78
m_Height: 78
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -8397132687541991269, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 12
m_Metrics:
m_Width: 38
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 511
m_Y: 944
m_Width: 38
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -1348493139139215224, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 13
m_Metrics:
m_Width: 38
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 551
m_Y: 944
m_Width: 38
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 6499095914430324874, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 14
m_Metrics:
m_Width: 78
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 591
m_Y: 944
m_Width: 78
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -5368843543446870761, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 15
m_Metrics:
m_Width: 78
m_Height: 38
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 671
m_Y: 944
m_Width: 78
m_Height: 38
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 3724681018647327355, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 16
m_Metrics:
m_Width: 67
m_Height: 67
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 2
m_Y: 886
m_Width: 67
m_Height: 67
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -4789233240444048905, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 17
m_Metrics:
m_Width: 67
m_Height: 67
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 71
m_Y: 875
m_Width: 67
m_Height: 67
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 4213091988662033815, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 18
m_Metrics:
m_Width: 67
m_Height: 67
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 140
m_Y: 875
m_Width: 67
m_Height: 67
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 6847377428827266393, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
- m_Index: 19
m_Metrics:
m_Width: 67
m_Height: 67
m_HorizontalBearingX: 0
m_HorizontalBearingY: 68
m_HorizontalAdvance: 80
m_GlyphRect:
m_X: 209
m_Y: 875
m_Width: 67
m_Height: 67
m_Scale: 1.25
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: -5863448563183388835, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3}
spriteInfoList: []
fallbackSpriteAssets: []

View file

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

View file

@ -48,7 +48,7 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84a92b25f83d49b9bc132d206b370281, type: 3} m_Script: {fileID: 11500000, guid: 84a92b25f83d49b9bc132d206b370281, type: 3}
m_Name: hsEmoji m_Name: HeavenEmoji
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Version: 1.1.0 m_Version: 1.1.0
m_FaceInfo: m_FaceInfo:

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -844,7 +844,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: d03b08a4c5ce7cb47b288ad638c7ca9f, type: 2} m_Material: {fileID: 2100000, guid: d03b08a4c5ce7cb47b288ad638c7ca9f, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} m_Color: {r: 1, g: 1, b: 1, a: 0.8627451}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -1228,7 +1228,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: b40da75f6d2bafa47ad85e579ee00993, type: 2} m_Material: {fileID: 2100000, guid: b40da75f6d2bafa47ad85e579ee00993, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} m_Color: {r: 1, g: 1, b: 1, a: 0.8627451}
m_RaycastTarget: 0 m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0 m_Maskable: 0
@ -1721,7 +1721,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0} m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0} parentLinkedComponent: {fileID: 0}
m_enableKerning: 1 m_enableKerning: 1
m_ActiveFontFeatures: 00000000 m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0 m_enableExtraPadding: 0
checkPaddingRequired: 0 checkPaddingRequired: 0
m_isRichText: 1 m_isRichText: 1
@ -2279,7 +2279,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: d6ea70fa47396b640ab6ae551b0114f8, type: 2} m_Material: {fileID: 2100000, guid: d6ea70fa47396b640ab6ae551b0114f8, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} m_Color: {r: 1, g: 1, b: 1, a: 0.9019608}
m_RaycastTarget: 0 m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0 m_Maskable: 0
@ -4191,7 +4191,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
SoundSequences: [] SoundSequences: []
EligibleHits: []
scheduledInputs: [] scheduledInputs: []
alien: {fileID: 1725356918350344904} alien: {fileID: 1725356918350344904}
translator: {fileID: 2669316826032871973} translator: {fileID: 2669316826032871973}

View file

@ -1574,7 +1574,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1502138646470043659} m_GameObject: {fileID: 1502138646470043659}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 2.18}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -2461,7 +2461,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2198155337455343688} m_GameObject: {fileID: 2198155337455343688}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: -2.3}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -2672,7 +2672,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2364807215172239617} m_GameObject: {fileID: 2364807215172239617}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 2.18}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -3054,7 +3054,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2591902619112967187} m_GameObject: {fileID: 2591902619112967187}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: -2.3}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -3601,7 +3601,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3268905332919582678} m_GameObject: {fileID: 3268905332919582678}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 2.18}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -4403,7 +4403,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3827916254657136956} m_GameObject: {fileID: 3827916254657136956}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: -2.3}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -4446,7 +4446,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3935916386830708752} m_GameObject: {fileID: 3935916386830708752}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: -2.3}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -6275,7 +6275,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6093695872543899040} m_GameObject: {fileID: 6093695872543899040}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 2.18}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -7246,7 +7246,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6561292846486288656} m_GameObject: {fileID: 6561292846486288656}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.101, y: 0.194, z: 0} m_LocalPosition: {x: -1.101, y: 0.194, z: -0.084}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -7749,7 +7749,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7278122616026706364} m_GameObject: {fileID: 7278122616026706364}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 2.18}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -8384,7 +8384,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7858878317832744708} m_GameObject: {fileID: 7858878317832744708}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 2.18}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -8514,7 +8514,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8112509877096007021} m_GameObject: {fileID: 8112509877096007021}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: -2.3}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -9313,7 +9313,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8724844040395206150} m_GameObject: {fileID: 8724844040395206150}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: -2.3}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:

View file

@ -26,11 +26,10 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1089093179602596564} m_GameObject: {fileID: 1089093179602596564}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.008, y: 0, z: 0} m_LocalPosition: {x: 0.008000017, y: 9.313226e-10, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children: []
- {fileID: 8730184864405069350}
m_Father: {fileID: 1039565176908573975} m_Father: {fileID: 1039565176908573975}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -200,7 +199,6 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 1584121333826078951} - component: {fileID: 1584121333826078951}
- component: {fileID: 2256168985014220240}
m_Layer: 0 m_Layer: 0
m_Name: Holder m_Name: Holder
m_TagString: Untagged m_TagString: Untagged
@ -225,27 +223,6 @@ Transform:
m_Father: {fileID: 862280508089709600} m_Father: {fileID: 862280508089709600}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &2256168985014220240
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1488695648487991734}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: a5f93a456c442bc458973d17286581d9, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &1895376594866699655 --- !u!1 &1895376594866699655
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -790,7 +767,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &8730184864405069350 --- !u!224 &8730184864405069350
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -798,17 +775,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6119064787687059058} m_GameObject: {fileID: 6119064787687059058}
m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 4485966734002228350} m_Father: {fileID: 7248900333300803150}
m_RootOrder: 0 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.718, y: -0} m_AnchoredPosition: {x: -0.6750004, y: 3.33}
m_SizeDelta: {x: 1, y: 1} m_SizeDelta: {x: 1, y: 1}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!23 &4356944761482350703 --- !u!23 &4356944761482350703
@ -873,7 +850,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: m_text: R
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: fa00f193fe038984592034ad7d5c2a42, type: 2} m_sharedMaterial: {fileID: 2100000, guid: fa00f193fe038984592034ad7d5c2a42, type: 2}
@ -916,15 +893,17 @@ MonoBehaviour:
m_lineSpacingMax: 0 m_lineSpacingMax: 0
m_paragraphSpacing: 0 m_paragraphSpacing: 0
m_charWidthMaxAdj: 0 m_charWidthMaxAdj: 0
m_enableWordWrapping: 0 m_TextWrappingMode: 0
m_wordWrappingRatios: 0.4 m_wordWrappingRatios: 0.4
m_overflowMode: 0 m_overflowMode: 0
m_linkedTextComponent: {fileID: 0} m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0} parentLinkedComponent: {fileID: 0}
m_enableKerning: 0 m_enableKerning: 0
m_ActiveFontFeatures:
m_enableExtraPadding: 0 m_enableExtraPadding: 0
checkPaddingRequired: 0 checkPaddingRequired: 0
m_isRichText: 1 m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1 m_parseCtrlCharacters: 1
m_isOrthographic: 0 m_isOrthographic: 0
m_isCullingEnabled: 0 m_isCullingEnabled: 0
@ -1150,6 +1129,7 @@ Transform:
m_Children: m_Children:
- {fileID: 8701843541313247389} - {fileID: 8701843541313247389}
- {fileID: 7821851253613277009} - {fileID: 7821851253613277009}
- {fileID: 8730184864405069350}
- {fileID: 862280508089709600} - {fileID: 862280508089709600}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
@ -1167,7 +1147,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
SoundSequences: [] SoundSequences: []
EligibleHits: []
scheduledInputs: [] scheduledInputs: []
metronomeAnim: {fileID: 4547664343140929301} metronomeAnim: {fileID: 4547664343140929301}
man: {fileID: 8160414645038680372} man: {fileID: 8160414645038680372}
@ -1273,6 +1252,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 862280508089709600} - component: {fileID: 862280508089709600}
- component: {fileID: 8160414645038680372} - component: {fileID: 8160414645038680372}
- component: {fileID: 3985421115508172561}
m_Layer: 0 m_Layer: 0
m_Name: MrUpbeat m_Name: MrUpbeat
m_TagString: Untagged m_TagString: Untagged
@ -1296,7 +1276,7 @@ Transform:
- {fileID: 4285463118267461702} - {fileID: 4285463118267461702}
- {fileID: 1584121333826078951} - {fileID: 1584121333826078951}
m_Father: {fileID: 7248900333300803150} m_Father: {fileID: 7248900333300803150}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8160414645038680372 --- !u!114 &8160414645038680372
MonoBehaviour: MonoBehaviour:
@ -1310,8 +1290,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e4fa18aec69a2e949a7e2d4e33bdd2b9, type: 3} m_Script: {fileID: 11500000, guid: e4fa18aec69a2e949a7e2d4e33bdd2b9, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
anim: {fileID: 2256168985014220240} anim: {fileID: 3985421115508172561}
blipAnim: {fileID: 1614535701461294964} blipAnim: {fileID: 1614535701461294964}
antennaLight: {fileID: 4485966734002228350}
shadows: shadows:
- {fileID: 8412912829583803381} - {fileID: 8412912829583803381}
- {fileID: 2066794384027118212} - {fileID: 2066794384027118212}
@ -1320,6 +1301,29 @@ MonoBehaviour:
shouldGrow: 0 shouldGrow: 0
shouldBlip: 1 shouldBlip: 1
blipString: M blipString: M
canStep: 1
canStepFromAnim: 1
--- !u!95 &3985421115508172561
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8472146464158439961}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: a5f93a456c442bc458973d17286581d9, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &8959999179820051615 --- !u!1 &8959999179820051615
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View file

@ -3541,14 +3541,14 @@ MonoBehaviour:
pitch: 1 pitch: 1
volume: 1 volume: 1
looping: 0 looping: 0
offset: 0 offset: 0.038
parameters: [] parameters: []
- clip: munchyMonk/one_2 - clip: munchyMonk/one_2
beat: 1 beat: 1
pitch: 1 pitch: 1
volume: 1 volume: 1
looping: 0 looping: 0
offset: 0 offset: 0.012
parameters: [] parameters: []
- name: two_go - name: two_go
sequence: sequence:
@ -3574,14 +3574,14 @@ MonoBehaviour:
pitch: 1 pitch: 1
volume: 1 volume: 1
looping: 0 looping: 0
offset: 0 offset: 0.012
parameters: [] parameters: []
- clip: munchyMonk/two_4 - clip: munchyMonk/two_4
beat: 1.5 beat: 1.5
pitch: 1 pitch: 1
volume: 1 volume: 1
looping: 0 looping: 0
offset: 0 offset: 0.012
parameters: [] parameters: []
- name: three_go - name: three_go
sequence: sequence:
@ -3593,28 +3593,28 @@ MonoBehaviour:
pitch: 1 pitch: 1
volume: 1 volume: 1
looping: 0 looping: 0
offset: 0 offset: 0.069
parameters: [] parameters: []
- clip: munchyMonk/three_2 - clip: munchyMonk/three_2
beat: 1 beat: 1
pitch: 1 pitch: 1
volume: 1 volume: 1
looping: 0 looping: 0
offset: 0 offset: 0.016
parameters: [] parameters: []
- clip: munchyMonk/three_3 - clip: munchyMonk/three_3
beat: 2 beat: 2
pitch: 1 pitch: 1
volume: 1 volume: 1
looping: 0 looping: 0
offset: 0 offset: 0.025
parameters: [] parameters: []
- clip: munchyMonk/three_4 - clip: munchyMonk/three_4
beat: 3 beat: 3
pitch: 1 pitch: 1
volume: 1 volume: 1
looping: 0 looping: 0
offset: 0 offset: 0.015
parameters: [] parameters: []
scheduledInputs: [] scheduledInputs: []
dumplings: [] dumplings: []

View file

@ -1014,7 +1014,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907170206961966871} m_GameObject: {fileID: 907170206961966871}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.478, y: 0.486, z: -0.001} m_LocalPosition: {x: 0.537, y: 0.537, z: -0.001}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -6680,7 +6680,7 @@ Transform:
m_GameObject: {fileID: 1404833178906827570} m_GameObject: {fileID: 1404833178906827570}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.85, y: 0.85, z: 0.85} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 5589869724872896603} - {fileID: 5589869724872896603}
@ -6704,7 +6704,6 @@ MonoBehaviour:
pickelBurstSplat: {fileID: 2565932505832932526} pickelBurstSplat: {fileID: 2565932505832932526}
anim: {fileID: 6574142642051032078} anim: {fileID: 6574142642051032078}
secondHalf: {fileID: 0} secondHalf: {fileID: 0}
floorHeight: -5.65
doubleLaunchPos: {fileID: 16156449826625334} doubleLaunchPos: {fileID: 16156449826625334}
heldPos: {fileID: 0} heldPos: {fileID: 0}
startBeat: 0 startBeat: 0
@ -13040,7 +13039,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3625395986258989249} m_GameObject: {fileID: 3625395986258989249}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.478, y: 0.486, z: -0.001} m_LocalPosition: {x: -0.537, y: 0.537, z: -0.001}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []

File diff suppressed because it is too large Load diff

View file

@ -86,7 +86,7 @@ AudioMixerController:
m_StartSnapshot: {fileID: 24500006} m_StartSnapshot: {fileID: 24500006}
m_SuspendThreshold: -80 m_SuspendThreshold: -80
m_EnableSuspend: 1 m_EnableSuspend: 1
m_UpdateMode: 0 m_UpdateMode: 1
m_ExposedParameters: [] m_ExposedParameters: []
m_AudioMixerGroupViews: m_AudioMixerGroupViews:
- guids: - guids:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 1 MiB

View file

@ -8052,8 +8052,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 951.5, y: 0} m_AnchoredPosition: {x: 723, y: 0}
m_SizeDelta: {x: 1863, y: 0} m_SizeDelta: {x: 1406, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3918594456218978261 --- !u!222 &3918594456218978261
CanvasRenderer: CanvasRenderer:

Some files were not shown because too many files have changed in this diff Show more