mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-09 19:25:10 +00:00
Merge branch 'release_1'
This commit is contained in:
minenice55
commit
aec5b0b5b4
92 changed files with 354 additions and 819 deletions
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 375dce47d61a68447a1b4813869b10b2
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using UnityEngine;
|
||||
namespace Bread2Unity
|
||||
{
|
||||
public class BCCAD : IDataModel
|
||||
{
|
||||
|
||||
public BCCAD Read(byte[] bytes)
|
||||
{
|
||||
sheetW = BitConverter.ToUInt16(bytes, 4);
|
||||
sheetH = BitConverter.ToUInt16(bytes, 6);
|
||||
|
||||
|
||||
// int max = (bytes[8] * 2) + 12;
|
||||
int max = 64 * bytes[8] + 12;
|
||||
|
||||
// note this doesn't account for empty sprites, but I'll get there when i get there
|
||||
for (int i = 12; i < max; i += 2) // 16 bit bytes, skip every 2nd byte
|
||||
{
|
||||
ISprite spriteParts_ = new ISprite();
|
||||
int compare = 0;
|
||||
for (int j = 0; j < bytes[i]; j++)
|
||||
{
|
||||
int ind = i + 4 + (64 * j);
|
||||
|
||||
ISpritePart part = new ISpritePart();
|
||||
part.regionX = BitConverter.ToUInt16(bytes, ind + 0);
|
||||
part.regionY = BitConverter.ToUInt16(bytes, ind + 2);
|
||||
part.regionW = BitConverter.ToUInt16(bytes, ind + 4);
|
||||
part.regionH = BitConverter.ToUInt16(bytes, ind + 6);
|
||||
part.posX = BitConverter.ToInt16(bytes, ind + 8);
|
||||
part.posY = BitConverter.ToInt16(bytes, ind + 10);
|
||||
part.stretchX = BitConverter.ToSingle(bytes, ind + 12);
|
||||
part.stretchY = BitConverter.ToSingle(bytes, ind + 14);
|
||||
part.rotation = BitConverter.ToSingle(bytes, ind + 16);
|
||||
part.flipX = bytes[ind + 18] != (byte)0;
|
||||
part.flipY = bytes[ind + 20] != (byte)0;
|
||||
// im sure the values between 20 and 28 are important so remind me to come back to these
|
||||
part.opacity = bytes[ind + 28];
|
||||
|
||||
Debug.Log("offset: " + ind + ", val: " + part.regionX);
|
||||
|
||||
spriteParts_.parts.Add(part);
|
||||
|
||||
compare += 64;
|
||||
}
|
||||
|
||||
sprites.Add(spriteParts_);
|
||||
|
||||
i += compare;
|
||||
|
||||
}
|
||||
|
||||
return new BCCAD()
|
||||
{
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
/// sprites length bytes start = 12
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3b4f0c7c12cfcc74bbfdc8c1be61d4b0
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
|
||||
using UnityEngine;
|
||||
using UnityEditor;
|
||||
|
||||
using Starpelly;
|
||||
|
||||
namespace Bread2Unity
|
||||
{
|
||||
public class Bread2Unity : EditorWindow
|
||||
{
|
||||
public const string editorFolderName = "bread2unity";
|
||||
|
||||
[MenuItem("Tools/bread2unity")]
|
||||
public static void ShowWindow()
|
||||
{
|
||||
EditorWindow.GetWindow<Bread2Unity>("bread2unity");
|
||||
}
|
||||
|
||||
public void OnGUI()
|
||||
{
|
||||
Texture logo = (Texture)AssetDatabase.LoadAssetAtPath($"Assets/Editor/{editorFolderName}/logo.png", typeof(Texture));
|
||||
GUILayout.Box(logo, new GUILayoutOption[] { GUILayout.ExpandWidth(true), GUILayout.Height(60) });
|
||||
GUILayout.Space(30);
|
||||
|
||||
GUIStyle desc = EditorStyles.label;
|
||||
desc.wordWrap = true;
|
||||
desc.fontStyle = FontStyle.BoldAndItalic;
|
||||
|
||||
GUILayout.Box("bread2unity is a tool built with the purpose of converting RH Megamix and Fever animations to unity. And to generally speed up development by a lot." +
|
||||
"\nCreated by Starpelly.", desc);
|
||||
|
||||
GUILayout.Space(120);
|
||||
|
||||
if (GUILayout.Button("Test"))
|
||||
{
|
||||
string path = EditorUtility.OpenFilePanel("Open BCCAD File", null, "bccad");
|
||||
if (path.Length != 0)
|
||||
{
|
||||
var fileContent = File.ReadAllBytes(path);
|
||||
new BCCAD().Read(fileContent);
|
||||
}
|
||||
}
|
||||
|
||||
GUILayout.BeginHorizontal();
|
||||
if (GUILayout.Button("Bread Download", GUILayout.Height(40)))
|
||||
{
|
||||
Application.OpenURL("https://github.com/rhmodding/bread");
|
||||
}
|
||||
GUILayout.EndHorizontal();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0967d3b57ef5e5d46965e261ead79e15
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,201 +0,0 @@
|
|||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5149fd98229eaac4fb4d8a83f8c9b52f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4801a6826549d7d4a978c7387a1aa26a
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Bread2Unity
|
||||
{
|
||||
public class IAnimation
|
||||
{
|
||||
public List<IAnimationStep> steps;
|
||||
}
|
||||
|
||||
public class IAnimationStep
|
||||
{
|
||||
public ushort spriteIndex;
|
||||
public ushort delay;
|
||||
|
||||
public float stretchX;
|
||||
public float stretchY;
|
||||
|
||||
public float rotation;
|
||||
|
||||
public byte opacity;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c33bcfd692627dd4a97ac1cd1d930420
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Bread2Unity
|
||||
{
|
||||
public class IDataModel
|
||||
{
|
||||
public List<ISprite> sprites = new List<ISprite>();
|
||||
public List<IAnimation> animations = new List<IAnimation>();
|
||||
public int sheetW;
|
||||
public int sheetH;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ddf1fd563dabc6040a863537a081843a
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Bread2Unity
|
||||
{
|
||||
public class ISprite
|
||||
{
|
||||
public List<ISpritePart> parts = new List<ISpritePart>();
|
||||
}
|
||||
|
||||
public class ISpritePart
|
||||
{
|
||||
public ushort regionX;
|
||||
public ushort regionY;
|
||||
public ushort regionW;
|
||||
public ushort regionH;
|
||||
|
||||
public short posX;
|
||||
public short posY;
|
||||
|
||||
public float stretchX;
|
||||
public float stretchY;
|
||||
|
||||
public float rotation;
|
||||
|
||||
public bool flipX;
|
||||
public bool flipY;
|
||||
|
||||
public byte opacity;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d4aae79bea7b7234f9ce059ade5fce08
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
# bread2unity
|
||||
Rhythm Heaven animation to Unity animation converter
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: dcb89f55ef62d184d886dfce1fca7bd6
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 33 KiB |
|
|
@ -1,120 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: bca6955e61a73c44caba7d24d46c78f5
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 0
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 2
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 2
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 2
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -3,5 +3,5 @@ guid: 8f7c4cce90cc7444d9f6eb749af8511c
|
|||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: aea3428178ba96e4a859677fa4c68548
|
|||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: dded4c2e961a9384fab1439fd19ac785
|
|||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: agbtrampoline/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ folderAsset: yes
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 80e3559b5f8c6ce47b95ebd5926d1a52
|
|||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: f25ca3f01901f3f4992757dd62e08933
|
|||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ guid: 42adbe7efa2480240ae54ddaaeff2ce1
|
|||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: ntrrockers/locale
|
||||
assetBundleVariant: en
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: ntrrockers/locale
|
||||
assetBundleVariant: en
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ folderAsset: yes
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: ntrrockers/locale
|
||||
assetBundleVariant: en
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ folderAsset: yes
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ folderAsset: yes
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ folderAsset: yes
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: ntrdiving/locale
|
||||
assetBundleVariant: en
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: ntrdiving/locale
|
||||
assetBundleVariant: en
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: ntrdiving/locale
|
||||
assetBundleVariant: en
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
assetBundleName: ntrdiving/locale
|
||||
assetBundleVariant: en
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: agbtrampoline/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: agbtrampoline/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: agbtrampoline/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ AudioImporter:
|
|||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: agbtrampoline/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ folderAsset: yes
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
|||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
|||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
|||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
|||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -339,5 +339,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -119,5 +119,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -1285,5 +1285,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrrockers/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ folderAsset: yes
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -810,5 +810,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -356,5 +356,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: ntrdiving/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ folderAsset: yes
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: agbtrampoline/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ NativeFormatImporter:
|
|||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: agbtrampoline/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -1616,5 +1616,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: agbtrampoline/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -319,5 +319,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: agbtrampoline/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -163,5 +163,5 @@ TextureImporter:
|
|||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleName: agbtrampoline/common
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -482,7 +482,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 551, y: -14.409576}
|
||||
m_AnchoredPosition: {x: 444.5, y: -0}
|
||||
m_SizeDelta: {x: 1149.1, y: 139.9575}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &75677143
|
||||
|
|
@ -706,11 +706,11 @@ RectTransform:
|
|||
m_Father: {fileID: 1592423196}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 196, y: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -32, y: 0}
|
||||
m_SizeDelta: {x: 56, y: 56}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!114 &124423117
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1025,8 +1025,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -256, y: -256}
|
||||
m_AnchoredPosition: {x: 0, y: -18}
|
||||
m_SizeDelta: {x: -256, y: -292}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &205376984
|
||||
GameObject:
|
||||
|
|
@ -1741,11 +1741,11 @@ RectTransform:
|
|||
m_Father: {fileID: 1923523151}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 196, y: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -32, y: 0}
|
||||
m_SizeDelta: {x: 56, y: 56}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!114 &462262275
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2103,8 +2103,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 1222.5, y: 0}
|
||||
m_SizeDelta: {x: 815, y: 456.49997}
|
||||
m_AnchoredPosition: {x: 1062.75, y: 0}
|
||||
m_SizeDelta: {x: 708.5, y: 396.5}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &594751226
|
||||
MonoBehaviour:
|
||||
|
|
@ -2453,7 +2453,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 551, y: -183.18622}
|
||||
m_AnchoredPosition: {x: 444.5, y: -139.9575}
|
||||
m_SizeDelta: {x: 1136, y: 372.6375}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &684958158
|
||||
|
|
@ -2476,12 +2476,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: '- https://github.com/RHeavenStudio/HeavenStudio
|
||||
|
||||
- https://rheavenstudio.itch.io/heaven-studio
|
||||
|
||||
-
|
||||
https://www.youtube.com/@rheavenstudio'
|
||||
m_text:
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 35949c950a936b744936efd75ae436ea, type: 2}
|
||||
m_sharedMaterial: {fileID: -212896991529246517, guid: 35949c950a936b744936efd75ae436ea, type: 2}
|
||||
|
|
@ -4579,8 +4574,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 815, y: -684.74994}
|
||||
m_SizeDelta: {x: 1630, y: 456.49997}
|
||||
m_AnchoredPosition: {x: 708.5, y: -594.75}
|
||||
m_SizeDelta: {x: 1417, y: 396.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1101280658
|
||||
MonoBehaviour:
|
||||
|
|
@ -5086,7 +5081,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 815, y: 456.49997}
|
||||
m_SizeDelta: {x: 708.5, y: 396.5}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &1285225122
|
||||
MonoBehaviour:
|
||||
|
|
@ -5237,8 +5232,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 11, y: 0}
|
||||
m_SizeDelta: {x: -22, y: 72}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 72}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1328299795
|
||||
MonoBehaviour:
|
||||
|
|
@ -5287,8 +5282,8 @@ MonoBehaviour:
|
|||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 38
|
||||
m_fontSizeBase: 38
|
||||
m_fontSize: 32
|
||||
m_fontSizeBase: 32
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
|
|
@ -5648,8 +5643,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -456.49997}
|
||||
m_SizeDelta: {x: 815, y: 456.49997}
|
||||
m_AnchoredPosition: {x: 0, y: -396.5}
|
||||
m_SizeDelta: {x: 708.5, y: 396.5}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!114 &1348032093
|
||||
MonoBehaviour:
|
||||
|
|
@ -6431,8 +6426,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 815, y: -228.25}
|
||||
m_SizeDelta: {x: 1630, y: 456.49997}
|
||||
m_AnchoredPosition: {x: 708.5, y: -198.25}
|
||||
m_SizeDelta: {x: 1417, y: 396.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1449891560
|
||||
MonoBehaviour:
|
||||
|
|
@ -6727,6 +6722,143 @@ Animator:
|
|||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorStateOnDisable: 0
|
||||
m_WriteDefaultValuesOnDisable: 0
|
||||
--- !u!1 &1570836016
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1570836017}
|
||||
- component: {fileID: 1570836019}
|
||||
- component: {fileID: 1570836018}
|
||||
m_Layer: 0
|
||||
m_Name: Idol
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1570836017
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1570836016}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1657419482}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 20}
|
||||
m_SizeDelta: {x: 0, y: 72}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &1570836018
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1570836016}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: AWWWWWWWW BWWWWWWWW
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: e5f3069ff426f2546b8168857ad6e0d4, type: 2}
|
||||
m_sharedMaterial: {fileID: 1618155055176292627, guid: e5f3069ff426f2546b8168857ad6e0d4, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 2701131775
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 0.627451}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 0
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 0, g: 0, b: 0, a: 1}
|
||||
topRight: {r: 0, g: 0, b: 0, a: 1}
|
||||
bottomLeft: {r: 0, g: 0, b: 0, a: 1}
|
||||
bottomRight: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 38
|
||||
m_fontSizeBase: 36
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 1
|
||||
m_fontSizeMin: 20
|
||||
m_fontSizeMax: 38
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 15
|
||||
m_TextWrappingMode: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 0
|
||||
m_ActiveFontFeatures: 6e72656b
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_EmojiFallbackSupport: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &1570836019
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1570836016}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1592423195
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6766,7 +6898,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 272, y: -64}
|
||||
m_AnchoredPosition: {x: 272.036, y: -64}
|
||||
m_SizeDelta: {x: 256, y: 128}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1592423197
|
||||
|
|
@ -6983,13 +7115,14 @@ RectTransform:
|
|||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 128923926}
|
||||
- {fileID: 1570836017}
|
||||
m_Father: {fileID: 720687239}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 24}
|
||||
m_SizeDelta: {x: 768, y: 128}
|
||||
m_AnchoredPosition: {x: 0, y: 32}
|
||||
m_SizeDelta: {x: 768, y: 164}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &1657419483
|
||||
MonoBehaviour:
|
||||
|
|
@ -7216,8 +7349,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 1222.5, y: -456.49997}
|
||||
m_SizeDelta: {x: 815, y: 456.49997}
|
||||
m_AnchoredPosition: {x: 1062.75, y: -396.5}
|
||||
m_SizeDelta: {x: 708.5, y: 396.5}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!114 &1697728242
|
||||
MonoBehaviour:
|
||||
|
|
@ -7293,7 +7426,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 551, y: -623.6166}
|
||||
m_AnchoredPosition: {x: 444.5, y: -551.5688}
|
||||
m_SizeDelta: {x: 1140.8, y: 77.9475}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1756042649
|
||||
|
|
@ -7577,6 +7710,7 @@ MonoBehaviour:
|
|||
playPanel: {fileID: 1925566736}
|
||||
chartTitleText: {fileID: 2077947577}
|
||||
chartMapperText: {fileID: 128923927}
|
||||
chartIdolText: {fileID: 1570836018}
|
||||
chartDescText: {fileID: 177207008}
|
||||
chartStyleText: {fileID: 1959183877}
|
||||
mainSelectables:
|
||||
|
|
@ -7588,6 +7722,9 @@ MonoBehaviour:
|
|||
defaultSelectable: {fileID: 2079077664}
|
||||
selectedDisplayRect: {fileID: 1437246958}
|
||||
selectedDisplayIcon: {fileID: 896543860}
|
||||
otherHiddenOnMouse:
|
||||
- {fileID: 1284552964}
|
||||
- {fileID: 1305960736}
|
||||
--- !u!82 &1811344143
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -7875,8 +8012,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 11, y: 0}
|
||||
m_SizeDelta: {x: -22, y: 72}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 72}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1880104641
|
||||
MonoBehaviour:
|
||||
|
|
@ -7925,8 +8062,8 @@ MonoBehaviour:
|
|||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 38
|
||||
m_fontSizeBase: 38
|
||||
m_fontSize: 32
|
||||
m_fontSizeBase: 32
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
|
|
@ -8127,7 +8264,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 816, y: -64}
|
||||
m_AnchoredPosition: {x: 816.10803, y: -64}
|
||||
m_SizeDelta: {x: 256, y: 128}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1923523152
|
||||
|
|
|
|||
|
|
@ -336,6 +336,10 @@ namespace HeavenStudio
|
|||
|
||||
public void ScoreInputAccuracy(double beat, double accuracy, bool late, double time, float weight = 1, bool doDisplay = true)
|
||||
{
|
||||
// push the hit event to the timing display
|
||||
if (doDisplay)
|
||||
TimingAccuracyDisplay.instance.MakeAccuracyVfx(time, late);
|
||||
|
||||
if (weight > 0 && MarkerWeight > 0)
|
||||
{
|
||||
totalInputs += weight * MarkerWeight;
|
||||
|
|
@ -361,10 +365,6 @@ namespace HeavenStudio
|
|||
if (SkillStarManager.instance.DoStarJust())
|
||||
skillStarCollected = true;
|
||||
}
|
||||
|
||||
// push the hit event to the timing display
|
||||
if (doDisplay)
|
||||
TimingAccuracyDisplay.instance.MakeAccuracyVfx(time, late);
|
||||
}
|
||||
|
||||
public void DoSectionCompletion(double beat, bool clear, string name, double score)
|
||||
|
|
@ -1121,6 +1121,7 @@ namespace HeavenStudio
|
|||
if (currentGameO.TryGetComponent<Minigame>(out var minigame))
|
||||
{
|
||||
_currentMinigame = minigame;
|
||||
minigame.minigameName = game;
|
||||
}
|
||||
Vector3 originalScale = currentGameO.transform.localScale;
|
||||
currentGameO.transform.parent = eventCaller.GamesHolder.transform;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ using HeavenStudio.Common;
|
|||
using HeavenStudio.InputSystem;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using Jukebox;
|
||||
|
||||
namespace HeavenStudio.Games
|
||||
{
|
||||
|
|
@ -24,6 +25,8 @@ namespace HeavenStudio.Games
|
|||
|
||||
[SerializeField] public SoundSequence.SequenceKeyValue[] SoundSequences;
|
||||
|
||||
[NonSerialized] public string minigameName;
|
||||
|
||||
#region Premade Input Actions
|
||||
protected const int IAEmptyCat = -1;
|
||||
protected const int IAPressCat = 0;
|
||||
|
|
@ -125,6 +128,11 @@ namespace HeavenStudio.Games
|
|||
PlayerActionEvent.ActionEventHittableQuery HittableQuery = null
|
||||
)
|
||||
{
|
||||
// List<RiqEntity> gameSwitches = GameManager.instance.Beatmap.Entities.FindAll(c => c.beat <= startBeat + timer && c.datamodel.Split("/")[0] == "switchGame");
|
||||
// if (gameSwitches != null && gameSwitches[^1].datamodel.Split("/")[1] != gameObject.name)
|
||||
// {
|
||||
// return null;
|
||||
// }
|
||||
|
||||
GameObject evtObj = new("ActionEvent" + (startBeat + timer));
|
||||
|
||||
|
|
@ -145,6 +153,8 @@ namespace HeavenStudio.Games
|
|||
|
||||
evt.transform.parent = this.transform.parent;
|
||||
|
||||
evt.minigame = minigameName;
|
||||
|
||||
evtObj.SetActive(true);
|
||||
|
||||
scheduledInputs.Add(evt);
|
||||
|
|
@ -161,6 +171,7 @@ namespace HeavenStudio.Games
|
|||
{
|
||||
PlayerActionEvent evt = ScheduleInput(startBeat, timer, inputAction, OnHit, OnMiss, OnBlank);
|
||||
evt.autoplayOnly = true;
|
||||
evt.minigame = minigameName;
|
||||
return evt;
|
||||
}
|
||||
|
||||
|
|
@ -174,82 +185,7 @@ namespace HeavenStudio.Games
|
|||
{
|
||||
PlayerActionEvent evt = ScheduleInput(startBeat, timer, inputAction, OnHit, OnMiss, OnBlank, HittableQuery);
|
||||
evt.noAutoplay = true;
|
||||
return evt;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Schedule an Input for a later time in the minigame. Executes the methods put in parameters
|
||||
/// </summary>
|
||||
/// <param name="startBeat">When the scheduling started (in beats)</param>
|
||||
/// <param name="timer">How many beats later should the input be expected</param>
|
||||
/// <param name="inputType">The type of the input that's expected (Press, Release, A, B, Directions>)</param>
|
||||
/// <param name="OnHit">Method to run if the Input has been Hit</param>
|
||||
/// <param name="OnMiss">Method to run if the Input has been Missed</param>
|
||||
/// <param name="OnBlank">Method to run whenever there's an Input while this is Scheduled (Shouldn't be used too much)</param>
|
||||
/// <returns></returns>
|
||||
[Obsolete("Use Input Action ScheduleInput instead")]
|
||||
public PlayerActionEvent ScheduleInput(
|
||||
double startBeat,
|
||||
double timer,
|
||||
InputType inputType,
|
||||
PlayerActionEvent.ActionEventCallbackState OnHit,
|
||||
PlayerActionEvent.ActionEventCallback OnMiss,
|
||||
PlayerActionEvent.ActionEventCallback OnBlank,
|
||||
PlayerActionEvent.ActionEventHittableQuery HittableQuery = null
|
||||
)
|
||||
{
|
||||
|
||||
GameObject evtObj = new GameObject("ActionEvent" + (startBeat + timer));
|
||||
evtObj.AddComponent<PlayerActionEvent>();
|
||||
|
||||
PlayerActionEvent evt = evtObj.GetComponent<PlayerActionEvent>();
|
||||
|
||||
evt.startBeat = startBeat;
|
||||
evt.timer = timer;
|
||||
evt.inputType = inputType;
|
||||
evt.OnHit = OnHit;
|
||||
evt.OnMiss = OnMiss;
|
||||
evt.OnBlank = OnBlank;
|
||||
evt.IsHittable = HittableQuery;
|
||||
|
||||
evt.OnDestroy = RemoveScheduledInput;
|
||||
|
||||
evt.canHit = true;
|
||||
evt.enabled = true;
|
||||
|
||||
evt.transform.parent = this.transform.parent;
|
||||
|
||||
evtObj.SetActive(true);
|
||||
|
||||
scheduledInputs.Add(evt);
|
||||
|
||||
return evt;
|
||||
}
|
||||
|
||||
[Obsolete("Use Input Action ScheduleInput instead")]
|
||||
public PlayerActionEvent ScheduleAutoplayInput(double startBeat,
|
||||
double timer,
|
||||
InputType inputType,
|
||||
PlayerActionEvent.ActionEventCallbackState OnHit,
|
||||
PlayerActionEvent.ActionEventCallback OnMiss,
|
||||
PlayerActionEvent.ActionEventCallback OnBlank)
|
||||
{
|
||||
PlayerActionEvent evt = ScheduleInput(startBeat, timer, inputType, OnHit, OnMiss, OnBlank);
|
||||
evt.autoplayOnly = true;
|
||||
return evt;
|
||||
}
|
||||
|
||||
[Obsolete("Use Input Action ScheduleInput instead")]
|
||||
public PlayerActionEvent ScheduleUserInput(double startBeat,
|
||||
double timer,
|
||||
InputType inputType,
|
||||
PlayerActionEvent.ActionEventCallbackState OnHit,
|
||||
PlayerActionEvent.ActionEventCallback OnMiss,
|
||||
PlayerActionEvent.ActionEventCallback OnBlank,
|
||||
PlayerActionEvent.ActionEventHittableQuery HittableQuery = null)
|
||||
{
|
||||
PlayerActionEvent evt = ScheduleInput(startBeat, timer, inputType, OnHit, OnMiss, OnBlank, HittableQuery);
|
||||
evt.noAutoplay = true;
|
||||
evt.minigame = minigameName;
|
||||
return evt;
|
||||
}
|
||||
|
||||
|
|
@ -401,18 +337,6 @@ namespace HeavenStudio.Games
|
|||
|
||||
public virtual void OnGameSwitch(double beat)
|
||||
{
|
||||
//Below is a template that can be used for handling previous entities.
|
||||
//section below is if you only want to look at entities that overlap the game switch
|
||||
/*
|
||||
List<RiqEntity> prevEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.beat <= beat && c.datamodel.Split(0) == [insert game name]);
|
||||
foreach(RiqEntity entity in prevEntities)
|
||||
{
|
||||
if(entity.beat + entity.length >= beat)
|
||||
{
|
||||
EventCaller.instance.CallEvent(entity, true);
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
public virtual void OnTimeChange()
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ namespace HeavenStudio.Games
|
|||
public bool canHit = true; //Indicates if you can still hit the cue or not. If set to false, it'll guarantee a miss
|
||||
public bool enabled = true; //Indicates if the PlayerActionEvent is enabled. If set to false, it'll not trigger any events and destroy itself AFTER it's not relevant anymore
|
||||
public bool triggersAutoplay = true;
|
||||
public string minigame;
|
||||
bool lockedByEvent = false;
|
||||
bool markForDeletion = false;
|
||||
|
||||
|
|
@ -89,15 +90,17 @@ namespace HeavenStudio.Games
|
|||
public void Update()
|
||||
{
|
||||
Conductor cond = Conductor.instance;
|
||||
GameManager gm = GameManager.instance;
|
||||
if (markForDeletion) CleanUp();
|
||||
if (!cond.NotStopped()) CleanUp(); // If the song is stopped entirely in the editor, destroy itself as we don't want duplicates
|
||||
|
||||
if (noAutoplay && autoplayOnly) autoplayOnly = false;
|
||||
if (noAutoplay && triggersAutoplay) triggersAutoplay = false;
|
||||
if (!enabled) return;
|
||||
if (minigame != GameManager.instance.currentGame) return;
|
||||
|
||||
double normalizedTime = GetNormalizedTime();
|
||||
if (GameManager.instance.autoplay)
|
||||
if (gm.autoplay && gm.canInput)
|
||||
{
|
||||
AutoplayInput(normalizedTime);
|
||||
return;
|
||||
|
|
@ -179,7 +182,7 @@ namespace HeavenStudio.Games
|
|||
|
||||
private void AutoplayInput(double normalizedTime, bool autoPlay = false)
|
||||
{
|
||||
if (triggersAutoplay && (GameManager.instance.autoplay || autoPlay) && GameManager.instance.canInput && normalizedTime >= 1f - (Time.deltaTime * 0.5f))
|
||||
if (triggersAutoplay && (GameManager.instance.autoplay || autoPlay) && normalizedTime >= 1f - (Time.deltaTime * 0.5f))
|
||||
{
|
||||
AutoplayEvent();
|
||||
if (!autoPlay)
|
||||
|
|
@ -191,6 +194,7 @@ namespace HeavenStudio.Games
|
|||
private void TimelineAutoplay()
|
||||
{
|
||||
if (Editor.Editor.instance == null) return;
|
||||
if (!GameManager.instance.canInput) return;
|
||||
if (Editor.Track.Timeline.instance != null && !Editor.Editor.instance.fullscreen)
|
||||
{
|
||||
Editor.Track.Timeline.instance.AutoplayBTN.GetComponent<Animator>().Play("Ace", 0, 0);
|
||||
|
|
@ -223,6 +227,11 @@ namespace HeavenStudio.Games
|
|||
//For the Autoplay
|
||||
public void AutoplayEvent()
|
||||
{
|
||||
if (!GameManager.instance.canInput)
|
||||
{
|
||||
CleanUp();
|
||||
return;
|
||||
}
|
||||
if (EnableAutoplayCheat)
|
||||
{
|
||||
Hit(0f, 1f);
|
||||
|
|
@ -238,6 +247,7 @@ namespace HeavenStudio.Games
|
|||
//The state parameter is either -1 -> Early, 0 -> Perfect, 1 -> Late
|
||||
public void Hit(double state, double time)
|
||||
{
|
||||
GameManager gm = GameManager.instance;
|
||||
if (OnHit != null && enabled)
|
||||
{
|
||||
if (canHit)
|
||||
|
|
@ -246,12 +256,15 @@ namespace HeavenStudio.Games
|
|||
pitchWhenHit = Conductor.instance.SongPitch;
|
||||
double normalized = time - 1f;
|
||||
int offset = Mathf.CeilToInt((float)normalized * 1000);
|
||||
GameManager.instance.AvgInputOffset = offset;
|
||||
if (gm.canInput)
|
||||
{
|
||||
gm.AvgInputOffset = offset;
|
||||
}
|
||||
state = System.Math.Max(-1.0, System.Math.Min(1.0, state));
|
||||
|
||||
if (countsForAccuracy && !(noAutoplay || autoplayOnly) && isEligible)
|
||||
if (countsForAccuracy && gm.canInput && !(noAutoplay || autoplayOnly) && isEligible)
|
||||
{
|
||||
GameManager.instance.ScoreInputAccuracy(startBeat + timer, TimeToAccuracy(time, pitchWhenHit), time > 1.0, time, weight, true);
|
||||
gm.ScoreInputAccuracy(startBeat + timer, TimeToAccuracy(time, pitchWhenHit), time > 1.0, time, weight, true);
|
||||
if (state >= 1f || state <= -1f)
|
||||
{
|
||||
GoForAPerfect.instance.Miss();
|
||||
|
|
@ -319,15 +332,16 @@ namespace HeavenStudio.Games
|
|||
|
||||
public void Miss()
|
||||
{
|
||||
GameManager gm = GameManager.instance;
|
||||
CleanUp();
|
||||
if (OnMiss != null && enabled && !autoplayOnly)
|
||||
{
|
||||
OnMiss(this);
|
||||
}
|
||||
|
||||
if (countsForAccuracy && !(noAutoplay || autoplayOnly))
|
||||
if (countsForAccuracy && gm.canInput && !(noAutoplay || autoplayOnly))
|
||||
{
|
||||
GameManager.instance.ScoreInputAccuracy(startBeat + timer, 0, true, 2.0, weight, false);
|
||||
gm.ScoreInputAccuracy(startBeat + timer, 0, true, 2.0, weight, false);
|
||||
GoForAPerfect.instance.Miss();
|
||||
SectionMedalsManager.instance.MakeIneligible();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -285,7 +285,11 @@ namespace HeavenStudio.Games.Loaders
|
|||
new Param("gcS", false, "Glee Club Guitar (Soshi)", "Will Soshi use the same guitar as in the glee club lessons?")
|
||||
}
|
||||
},
|
||||
});
|
||||
},
|
||||
new List<string>() { "ntr", "repeat" },
|
||||
"ntrrockers", "en",
|
||||
new List<string>() { "en" }
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,7 +72,11 @@ namespace HeavenStudio.Games.Loaders
|
|||
new Param("amount", new EntityTypes.Integer(3, 5, 3), "Amount")
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
new List<string>() { "ntr", "normal" },
|
||||
"ntrdiving", "en",
|
||||
new List<string>() { "en" }
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ namespace HeavenStudio.Games.Loaders
|
|||
},
|
||||
},
|
||||
new List<string>() {"agb", "normal"},
|
||||
"agbtoss", "en",
|
||||
"agbtoss", "jp",
|
||||
new List<string>() {}
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,7 +68,10 @@ namespace HeavenStudio.Games.Loaders
|
|||
new Param("ease", EasingFunction.Ease.Linear, "Ease")
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
new List<string>() {"agb", "normal"},
|
||||
"agbtrampoline", "jp",
|
||||
new List<string>() {}
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ namespace HeavenStudio
|
|||
public static string PlayOpenFile = null;
|
||||
|
||||
public static string buildTime = "00/00/0000 00:00:00";
|
||||
public static string friendlyReleaseName = "Heaven Studio (1.0 Lush)";
|
||||
|
||||
public static bool HasShutDown = false;
|
||||
public static bool discordDuringTesting = false;
|
||||
|
|
@ -127,12 +128,15 @@ namespace HeavenStudio
|
|||
}
|
||||
ChangeMasterVolume(PersistentDataManager.gameSettings.masterVolume);
|
||||
PlayerInput.InitInputControllers();
|
||||
#if UNITY_EDITOR
|
||||
#if HEAVENSTUDIO_PROD
|
||||
Starpelly.OS.ChangeWindowTitle("Heaven Studio");
|
||||
buildTime = Application.buildGUID.Substring(0, 8) + " " + AppInfo.Date.ToString("dd/MM/yyyy hh:mm:ss");
|
||||
#elif UNITY_EDITOR
|
||||
Starpelly.OS.ChangeWindowTitle("Heaven Studio UNITYEDITOR ");
|
||||
buildTime = "(EDITOR) " + System.DateTime.UtcNow.ToString("dd/MM/yyyy hh:mm:ss");
|
||||
#else
|
||||
Starpelly.OS.ChangeWindowTitle("Heaven Studio (INDEV) " + Application.buildGUID.Substring(0, 8));
|
||||
buildTime = Application.buildGUID.Substring(0, 8) + " " + AppInfo.Date.ToString("dd/MM/yyyy hh:mm:ss");
|
||||
Starpelly.OS.ChangeWindowTitle("Heaven Studio (INDEV) " + Application.buildGUID.Substring(0, 8));
|
||||
buildTime = Application.buildGUID.Substring(0, 8) + " " + AppInfo.Date.ToString("dd/MM/yyyy hh:mm:ss");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -108,8 +108,11 @@ namespace HeavenStudio.Editor
|
|||
AddIcon(minigame);
|
||||
|
||||
UpdateEditorStatus(true);
|
||||
|
||||
#if HEAVENSTUDIO_PROD
|
||||
BuildDateDisplay.text = GlobalGameManager.friendlyReleaseName;
|
||||
#else
|
||||
BuildDateDisplay.text = GlobalGameManager.buildTime;
|
||||
#endif
|
||||
isCursorEnabled = PersistentDataManager.gameSettings.editorCursorEnable;
|
||||
isDiscordEnabled = PersistentDataManager.gameSettings.discordRPCEnable;
|
||||
GameManager.instance.CursorCam.enabled = isCursorEnabled;
|
||||
|
|
|
|||
|
|
@ -936,6 +936,7 @@ namespace HeavenStudio.Editor.Track
|
|||
{
|
||||
Selections.instance.ClickSelect(marker);
|
||||
marker.moving = true;
|
||||
marker.entity.beat = Mathf.Max(MousePos2BeatSnap, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ namespace HeavenStudio
|
|||
[SerializeField] private GameObject playPanel;
|
||||
[SerializeField] private TMP_Text chartTitleText;
|
||||
[SerializeField] private TMP_Text chartMapperText;
|
||||
[SerializeField] private TMP_Text chartIdolText;
|
||||
[SerializeField] private TMP_Text chartDescText;
|
||||
[SerializeField] private TMP_Text chartStyleText;
|
||||
|
||||
|
|
@ -51,6 +52,7 @@ namespace HeavenStudio
|
|||
[SerializeField] private Selectable defaultSelectable;
|
||||
[SerializeField] private RectTransform selectedDisplayRect;
|
||||
[SerializeField] private GameObject selectedDisplayIcon;
|
||||
[SerializeField] private GameObject[] otherHiddenOnMouse;
|
||||
|
||||
private AudioSource musicSource;
|
||||
|
||||
|
|
@ -91,7 +93,9 @@ namespace HeavenStudio
|
|||
selectedDisplayAnim = anim;
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
#if HEAVENSTUDIO_PROD
|
||||
versionText.text = GlobalGameManager.friendlyReleaseName;
|
||||
#elif UNITY_EDITOR
|
||||
versionText.text = "EDITOR";
|
||||
#else
|
||||
versionText.text = Application.buildGUID.Substring(0, 8) + " " + AppInfo.Date.ToString("dd/MM/yyyy hh:mm:ss");
|
||||
|
|
@ -163,6 +167,10 @@ namespace HeavenStudio
|
|||
PlayerInput.CurrentControlStyle = nextController.GetDefaultStyle();
|
||||
usingMouse = PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch;
|
||||
selectedDisplayIcon.SetActive(!usingMouse);
|
||||
foreach (var obj in otherHiddenOnMouse)
|
||||
{
|
||||
obj.SetActive(!usingMouse);
|
||||
}
|
||||
|
||||
if ((lastController as InputJoyshock) != null)
|
||||
{
|
||||
|
|
@ -300,6 +308,10 @@ namespace HeavenStudio
|
|||
{
|
||||
usingMouse = false;
|
||||
selectedDisplayIcon.SetActive(true);
|
||||
foreach (var obj in otherHiddenOnMouse)
|
||||
{
|
||||
obj.SetActive(true);
|
||||
}
|
||||
}
|
||||
currentSelectable.GetComponent<Button>()?.onClick.Invoke();
|
||||
}
|
||||
|
|
@ -311,6 +323,10 @@ namespace HeavenStudio
|
|||
{
|
||||
usingMouse = false;
|
||||
selectedDisplayIcon.SetActive(true);
|
||||
foreach (var obj in otherHiddenOnMouse)
|
||||
{
|
||||
obj.SetActive(true);
|
||||
}
|
||||
currentSelectable = currentSelectable.FindSelectableOnUp();
|
||||
currentSelectable.Select();
|
||||
SetSelectableRectTarget(currentSelectable);
|
||||
|
|
@ -329,6 +345,10 @@ namespace HeavenStudio
|
|||
{
|
||||
usingMouse = false;
|
||||
selectedDisplayIcon.SetActive(true);
|
||||
foreach (var obj in otherHiddenOnMouse)
|
||||
{
|
||||
obj.SetActive(true);
|
||||
}
|
||||
currentSelectable = currentSelectable.FindSelectableOnDown();
|
||||
currentSelectable.Select();
|
||||
SetSelectableRectTarget(currentSelectable);
|
||||
|
|
@ -347,6 +367,10 @@ namespace HeavenStudio
|
|||
{
|
||||
usingMouse = false;
|
||||
selectedDisplayIcon.SetActive(true);
|
||||
foreach (var obj in otherHiddenOnMouse)
|
||||
{
|
||||
obj.SetActive(true);
|
||||
}
|
||||
currentSelectable = currentSelectable.FindSelectableOnLeft();
|
||||
currentSelectable.Select();
|
||||
SetSelectableRectTarget(currentSelectable);
|
||||
|
|
@ -365,6 +389,10 @@ namespace HeavenStudio
|
|||
{
|
||||
usingMouse = false;
|
||||
selectedDisplayIcon.SetActive(true);
|
||||
foreach (var obj in otherHiddenOnMouse)
|
||||
{
|
||||
obj.SetActive(true);
|
||||
}
|
||||
currentSelectable = currentSelectable.FindSelectableOnRight();
|
||||
currentSelectable.Select();
|
||||
SetSelectableRectTarget(currentSelectable);
|
||||
|
|
@ -388,6 +416,10 @@ namespace HeavenStudio
|
|||
mouseSelectable = selectable;
|
||||
usingMouse = true;
|
||||
selectedDisplayIcon.SetActive(false);
|
||||
foreach (var obj in otherHiddenOnMouse)
|
||||
{
|
||||
obj.SetActive(false);
|
||||
}
|
||||
}
|
||||
if (currentSelectable != selectable && usingMouse)
|
||||
{
|
||||
|
|
@ -490,6 +522,7 @@ namespace HeavenStudio
|
|||
chartTitleText.text = beatmap["remixtitle"];
|
||||
chartMapperText.text = beatmap["remixauthor"];
|
||||
chartDescText.text = beatmap["remixdesc"];
|
||||
chartIdolText.text = "♪ " + beatmap["idolcredit"];
|
||||
chartStyleText.text = $"Recommended Control Style: {beatmap["playstyle"].ToString()}";
|
||||
|
||||
playPanel.SetActive(true);
|
||||
|
|
@ -524,10 +557,15 @@ namespace HeavenStudio
|
|||
|
||||
public void SocialsPressed()
|
||||
{
|
||||
snsRevealed = true;
|
||||
snsVersionText.text = GlobalGameManager.buildTime;
|
||||
snsPanel.SetActive(true);
|
||||
// snsRevealed = true;
|
||||
// #if HEAVENSTUDIO_PROD
|
||||
// snsVersionText.text = GlobalGameManager.friendlyReleaseName;
|
||||
// #else
|
||||
// snsVersionText.text = GlobalGameManager.buildTime;
|
||||
// #endif
|
||||
// snsPanel.SetActive(true);
|
||||
SoundByte.PlayOneShot("ui/UISelect");
|
||||
Application.OpenURL("https://github.com/RHeavenStudio/HeavenStudio");
|
||||
// show a panel with our SNS links
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,6 @@
|
|||
|
||||
[](https://www.gnu.org/licenses/gpl-3.0)
|
||||
|
||||
[YouTube Channel](https://www.youtube.com/channel/UCAb3R-5qyXWOEj8B4vibhxQ)
|
||||
|
||||
[itch.io Page](https://rheavenstudio.itch.io/heaven-studio)
|
||||
|
||||
[Documentation](https://rheavenstudio.github.io/)
|
||||
|
|
|
|||
Loading…
Reference in a new issue