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

Custom snap interval, but not in the editor (yet)

Browse source
This commit is contained in:
Braedon 2022-02-11 20:15:36 -05:00
parent 637fc82b43
commit 73042ae2ae
18 changed files with 1037 additions and 1109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

201
Assets/Editor/bread2unity/LICENSE Normal file
View file

@ -0,0 +1,201 @@
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.

7
Assets/Editor/bread2unity/LICENSE.meta Normal file
View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5149fd98229eaac4fb4d8a83f8c9b52f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Editor/bread2unity/README.md Normal file
View file

@ -0,0 +1,2 @@
# bread2unity
Rhythm Heaven animation to Unity animation converter

7
Assets/Editor/bread2unity/README.md.meta Normal file
View file

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

1049
Assets/Resources/Games/rhythmRally.prefab
View file

File diff suppressed because it is too large Load diff

4
Assets/Resources/Games/rhythmTweezers.prefab
View file

@ -98,7 +98,7 @@ Rigidbody2D:
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0
m_GravityScale: 1.5
m_GravityScale: 2.8
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
@ -2266,7 +2266,7 @@ SpriteRenderer:
m_SortingLayer: 0
m_SortingOrder: -1000
m_Sprite: {fileID: 7482667652216324306, guid: ef2fa2a75dc283e40b9d4fe1f20dc6fb, type: 3}
m_Color: {r: 0.8479425, g: 1, b: 0.759434, a: 1}
m_Color: {r: 0.8470589, g: 1, b: 0.7568628, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0

20
Assets/Resources/Prefabs/Cameras.prefab
View file

@ -121,6 +121,7 @@ GameObject:
- component: {fileID: 6234653028453841299}
- component: {fileID: 6355700643848904068}
- component: {fileID: 4269444482100919274}
- component: {fileID: 6584435075898552393}
m_Layer: 0
m_Name: Main Camera
m_TagString: Untagged
@ -152,7 +153,7 @@ Camera:
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
m_BackGroundColor: {r: 0.23529412, g: 0.23529412, b: 0.23529412, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
@ -241,6 +242,23 @@ MonoBehaviour:
m_EditorClassIdentifier:
camera: {fileID: 0}
baseColor: {r: 0, g: 0, b: 0, a: 1}
--- !u!114 &6584435075898552393
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6234653028453841298}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 618b0e3f6c65dd247a4a016150006c57, type: 3}
m_Name:
m_EditorClassIdentifier:
m_LookSpeedController: 120
m_LookSpeedMouse: 4
m_MoveSpeed: 10
m_MoveSpeedIncrement: 2.5
m_Turbo: 10
--- !u!1 &6234653029009288367
GameObject:
m_ObjectHideFlags: 0

463
Assets/Resources/Sprites/Games/RhythmRally/pingpong_model.dae Normal file
View file

File diff suppressed because one or more lines are too long

112
Assets/Resources/Sprites/Games/RhythmRally/pingpong_model.dae.meta Normal file
View file

@ -0,0 +1,112 @@
fileFormatVersion: 2
guid: 53ba8cbf4003b7e46b8a3d43c92657fc
ModelImporter:
serializedVersion: 20200
internalIDToNameTable: []
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: bodyMt_mat
second: {fileID: 2100000, guid: 46d08bc7bd1c6e94d899e9bc785d439c, type: 2}
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: faceMt_mat
second: {fileID: 2100000, guid: 46d08bc7bd1c6e94d899e9bc785d439c, type: 2}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

240
Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/LoopPull.anim
View file

@ -22,49 +22,49 @@ AnimationClip:
time: 0
value: {x: 0.135, y: -0.221, z: -0.003}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: -0.56000006, y: 0, z: 0}
outSlope: {x: -0.8400001, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.05
time: 0.033333335
value: {x: 0.107, y: -0.221, z: -0.003}
inSlope: {x: -0.56000006, y: -0, z: -0}
inSlope: {x: -0.8400001, y: -0, z: -0}
outSlope: {x: -0.65999997, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.083333336
time: 0.06666667
value: {x: 0.085, y: -0.221, z: -0.003}
inSlope: {x: -0.65999997, y: -0, z: -0}
outSlope: {x: -0.64, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
value: {x: 0.053, y: -0.221, z: -0.003}
inSlope: {x: -0.64, y: -0, z: -0}
outSlope: {x: -0.5, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.18333334
value: {x: 0.028, y: -0.221, z: -0.003}
inSlope: {x: -0.5, y: -0, z: -0}
outSlope: {x: -0.9600001, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.2
time: 0.1
value: {x: 0.053, y: -0.221, z: -0.003}
inSlope: {x: -0.9600001, y: -0, z: -0}
outSlope: {x: -0.7499998, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.13333334
value: {x: 0.028, y: -0.221, z: -0.003}
inSlope: {x: -0.7499998, y: -0, z: -0}
outSlope: {x: -0.9600001, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.15
value: {x: 0.012, y: -0.221, z: -0.003}
inSlope: {x: -0.9600001, y: -0, z: -0}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
@ -84,15 +84,15 @@ AnimationClip:
time: 0
value: {x: 1, y: 0.8, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 6, z: 0}
outSlope: {x: 0, y: 4.0499997, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.2
value: {x: 1, y: 2, z: 1}
inSlope: {x: -0, y: 6, z: -0}
value: {x: 1, y: 1.61, z: 1}
inSlope: {x: -0, y: 4.0499997, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
@ -102,7 +102,35 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: LongHairHolder
m_FloatCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.16666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Enabled
path: LongHairHolder/Loop
classID: 212
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
@ -112,24 +140,18 @@ AnimationClip:
- time: 0.033333335
value: {fileID: -3222625713962711138, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- time: 0.05
value: {fileID: -3794404700403252500, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- time: 0.06666667
value: {fileID: -3526909994744005181, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- time: 0.083333336
- time: 0.06666667
value: {fileID: -2242827868839044489, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- time: 0.1
value: {fileID: 178135363591916699, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- time: 0.11666667
- time: 0.083333336
value: {fileID: 947480396733668151, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- time: 0.13333334
- time: 0.1
value: {fileID: 584057860369880946, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- time: 0.15
- time: 0.11666667
value: {fileID: 5445009945567827846, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- time: 0.16666667
value: {fileID: -5403727316971640240, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- time: 0.18333334
- time: 0.13333334
value: {fileID: -1399815886517917591, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- time: 0.2
- time: 0.15
value: {fileID: 942323314217520520, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
attribute: m_Sprite
path: LongHairHolder/Loop
@ -156,6 +178,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2617177149
attribute: 3305885265
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2617177149
attribute: 0
@ -167,14 +196,11 @@ AnimationClip:
- {fileID: 5050934656096793441, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- {fileID: 6395449411100875954, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- {fileID: -3222625713962711138, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- {fileID: -3794404700403252500, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- {fileID: -3526909994744005181, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- {fileID: -2242827868839044489, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- {fileID: 178135363591916699, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- {fileID: 947480396733668151, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- {fileID: 584057860369880946, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- {fileID: 5445009945567827846, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- {fileID: -5403727316971640240, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- {fileID: -1399815886517917591, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
- {fileID: 942323314217520520, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3}
m_AnimationClipSettings:
@ -182,7 +208,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.21666667
m_StopTime: 0.2
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -205,49 +231,49 @@ AnimationClip:
time: 0
value: 0.135
inSlope: Infinity
outSlope: -0.56000006
outSlope: -0.8400001
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.05
time: 0.033333335
value: 0.107
inSlope: -0.56000006
inSlope: -0.8400001
outSlope: -0.65999997
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
time: 0.06666667
value: 0.085
inSlope: -0.65999997
outSlope: -0.64
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0.053
inSlope: -0.64
outSlope: -0.5
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.18333334
value: 0.028
inSlope: -0.5
outSlope: -0.9600001
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
time: 0.1
value: 0.053
inSlope: -0.9600001
outSlope: -0.7499998
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
value: 0.028
inSlope: -0.7499998
outSlope: -0.9600001
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.15
value: 0.012
inSlope: -0.9600001
outSlope: Infinity
@ -275,7 +301,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.05
time: 0.033333335
value: -0.221
inSlope: -0
outSlope: 0
@ -284,7 +310,16 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
time: 0.06666667
value: -0.221
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: -0.221
inSlope: -0
outSlope: 0
@ -302,16 +337,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.18333334
value: -0.221
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
time: 0.15
value: -0.221
inSlope: -0
outSlope: Infinity
@ -339,7 +365,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.05
time: 0.033333335
value: -0.003
inSlope: -0
outSlope: 0
@ -348,7 +374,16 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
time: 0.06666667
value: -0.003
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
value: -0.003
inSlope: -0
outSlope: 0
@ -366,16 +401,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.18333334
value: -0.003
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
time: 0.15
value: -0.003
inSlope: -0
outSlope: Infinity
@ -425,15 +451,15 @@ AnimationClip:
time: 0
value: 0.8
inSlope: 0
outSlope: 6
outSlope: 4.0499997
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.2
value: 2
inSlope: 6
value: 1.61
inSlope: 4.0499997
outSlope: 0
tangentMode: 69
weightedMode: 0
@ -474,6 +500,34 @@ AnimationClip:
path: LongHairHolder
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.16666667
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Enabled
path: LongHairHolder/Loop
classID: 212
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0

3
Assets/Scenes/Editor.unity
View file

@ -7559,7 +7559,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 5, y: -5}
m_SizeDelta: {x: 32, y: 32}
m_SizeDelta: {x: 42, y: 42}
m_Pivot: {x: 0, y: 1}
--- !u!114 &781200687
MonoBehaviour:
@ -15655,6 +15655,7 @@ MonoBehaviour:
LayerCount: 4
metronomeEnabled: 0
resizable: 0
snapInterval: 0.25
TimelineSlider: {fileID: 770589360}
TimelineGridSelect: {fileID: 238901181}
TimelinePlaybackBeat: {fileID: 117889364}

11
Assets/Scripts/Games/RhythmTweezers/LongHair.cs
View file

@ -92,14 +92,13 @@ namespace RhythmHeavenMania.Games.RhythmTweezers
if (pluckState == 1)
{
var hairDirection = tweezers.tweezerSpriteTrans.position - holder.transform.position;
Vector3 tst = tweezers.tweezerSpriteTrans.position;
var hairDirection = new Vector3(tst.x + 0.173f, tst.y) - holder.transform.position;
holder.transform.rotation = Quaternion.FromToRotation(Vector3.down, hairDirection);
float normalizedBeat = Conductor.instance.GetPositionFromBeat(createBeat + game.tweezerBeatOffset + game.beatInterval, 0.5f);
anim.Play("LoopPull", 0, normalizedBeat);
tweezers.anim.Play("Tweezers_LongPluck", 0, normalizedBeat);
// float angleBetweenTweezersAndHair = angleBtw2Points(tweezers.transform.position, holder.transform.position);
// holder.transform.rotation = Quaternion.Euler(new Vector3(0, 0, angleBetweenTweezersAndHair));
// Auto-release if holding at release time.
if (normalizedBeat >= 1f)
@ -109,12 +108,6 @@ namespace RhythmHeavenMania.Games.RhythmTweezers
loop.transform.localScale = Vector2.one / holder.transform.localScale;
}
float angleBtw2Points(Vector3 a, Vector3 b)
{
return Mathf.Atan2(a.y - b.y, a.x - b.x) * Mathf.Rad2Deg;
}
public void Ace()
{
tweezers.LongPluck(true, this);

2
Assets/Scripts/LevelEditor/Editor.cs
View file

@ -182,7 +182,7 @@ namespace RhythmHeavenMania.Editor
{
if (Input.GetKeyDown(KeyCode.S))
{
SaveRemix(false);
// SaveRemix(false);
}
}
}

2
Assets/Scripts/LevelEditor/Timeline/TempoTimeline.cs
View file

@ -83,7 +83,7 @@ namespace RhythmHeavenMania.Editor.Track
if (create == true)
{
tempoChange.transform.position = new Vector3(Editor.instance.EditorCamera.ScreenToWorldPoint(Input.mousePosition).x + 0.08f, tempoChange.transform.position.y);
tempoChange.transform.localPosition = new Vector3(Starpelly.Mathp.Round2Nearest(tempoChange.transform.localPosition.x, 0.25f), tempoChange.transform.localPosition.y);
tempoChange.transform.localPosition = new Vector3(Starpelly.Mathp.Round2Nearest(tempoChange.transform.localPosition.x, Timeline.SnapInterval()), tempoChange.transform.localPosition.y);
Beatmap.TempoChange tempoC = new Beatmap.TempoChange();
tempoC.beat = tempoChange.transform.localPosition.x;

2
Assets/Scripts/LevelEditor/Timeline/TempoTimelineObj.cs
View file

@ -71,7 +71,7 @@ namespace RhythmHeavenMania.Editor.Track
Vector3 mousePos = Editor.instance.EditorCamera.ScreenToWorldPoint(Input.mousePosition);
transform.position = new Vector3(mousePos.x - startPosX, transform.position.y, 0);
transform.localPosition = new Vector3(Mathf.Clamp(Starpelly.Mathp.Round2Nearest(transform.localPosition.x, 0.25f), 0, Mathf.Infinity), transform.localPosition.y);
transform.localPosition = new Vector3(Mathf.Clamp(Starpelly.Mathp.Round2Nearest(transform.localPosition.x, Timeline.SnapInterval()), 0, Mathf.Infinity), transform.localPosition.y);
}
if (Input.GetMouseButtonUp(0))
{

7
Assets/Scripts/LevelEditor/Timeline/Timeline.cs
View file

@ -26,6 +26,9 @@ namespace RhythmHeavenMania.Editor.Track
public bool resizable;
private bool movingPlayback;
public CurrentTimelineState timelineState = new CurrentTimelineState();
public float snapInterval = 0.25f; // 4/4
public static float SnapInterval() { return instance.snapInterval; }
public class CurrentTimelineState
{
@ -256,7 +259,7 @@ namespace RhythmHeavenMania.Editor.Track
if (movingPlayback)
{
RectTransformUtility.ScreenPointToLocalPointInRectangle(TimelineContent, Input.mousePosition, Editor.instance.EditorCamera, out lastMousePos);
TimelineSlider.localPosition = new Vector3(Mathf.Clamp(Mathp.Round2Nearest(lastMousePos.x + 0.12f, 0.25f), 0, Mathf.Infinity), TimelineSlider.transform.localPosition.y);
TimelineSlider.localPosition = new Vector3(Mathf.Clamp(Mathp.Round2Nearest(lastMousePos.x + 0.12f, Timeline.SnapInterval()), 0, Mathf.Infinity), TimelineSlider.transform.localPosition.y);
if (TimelineSlider.localPosition.x != lastBeatPos)
Conductor.instance.SetBeat(TimelineSlider.transform.localPosition.x);
@ -576,7 +579,7 @@ namespace RhythmHeavenMania.Editor.Track
public void SetPlaybackSpeed(float speed)
{
float spd = Mathp.Round2Nearest(speed, 0.25f);
float spd = Mathp.Round2Nearest(speed, Timeline.SnapInterval());
PlaybackSpeed.transform.GetChild(3).GetComponent<TMP_Text>().text = $"Playback Speed: {spd}x";
Conductor.instance.musicSource.pitch = spd;
PlaybackSpeed.value = spd;

10
Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs
View file

@ -149,7 +149,7 @@ namespace RhythmHeavenMania.Editor.Track
lastPos_ = transform.localPosition;
this.transform.position = new Vector3(mousePos.x - startPosX, mousePos.y - startPosY - 0.40f, 0);
this.transform.localPosition = new Vector3(Mathf.Clamp(Mathp.Round2Nearest(this.transform.localPosition.x, 0.25f), 0, Mathf.Infinity), Timeline.instance.SnapToLayer(this.transform.localPosition.y));
this.transform.localPosition = new Vector3(Mathf.Clamp(Mathp.Round2Nearest(this.transform.localPosition.x, Timeline.SnapInterval()), 0, Mathf.Infinity), Timeline.instance.SnapToLayer(this.transform.localPosition.y));
// moveTemp.transform.position = new Vector3(mousePos.x - startPosX, mousePos.y - startPosY - 0.40f, 0);
// moveTemp.transform.localPosition = new Vector3(Mathf.Clamp(Mathp.Round2Nearest(moveTemp.transform.localPosition.x, 0.25f), 0, Mathf.Infinity), Timeline.instance.SnapToLayer(moveTemp.transform.localPosition.y));
@ -171,9 +171,9 @@ namespace RhythmHeavenMania.Editor.Track
RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, Input.mousePosition, Editor.instance.EditorCamera, out mousePos);
sizeDelta = new Vector2(-mousePos.x + 0.15f, sizeDelta.y);
sizeDelta = new Vector2(Mathf.Clamp(sizeDelta.x, 0.25f, rectTransform.localPosition.x), sizeDelta.y);
sizeDelta = new Vector2(Mathf.Clamp(sizeDelta.x, Timeline.SnapInterval(), rectTransform.localPosition.x), sizeDelta.y);
rectTransform.sizeDelta = new Vector2(Mathp.Round2Nearest(sizeDelta.x, 0.25f), sizeDelta.y);
rectTransform.sizeDelta = new Vector2(Mathp.Round2Nearest(sizeDelta.x, Timeline.SnapInterval()), sizeDelta.y);
SetPivot(new Vector2(0, rectTransform.pivot.y));
OnComplete(false);
}
@ -185,9 +185,9 @@ namespace RhythmHeavenMania.Editor.Track
RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, Input.mousePosition, Editor.instance.EditorCamera, out mousePos);
sizeDelta = new Vector2(mousePos.x + 0.15f, sizeDelta.y);
sizeDelta = new Vector2(Mathf.Clamp(sizeDelta.x, 0.25f, Mathf.Infinity), sizeDelta.y);
sizeDelta = new Vector2(Mathf.Clamp(sizeDelta.x, Timeline.SnapInterval(), Mathf.Infinity), sizeDelta.y);
rectTransform.sizeDelta = new Vector2(Mathp.Round2Nearest(sizeDelta.x, 0.25f), sizeDelta.y);
rectTransform.sizeDelta = new Vector2(Mathp.Round2Nearest(sizeDelta.x, Timeline.SnapInterval()), sizeDelta.y);
SetPivot(new Vector2(0, rectTransform.pivot.y));
OnComplete(false);
}

4
Assets/Scripts/Minigames.cs
View file

@ -204,12 +204,12 @@ namespace RhythmHeavenMania
new GameAction("set tweezer delay", delegate { RhythmTweezers.instance.tweezerBeatOffset = eventCaller.currentEntity.length; }, 1f, true),
new GameAction("reset tweezer delay", delegate { RhythmTweezers.instance.tweezerBeatOffset = 0f; }, 0.5f),
}),
/*
new Minigame("rhythmRally", "Rhythm Rally", "B888F8", true, false, new List<GameAction>()
{
}),
new Minigame("spaceDance", "Space Dance", "B888F8", new List<GameAction>()
/*new Minigame("spaceDance", "Space Dance", "B888F8", new List<GameAction>()
{
}),
new Minigame("tapTrial", "Tap Trial", "B888F8", new List<GameAction>()