Alternate Control Styles Support (#554)

* add mouse controller

* support different control styles in options

deprecate old input check methods

* fully functional input actions system

* btsds InputAction

* blue bear InputAction

* more games

fix bugs with some input related systems

* coin toss re-toss

* cheer readers touch

* dog ninja touch

* multiple games

* last of the easy games' touch

* more specialized games

* specialized games 2

* finish ktb games

* remove legacy settings disclaimer

* "only" two games left

* karate man touch

* rockers touch

still needs fixes and bad judge strum

* DSGuy flicking animation

* playstyle chart property

* improve performance of minigame preloading

* improve look of cursor

make assetbundles use chunk-based compression
refactor assetbundle loading methods a bit

* prime conductor stream playback to stabilize seeking operations

* fix air rally swing on pad release

* use virtual mouse pointer

* add UniTask

* make BeatAction use UniTask

* implement UniTask to replace some coroutines

* add touch style UI elements and effects

games now support the ability to define two cursor colours if they need split screen touch inputs

* update plugins and buildscript

* implement thresholded pointer position clipping

* fix clamping

* instant show / hide

fix discord game SDK crashes
This commit is contained in:
minenice55 2023-10-29 15:44:47 -04:00 committed by GitHub
parent d30a59ac21
commit 8fa4d74096
212 changed files with 55447 additions and 8426 deletions

View file

@ -22,7 +22,7 @@ namespace UnityBuilderAction
string appName = PlayerSettings.productName; string appName = PlayerSettings.productName;
// Get filename. // Get filename.
string path = EditorUtility.SaveFilePanel("Build out WINDOWS to...", "", appName, "exe"); string path = EditorUtility.SaveFilePanel("Build out WINDOWS to...", "", appName, "exe");
Build( BuildTarget.StandaloneWindows, 0, path); Build( BuildTarget.StandaloneWindows64, 0, path);
} }
[MenuItem("File/Build Linux")] [MenuItem("File/Build Linux")]
@ -225,7 +225,7 @@ namespace UnityBuilderAction
{ {
Directory.CreateDirectory(assetBundleDirectory); Directory.CreateDirectory(assetBundleDirectory);
} }
BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ForceRebuildAssetBundle, buildTarget); BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ForceRebuildAssetBundle | BuildAssetBundleOptions.ChunkBasedCompression, buildTarget);
BuildSummary buildSummary = BuildPipeline.BuildPlayer(buildPlayerOptions).summary; BuildSummary buildSummary = BuildPipeline.BuildPlayer(buildPlayerOptions).summary;
ReportSummary(buildSummary); ReportSummary(buildSummary);

View file

@ -9,14 +9,47 @@ using UnityEngine;
public class CreateAssetBundles public class CreateAssetBundles
{ {
[MenuItem("Assets/Build AssetBundles")] [MenuItem("Assets/Build AssetBundles/Current Platform")]
static void BuildAllAssetBundles() static void BuildAllAssetBundlesCurrPlatform()
{ {
string assetBundleDirectory = "Assets/StreamingAssets"; string assetBundleDirectory = "Assets/StreamingAssets";
if (!Directory.Exists(Application.streamingAssetsPath)) if (!Directory.Exists(Application.streamingAssetsPath))
{ {
Directory.CreateDirectory(assetBundleDirectory); Directory.CreateDirectory(assetBundleDirectory);
}
BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, EditorUserBuildSettings.activeBuildTarget);
} }
BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.None, EditorUserBuildSettings.activeBuildTarget);
[MenuItem("Assets/Build AssetBundles/Windows")]
static void BuildAllAssetBundlesWindows()
{
string assetBundleDirectory = "Assets/StreamingAssets/Windows";
if (!Directory.Exists(Application.streamingAssetsPath))
{
Directory.CreateDirectory(assetBundleDirectory);
}
BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneWindows);
}
[MenuItem("Assets/Build AssetBundles/Linux")]
static void BuildAllAssetBundlesLinux()
{
string assetBundleDirectory = "Assets/StreamingAssets/Linux";
if (!Directory.Exists(Application.streamingAssetsPath))
{
Directory.CreateDirectory(assetBundleDirectory);
}
BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneLinux64);
}
[MenuItem("Assets/Build AssetBundles/Mac")]
static void BuildAllAssetBundlesMacOS()
{
string assetBundleDirectory = "Assets/StreamingAssets/Mac";
if (!Directory.Exists(Application.streamingAssetsPath))
{
Directory.CreateDirectory(assetBundleDirectory);
}
BuildPipeline.BuildAssetBundles(assetBundleDirectory, BuildAssetBundleOptions.ChunkBasedCompression, BuildTarget.StandaloneOSX);
} }
} }

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 46ec8bf5775b6af429f16d7140f02d54 guid: 744658200b40eb54595b8aaf092485cc
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View file

@ -1,12 +1,12 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 53ce567e644ef4880b1db00e550aa797 guid: 96fc096f6b288424faf79ea974b7041e
PluginImporter: PluginImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
defineConstraints: [] defineConstraints: []
isPreloaded: 1 isPreloaded: 0
isOverridable: 0 isOverridable: 0
isExplicitlyReferenced: 0 isExplicitlyReferenced: 0
validateReferences: 1 validateReferences: 1
@ -16,44 +16,36 @@ PluginImporter:
second: second:
enabled: 0 enabled: 0
settings: settings:
Exclude Android: 0
Exclude Editor: 0 Exclude Editor: 0
Exclude Linux64: 1 Exclude Linux64: 1
Exclude OSXUniversal: 0 Exclude OSXUniversal: 0
Exclude Win: 1 Exclude Win: 1
Exclude Win64: 1 Exclude Win64: 1
Exclude iOS: 0
- first:
Android: Android
second:
enabled: 1
settings:
CPU: ARMv7
- first: - first:
Any: Any:
second: second:
enabled: 1 enabled: 0
settings: {} settings: {}
- first: - first:
Editor: Editor Editor: Editor
second: second:
enabled: 1 enabled: 1
settings: settings:
CPU: AnyCPU CPU: ARM64
DefaultValueInitialized: true DefaultValueInitialized: true
OS: AnyOS OS: OSX
- first: - first:
Standalone: Linux64 Standalone: Linux64
second: second:
enabled: 0 enabled: 0
settings: settings:
CPU: None CPU: x86_64
- first: - first:
Standalone: OSXUniversal Standalone: OSXUniversal
second: second:
enabled: 1 enabled: 1
settings: settings:
CPU: AnyCPU CPU: ARM64
- first: - first:
Standalone: Win Standalone: Win
second: second:
@ -66,15 +58,6 @@ PluginImporter:
enabled: 0 enabled: 0
settings: settings:
CPU: x86_64 CPU: x86_64
- first:
iPhone: iOS
second:
enabled: 1
settings:
AddToEmbeddedBinaries: false
CPU: AnyCPU
CompileFlags:
FrameworkDependencies:
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View file

@ -0,0 +1,63 @@
fileFormatVersion: 2
guid: 84f8495f7ca76e94c9e4bfe9675f534c
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
: Any
second:
enabled: 0
settings:
Exclude Editor: 0
Exclude Linux64: 1
Exclude OSXUniversal: 0
Exclude Win: 1
Exclude Win64: 1
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 1
settings:
CPU: ARM64
DefaultValueInitialized: true
OS: OSX
- first:
Standalone: Linux64
second:
enabled: 0
settings:
CPU: x86_64
- first:
Standalone: OSXUniversal
second:
enabled: 1
settings:
CPU: ARM64
- first:
Standalone: Win
second:
enabled: 0
settings:
CPU: x86
- first:
Standalone: Win64
second:
enabled: 0
settings:
CPU: x86_64
userData:
assetBundleName:
assetBundleVariant:

View file

@ -45,7 +45,7 @@ PluginImporter:
second: second:
enabled: 1 enabled: 1
settings: settings:
CPU: AnyCPU CPU: x86_64
- first: - first:
Standalone: Win Standalone: Win
second: second:

View file

@ -11,6 +11,16 @@ PluginImporter:
isExplicitlyReferenced: 0 isExplicitlyReferenced: 0
validateReferences: 1 validateReferences: 1
platformData: platformData:
- first:
: Any
second:
enabled: 0
settings:
Exclude Editor: 1
Exclude Linux64: 0
Exclude OSXUniversal: 0
Exclude Win: 0
Exclude Win64: 0
- first: - first:
Any: Any:
second: second:
@ -21,18 +31,19 @@ PluginImporter:
second: second:
enabled: 0 enabled: 0
settings: settings:
CPU: x86 CPU: AnyCPU
DefaultValueInitialized: true DefaultValueInitialized: true
OS: Windows
- first: - first:
Standalone: Linux64 Standalone: Linux64
second: second:
enabled: 0 enabled: 1
settings: settings:
CPU: None CPU: None
- first: - first:
Standalone: OSXUniversal Standalone: OSXUniversal
second: second:
enabled: 0 enabled: 1
settings: settings:
CPU: x86 CPU: x86
- first: - first:
@ -44,7 +55,7 @@ PluginImporter:
- first: - first:
Standalone: Win64 Standalone: Win64
second: second:
enabled: 0 enabled: 1
settings: settings:
CPU: None CPU: None
userData: userData:

Binary file not shown.

View file

@ -130,13 +130,13 @@ public static class JSL
public delegate void ConnectionCallback(int handle); public delegate void ConnectionCallback(int handle);
public delegate void DeconnectionCallback(int handle, bool isConnected); public delegate void DeconnectionCallback(int handle, bool isConnected);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslConnectDevices(); public static extern int JslConnectDevices();
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslGetConnectedDeviceHandles(int[] deviceHandleArray, int size); public static extern int JslGetConnectedDeviceHandles(int[] deviceHandleArray, int size);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslDisconnectAndDisposeAll(); public static extern void JslDisconnectAndDisposeAll();
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern bool JslStillConnected(int deviceId); public static extern bool JslStillConnected(int deviceId);
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
@ -148,72 +148,72 @@ public static class JSL
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern TOUCH_STATE JslGetTouchState(int deviceId); public static extern TOUCH_STATE JslGetTouchState(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslSetGyroSpace(int deviceId, int gyroSpace); public static extern void JslSetGyroSpace(int deviceId, int gyroSpace);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern float JslGetStickStep(int deviceId); public static extern float JslGetStickStep(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern float JslGetTriggerStep(int deviceId); public static extern float JslGetTriggerStep(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern float JslGetPollRate(int deviceId); public static extern float JslGetPollRate(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern float JslGetTimeSinceLastUpdate(int deviceId); public static extern float JslGetTimeSinceLastUpdate(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern float JslGetTouchId(int deviceId, bool secondTouch = false); public static extern float JslGetTouchId(int deviceId, bool secondTouch = false);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern float JslGetTouchDown(int deviceId, bool secondTouch = false); public static extern float JslGetTouchDown(int deviceId, bool secondTouch = false);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern float JslGetTouchX(int deviceId, bool secondTouch = false); public static extern float JslGetTouchX(int deviceId, bool secondTouch = false);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern float JslGetTouchY(int deviceId, bool secondTouch = false); public static extern float JslGetTouchY(int deviceId, bool secondTouch = false);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslResetContinuousCalibration(int deviceId); public static extern void JslResetContinuousCalibration(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslStartContinuousCalibration(int deviceId); public static extern void JslStartContinuousCalibration(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslPauseContinuousCalibration(int deviceId); public static extern void JslPauseContinuousCalibration(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslGetCalibrationOffset(int deviceId, ref float xOffset, ref float yOffset, ref float zOffset); public static extern void JslGetCalibrationOffset(int deviceId, ref float xOffset, ref float yOffset, ref float zOffset);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslGetCalibrationOffset(int deviceId, float xOffset, float yOffset, float zOffset); public static extern void JslGetCalibrationOffset(int deviceId, float xOffset, float yOffset, float zOffset);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern JSL_AUTO_CALIBRATION JslGetAutoCalibrationStatus(int deviceId); public static extern JSL_AUTO_CALIBRATION JslGetAutoCalibrationStatus(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslSetCallback(EventCallback callback); public static extern void JslSetCallback(EventCallback callback);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslSetTouchCallback(TouchCallback callback); public static extern void JslSetTouchCallback(TouchCallback callback);
// this function will get called for each device when it is newly connected // this function will get called for each device when it is newly connected
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslSetConnectCallback(ConnectionCallback callback); public static extern void JslSetConnectCallback(ConnectionCallback callback);
// this function will get called for each device when it is disconnected // this function will get called for each device when it is disconnected
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslSetDisconnectCallback(DeconnectionCallback callback); public static extern void JslSetDisconnectCallback(DeconnectionCallback callback);
// super-getter for reading a whole lot of state at once // super-getter for reading a whole lot of state at once
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern JSL_SETTINGS JslGetControllerInfoAndSettings(int deviceId); public static extern JSL_SETTINGS JslGetControllerInfoAndSettings(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslGetControllerType(int deviceId); public static extern int JslGetControllerType(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslGetControllerSplitType(int deviceId); public static extern int JslGetControllerSplitType(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslGetControllerColour(int deviceId); public static extern int JslGetControllerColour(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslGetControllerButtonColour(int deviceId); public static extern int JslGetControllerButtonColour(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslGetControllerLeftGripColour(int deviceId); public static extern int JslGetControllerLeftGripColour(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslGetControllerRightGripColour(int deviceId); public static extern int JslGetControllerRightGripColour(int deviceId);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslSetLightColour(int deviceId, int colour); public static extern void JslSetLightColour(int deviceId, int colour);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslSetRumble(int deviceId, int smallRumble, int bigRumble); public static extern void JslSetRumble(int deviceId, int smallRumble, int bigRumble);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslSetRumbleFrequency(int deviceId, float smallRumble, float bigRumble, float smallFrequency, float bigFrequency); public static extern void JslSetRumbleFrequency(int deviceId, float smallRumble, float bigRumble, float smallFrequency, float bigFrequency);
[DllImport("JoyShockLibrary")] [DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslSetPlayerNumber(int deviceId, int number); public static extern void JslSetPlayerNumber(int deviceId, int number);
} }

View file

@ -1,5 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 8290861ef07e2d74497c02c16ea45608 guid: ff63a2670a6ba934aaf5addc3520f87e
folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View file

@ -19,7 +19,7 @@ PluginImporter:
Exclude Editor: 0 Exclude Editor: 0
Exclude Linux64: 0 Exclude Linux64: 0
Exclude OSXUniversal: 0 Exclude OSXUniversal: 0
Exclude Win: 0 Exclude Win: 1
Exclude Win64: 0 Exclude Win64: 0
- first: - first:
Any: Any:
@ -31,9 +31,9 @@ PluginImporter:
second: second:
enabled: 1 enabled: 1
settings: settings:
CPU: AnyCPU CPU: x86_64
DefaultValueInitialized: true DefaultValueInitialized: true
OS: AnyOS OS: Windows
- first: - first:
Standalone: Linux64 Standalone: Linux64
second: second:
@ -49,9 +49,9 @@ PluginImporter:
- first: - first:
Standalone: Win Standalone: Win
second: second:
enabled: 1 enabled: 0
settings: settings:
CPU: x86 CPU: None
- first: - first:
Standalone: Win64 Standalone: Win64
second: second:

View file

@ -0,0 +1,63 @@
fileFormatVersion: 2
guid: 129c872137ca57441bd8e920a0caceef
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
: Any
second:
enabled: 0
settings:
Exclude Editor: 1
Exclude Linux64: 1
Exclude OSXUniversal: 1
Exclude Win: 1
Exclude Win64: 1
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: AnyOS
- first:
Standalone: Linux64
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: OSXUniversal
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: Win
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: Win64
second:
enabled: 0
settings:
CPU: None
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1,12 +1,12 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 129c872137ca57441bd8e920a0caceef guid: 4808849b7792adb4b852af4fbb552d0e
PluginImporter: PluginImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
defineConstraints: [] defineConstraints: []
isPreloaded: 0 isPreloaded: 1
isOverridable: 0 isOverridable: 0
isExplicitlyReferenced: 0 isExplicitlyReferenced: 0
validateReferences: 1 validateReferences: 1
@ -17,14 +17,14 @@ PluginImporter:
enabled: 0 enabled: 0
settings: settings:
Exclude Editor: 0 Exclude Editor: 0
Exclude Linux64: 0 Exclude Linux64: 1
Exclude OSXUniversal: 0 Exclude OSXUniversal: 0
Exclude Win: 0 Exclude Win: 1
Exclude Win64: 0 Exclude Win64: 1
- first: - first:
Any: Any:
second: second:
enabled: 1 enabled: 0
settings: {} settings: {}
- first: - first:
Editor: Editor Editor: Editor
@ -33,11 +33,11 @@ PluginImporter:
settings: settings:
CPU: AnyCPU CPU: AnyCPU
DefaultValueInitialized: true DefaultValueInitialized: true
OS: AnyOS OS: OSX
- first: - first:
Standalone: Linux64 Standalone: Linux64
second: second:
enabled: 1 enabled: 0
settings: settings:
CPU: AnyCPU CPU: AnyCPU
- first: - first:
@ -49,13 +49,13 @@ PluginImporter:
- first: - first:
Standalone: Win Standalone: Win
second: second:
enabled: 1 enabled: 0
settings: settings:
CPU: x86 CPU: x86
- first: - first:
Standalone: Win64 Standalone: Win64
second: second:
enabled: 1 enabled: 0
settings: settings:
CPU: x86_64 CPU: x86_64
userData: userData:

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: c785dbfac2c67974fa1cce056df6404d guid: 2fca353d6ce7fb94099ff7c8b75293a3
PluginImporter: PluginImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
@ -33,7 +33,7 @@ PluginImporter:
settings: settings:
CPU: AnyCPU CPU: AnyCPU
DefaultValueInitialized: true DefaultValueInitialized: true
OS: AnyOS OS: Linux
- first: - first:
Standalone: Linux64 Standalone: Linux64
second: second:

View file

@ -16,6 +16,7 @@ namespace Starpelly
/// </summary> /// </summary>
public static Color Hex2RGB(this string hex) public static Color Hex2RGB(this string hex)
{ {
if (hex is null or "") return Color.black;
try try
{ {
hex = hex.Replace("0x", "");//in case the string is formatted 0xFFFFFF hex = hex.Replace("0x", "");//in case the string is formatted 0xFFFFFF
@ -25,7 +26,7 @@ namespace Starpelly
byte g = byte.Parse(hex.Substring(2, 2), System.Globalization.NumberStyles.HexNumber); byte g = byte.Parse(hex.Substring(2, 2), System.Globalization.NumberStyles.HexNumber);
byte b = byte.Parse(hex.Substring(4, 2), System.Globalization.NumberStyles.HexNumber); byte b = byte.Parse(hex.Substring(4, 2), System.Globalization.NumberStyles.HexNumber);
//Only use alpha if the string has enough characters //Only use alpha if the string has enough characters
if (hex.Length == 8) if (hex.Length >= 8)
{ {
a = byte.Parse(hex.Substring(6, 2), System.Globalization.NumberStyles.HexNumber); a = byte.Parse(hex.Substring(6, 2), System.Globalization.NumberStyles.HexNumber);
} }

View file

@ -1,5 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 309dd656c95dd434ba2f1ccefa8b3ec0 guid: 5b6706d996c476a499aa408e80896ef8
folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View file

@ -0,0 +1,295 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
m_Name: FOT-KurokaneStd_Megamix_Modified-EB SDF
m_EditorClassIdentifier:
m_Version: 1.1.0
m_FaceInfo:
m_FaceIndex: 0
m_FamilyName: FOT-Kurokane Std
m_StyleName: (Megamix Modified) EB
m_PointSize: 90
m_Scale: 1
m_UnitsPerEM: 1000
m_LineHeight: 180
m_AscentLine: 79.200005
m_CapLine: 70
m_MeanLine: 45
m_Baseline: 0
m_DescentLine: -10.8
m_SuperscriptOffset: 79.200005
m_SuperscriptSize: 0.5
m_SubscriptOffset: -10.8
m_SubscriptSize: 0.5
m_UnderlineOffset: -11.25
m_UnderlineThickness: 4.5
m_StrikethroughOffset: 18
m_StrikethroughThickness: 4.5
m_TabWidth: 25
m_Material: {fileID: 1618155055176292627}
m_SourceFontFileGUID: e22d5ff7d28211244a36b00ccc4ec738
m_CreationSettings:
sourceFontFileName:
sourceFontFileGUID: e22d5ff7d28211244a36b00ccc4ec738
faceIndex: 0
pointSizeSamplingMode: 0
pointSize: 90
padding: 9
paddingMode: 2
packingMode: 0
atlasWidth: 1024
atlasHeight: 1024
characterSetSelectionMode: 7
characterSequence:
referencedFontAssetGUID:
referencedTextAssetGUID:
fontStyle: 0
fontStyleModifier: 0
renderMode: 4165
includeFontFeatures: 0
m_SourceFontFile: {fileID: 12800000, guid: e22d5ff7d28211244a36b00ccc4ec738, type: 3}
m_SourceFontFilePath:
m_AtlasPopulationMode: 1
InternalDynamicOS: 0
m_GlyphTable: []
m_CharacterTable: []
m_AtlasTextures:
- {fileID: 7565207379736317986}
m_AtlasTextureIndex: 0
m_IsMultiAtlasTexturesEnabled: 1
m_GetFontFeatures: 1
m_ClearDynamicDataOnBuild: 1
m_AtlasWidth: 1024
m_AtlasHeight: 1024
m_AtlasPadding: 9
m_AtlasRenderMode: 4165
m_UsedGlyphRects: []
m_FreeGlyphRects:
- m_X: 0
m_Y: 0
m_Width: 1023
m_Height: 1023
m_FontFeatureTable:
m_MultipleSubstitutionRecords: []
m_LigatureSubstitutionRecords: []
m_GlyphPairAdjustmentRecords: []
m_MarkToBaseAdjustmentRecords: []
m_MarkToMarkAdjustmentRecords: []
m_ShouldReimportFontFeatures: 0
m_FallbackFontAssetTable: []
m_FontWeightTable:
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
fontWeights: []
normalStyle: 0
normalSpacingOffset: 0
boldStyle: 0.75
boldSpacing: 7
italicStyle: 35
tabSize: 10
m_fontInfo:
Name:
PointSize: 0
Scale: 0
CharacterCount: 0
LineHeight: 0
Baseline: 0
Ascender: 0
CapHeight: 0
Descender: 0
CenterLine: 0
SuperscriptOffset: 0
SubscriptOffset: 0
SubSize: 0
Underline: 0
UnderlineThickness: 0
strikethrough: 0
strikethroughThickness: 0
TabWidth: 0
Padding: 0
AtlasWidth: 0
AtlasHeight: 0
m_glyphInfoList: []
m_KerningTable:
kerningPairs: []
fallbackFontAssets: []
atlas: {fileID: 0}
--- !u!21 &1618155055176292627
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FOT-KurokaneStd_Megamix_Modified-EB Atlas Material
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Cube:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FaceTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 7565207379736317986}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OutlineTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Ambient: 0.5
- _Bevel: 0.5
- _BevelClamp: 0
- _BevelOffset: 0
- _BevelRoundness: 0
- _BevelWidth: 0
- _BumpFace: 0
- _BumpOutline: 0
- _ColorMask: 15
- _CullMode: 0
- _Diffuse: 0.5
- _FaceDilate: 0
- _FaceUVSpeedX: 0
- _FaceUVSpeedY: 0
- _GlowInner: 0.05
- _GlowOffset: 0
- _GlowOuter: 0.05
- _GlowPower: 0.75
- _GradientScale: 10
- _LightAngle: 3.1416
- _MaskSoftnessX: 0
- _MaskSoftnessY: 0
- _OutlineSoftness: 0
- _OutlineUVSpeedX: 0
- _OutlineUVSpeedY: 0
- _OutlineWidth: 0
- _PerspectiveFilter: 0.875
- _Reflectivity: 10
- _ScaleRatioA: 1
- _ScaleRatioB: 1
- _ScaleRatioC: 1
- _ScaleX: 1
- _ScaleY: 1
- _ShaderFlags: 0
- _Sharpness: 0
- _SpecularPower: 2
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _TextureHeight: 1024
- _TextureWidth: 1024
- _UnderlayDilate: 0
- _UnderlayOffsetX: 0
- _UnderlayOffsetY: 0
- _UnderlaySoftness: 0
- _VertexOffsetX: 0
- _VertexOffsetY: 0
- _WeightBold: 0.75
- _WeightNormal: 0
m_Colors:
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
- _FaceColor: {r: 1, g: 1, b: 1, a: 1}
- _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
- _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
- _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
m_BuildTextureStacks: []
--- !u!28 &7565207379736317986
Texture2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FOT-KurokaneStd_Megamix_Modified-EB Atlas
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 2
m_Width: 1
m_Height: 1
m_CompleteImageSize: 1
m_MipsStripped: 0
m_TextureFormat: 1
m_MipCount: 1
m_IsReadable: 1
m_IsPreProcessed: 0
m_IgnoreMasterTextureLimit: 0
m_StreamingMipmaps: 0
m_StreamingMipmapsPriority: 0
m_VTOnly: 0
m_AlphaIsTransparency: 0
m_ImageCount: 1
m_TextureDimension: 2
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 0
m_WrapV: 0
m_WrapW: 0
m_LightmapFormat: 0
m_ColorSpace: 0
m_PlatformBlob:
image data: 1
_typelessdata: 00
m_StreamData:
serializedVersion: 2
offset: 0
size: 0
path:

View file

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

View file

@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: e22d5ff7d28211244a36b00ccc4ec738
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontNames:
- FOT-Kurokane Std
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1310,7 +1310,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: -1
m_Sprite: {fileID: 471275613544938806, guid: 1f442840d85d9e944819c7e21ab38483, type: 3} m_Sprite: {fileID: 471275613544938806, guid: 1f442840d85d9e944819c7e21ab38483, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.41960785} m_Color: {r: 1, g: 1, b: 1, a: 0.41960785}
m_FlipX: 0 m_FlipX: 0
@ -12337,7 +12337,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 4 m_SortingOrder: 0
m_RenderMode: 0 m_RenderMode: 0
m_MeshDistribution: 0 m_MeshDistribution: 0
m_SortMode: 0 m_SortMode: 0
@ -14435,7 +14435,6 @@ MonoBehaviour:
SoundSequences: [] SoundSequences: []
EligibleHits: [] EligibleHits: []
scheduledInputs: [] scheduledInputs: []
firstEnable: 0
soccer: {fileID: 6033749656558512970, guid: 3f09924efb4db354aa2899ebbebfbcf5, type: 3} soccer: {fileID: 6033749656558512970, guid: 3f09924efb4db354aa2899ebbebfbcf5, type: 3}
basket: {fileID: 5811262171106880114, guid: 5f00b13cb8a13dc49b2fc7d78e9c8a5d, type: 3} basket: {fileID: 5811262171106880114, guid: 5f00b13cb8a13dc49b2fc7d78e9c8a5d, type: 3}
football: {fileID: 8037004963704552774, guid: 8945cdc8b29cf4640b7f7d1c678be884, type: 3} football: {fileID: 8037004963704552774, guid: 8945cdc8b29cf4640b7f7d1c678be884, type: 3}
@ -14457,7 +14456,7 @@ MonoBehaviour:
anchor: {fileID: 0} anchor: {fileID: 0}
positions: positions:
- tag: - tag:
pos: {x: -12.2, y: -2.75, z: 0} pos: {x: -12.5, y: -2.75, z: 0}
target: {fileID: 0} target: {fileID: 0}
height: 4.4 height: 4.4
duration: 1 duration: 1
@ -14466,7 +14465,7 @@ MonoBehaviour:
- key: rot - key: rot
value: 135 value: 135
- tag: - tag:
pos: {x: -6.7, y: -2.75, z: 0} pos: {x: -7.75, y: -2.75, z: 0}
target: {fileID: 0} target: {fileID: 0}
height: 2.75 height: 2.75
duration: 1.2 duration: 1.2
@ -14475,19 +14474,19 @@ MonoBehaviour:
- key: rot - key: rot
value: 202.5 value: 202.5
- tag: - tag:
pos: {x: -1.2, y: -2.75, z: 0} pos: {x: -2.15, y: -2.75, z: 0}
target: {fileID: 0} target: {fileID: 0}
height: 2.5 height: 2.5
duration: 1.2 duration: 1.25
useLastRealPos: 0 useLastRealPos: 0
values: values:
- key: rot - key: rot
value: 151.875 value: 151.875
- tag: - tag:
pos: {x: 4.3, y: -2.75, z: 0} pos: {x: 3.5, y: -2.75, z: 0}
target: {fileID: 0} target: {fileID: 0}
height: 1.8 height: 1.8
duration: 1.5 duration: 1.6
useLastRealPos: 0 useLastRealPos: 0
values: values:
- key: rot - key: rot
@ -14582,7 +14581,7 @@ MonoBehaviour:
anchor: {fileID: 0} anchor: {fileID: 0}
positions: positions:
- tag: - tag:
pos: {x: -12, y: -2.75, z: 0} pos: {x: -12.25, y: -2.75, z: 0}
target: {fileID: 0} target: {fileID: 0}
height: 4.4 height: 4.4
duration: 1 duration: 1

View file

@ -27064,7 +27064,7 @@ MonoBehaviour:
pitch: 1 pitch: 1
volume: 1 volume: 1
looping: 0 looping: 0
offset: 0.055 offset: 0.02
parameters: [] parameters: []
- name: arisa_iina_fast - name: arisa_iina_fast
sequence: sequence:
@ -27083,7 +27083,7 @@ MonoBehaviour:
pitch: 1 pitch: 1
volume: 1 volume: 1
looping: 0 looping: 0
offset: 0.055 offset: 0.025
parameters: [] parameters: []
- name: crowd_big_ready - name: crowd_big_ready
sequence: sequence:
@ -27165,7 +27165,6 @@ MonoBehaviour:
parameters: [] parameters: []
EligibleHits: [] EligibleHits: []
scheduledInputs: [] scheduledInputs: []
firstEnable: 0
StageAnimator: {fileID: 22498285944424125} StageAnimator: {fileID: 22498285944424125}
Arisa: {fileID: 3728697055337045071} Arisa: {fileID: 3728697055337045071}
ArisaRootMotion: {fileID: 2223479141072930853} ArisaRootMotion: {fileID: 2223479141072930853}

View file

@ -22,6 +22,33 @@ AnimatorStateTransition:
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1102 &-7660928310954623538
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UnReady1
m_Speed: -4
m_CycleOffset: 1
m_Transitions:
- {fileID: 5805743421897320861}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -4791534359250169297, guid: cebeb8610d89fb34688750080a285ddb, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-3986917046676279002 --- !u!1102 &-3986917046676279002
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6
@ -59,16 +86,16 @@ AnimatorStateMachine:
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 6416047872712211942} m_State: {fileID: 6416047872712211942}
m_Position: {x: 240, y: 260, z: 0} m_Position: {x: 200, y: 240, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 4424825005415695879} m_State: {fileID: 4424825005415695879}
m_Position: {x: 320, y: 50, z: 0} m_Position: {x: 320, y: 50, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -3986917046676279002} m_State: {fileID: -3986917046676279002}
m_Position: {x: 460, y: 190, z: 0} m_Position: {x: 200, y: 290, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 124654373728809099} m_State: {fileID: 124654373728809099}
m_Position: {x: 510, y: 260, z: 0} m_Position: {x: 420, y: 190, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 7339080780637248285} m_State: {fileID: 7339080780637248285}
m_Position: {x: 550, y: 330, z: 0} m_Position: {x: 550, y: 330, z: 0}
@ -78,6 +105,9 @@ AnimatorStateMachine:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 7618035723044257044} m_State: {fileID: 7618035723044257044}
m_Position: {x: 270, y: 120, z: 0} m_Position: {x: 270, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: -7660928310954623538}
m_Position: {x: 630, y: 190, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
@ -162,6 +192,28 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1101 &5805743421897320861
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7618035723044257044}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &6416047872712211942 --- !u!1102 &6416047872712211942
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6

View file

@ -550,15 +550,17 @@ MonoBehaviour:
m_lineSpacingMax: 0 m_lineSpacingMax: 0
m_paragraphSpacing: 0 m_paragraphSpacing: 0
m_charWidthMaxAdj: 0 m_charWidthMaxAdj: 0
m_enableWordWrapping: 1 m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4 m_wordWrappingRatios: 0.4
m_overflowMode: 0 m_overflowMode: 0
m_linkedTextComponent: {fileID: 0} m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0} parentLinkedComponent: {fileID: 0}
m_enableKerning: 1 m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_enableExtraPadding: 0 m_enableExtraPadding: 0
checkPaddingRequired: 0 checkPaddingRequired: 0
m_isRichText: 1 m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1 m_parseCtrlCharacters: 1
m_isOrthographic: 1 m_isOrthographic: 1
m_isCullingEnabled: 0 m_isCullingEnabled: 0
@ -771,6 +773,9 @@ MonoBehaviour:
- tag: remixdesc - tag: remixdesc
label: Description label: Description
isReadOnly: 0 isReadOnly: 0
- tag: playstyle
label: Recommended Control Style
isReadOnly: 0
- tag: remixtags - tag: remixtags
label: Tags label: Tags
isReadOnly: 0 isReadOnly: 0

View file

@ -170,6 +170,120 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 3 m_PixelsPerUnitMultiplier: 3
--- !u!1 &435555855710102188
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7576197626345016079}
- component: {fileID: 1664206953461466981}
- component: {fileID: 7845231527756581285}
m_Layer: 31
m_Name: FlasherL
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7576197626345016079
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 435555855710102188}
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: 8552962828543516429}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 2, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1664206953461466981
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 435555855710102188}
m_CullTransparentMesh: 1
--- !u!114 &7845231527756581285
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 435555855710102188}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0, b: 0, a: 0.1254902}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8be59c4bde4258c429ac39251f5f681b, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 5
--- !u!1 &699803779871748277
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8552962828543516429}
m_Layer: 31
m_Name: Flashers
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &8552962828543516429
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 699803779871748277}
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:
- {fileID: 7576197626345016079}
- {fileID: 8281773103246844715}
m_Father: {fileID: 2077856143944097172}
m_RootOrder: 3
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: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2464883521749415129 --- !u!1 &2464883521749415129
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -693,6 +807,82 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6809880121875460609
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8281773103246844715}
- component: {fileID: 7734333607666534753}
- component: {fileID: 2240635501115395630}
m_Layer: 31
m_Name: FlasherR
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8281773103246844715
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6809880121875460609}
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: 8552962828543516429}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.0000009536743, y: 0}
m_SizeDelta: {x: 2, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7734333607666534753
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6809880121875460609}
m_CullTransparentMesh: 1
--- !u!114 &2240635501115395630
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6809880121875460609}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 1, a: 0.1254902}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8be59c4bde4258c429ac39251f5f681b, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 5
--- !u!1 &7051539713125569525 --- !u!1 &7051539713125569525
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -894,6 +1084,7 @@ RectTransform:
- {fileID: 2769789585838315502} - {fileID: 2769789585838315502}
- {fileID: 8925473620302868482} - {fileID: 8925473620302868482}
- {fileID: 8512930684284350359} - {fileID: 8512930684284350359}
- {fileID: 8552962828543516429}
m_Father: {fileID: 6052331674888157612} m_Father: {fileID: 6052331674888157612}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View file

@ -28,6 +28,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 285182280367868644} m_Father: {fileID: 285182280367868644}
m_RootOrder: 1 m_RootOrder: 1
@ -46,8 +47,12 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
follow: 1 follow: 1
mouseMoveSpeed: 249.1 mouseMoveSpeed: 249.1
Eyes: {fileID: 0} sideChangeTrailTime: 0
OuterCircle: {fileID: 0} DSGuy: {fileID: 0}
DSGuyAnimator: {fileID: 0}
flickCoeff: 0.35
flickInitMul: 1.5
splitTouchSnapEffect: {fileID: 0}
InnerCircle: {fileID: 0} InnerCircle: {fileID: 0}
Circle: {fileID: 0} Circle: {fileID: 0}
--- !u!50 &285182279131759466 --- !u!50 &285182279131759466
@ -81,6 +86,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 285182279137842937} - component: {fileID: 285182279137842937}
- component: {fileID: 285182279137842938} - component: {fileID: 285182279137842938}
- component: {fileID: 7664691932365309657}
m_Layer: 3 m_Layer: 3
m_Name: Actual m_Name: Actual
m_TagString: Untagged m_TagString: Untagged
@ -98,6 +104,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 285182279538923132} - {fileID: 285182279538923132}
m_Father: {fileID: 285182280367868644} m_Father: {fileID: 285182280367868644}
@ -117,10 +124,122 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
follow: 0 follow: 0
mouseMoveSpeed: 0 mouseMoveSpeed: 0
Eyes: {fileID: 285182279528619885} sideChangeTrailTime: 0.05
OuterCircle: {fileID: 285182279354310575} DSGuy: {fileID: 285182280031512481}
DSGuyAnimator: {fileID: 4592128791974829295}
flickCoeff: 12
flickInitMul: 64
splitTouchSnapEffect: {fileID: 7664691932365309657}
InnerCircle: {fileID: 285182279842109877} InnerCircle: {fileID: 285182279842109877}
Circle: {fileID: 285182279897966106} Circle: {fileID: 285182279897966106}
--- !u!96 &7664691932365309657
TrailRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 285182279137842936}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 0
m_StaticShadowCaster: 0
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 20000
m_Time: 0.083333336
m_Parameters:
serializedVersion: 3
widthMultiplier: 0.15
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: -0.9
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.22058824
- serializedVersion: 3
time: 1
value: 0.1
inSlope: -0.9
outSlope: -2.2915363
tangentMode: 69
weightedMode: 0
inWeight: 0.16176468
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 0.3137255}
key1: {r: 1, g: 1, b: 1, a: 0}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 4
alignment: 0
textureMode: 0
shadowBias: 0.5
generateLightingData: 0
m_MinVertexDistance: 0.25
m_Autodestruct: 0
m_Emitting: 1
--- !u!1 &285182279354310575 --- !u!1 &285182279354310575
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -148,6 +267,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 1} m_LocalScale: {x: 0, y: 0, z: 1}
m_ConstrainProportionsScale: 1
m_Children: [] m_Children: []
m_Father: {fileID: 285182280031512482} m_Father: {fileID: 285182280031512482}
m_RootOrder: 0 m_RootOrder: 0
@ -163,6 +283,7 @@ SpriteRenderer:
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_DynamicOccludee: 1 m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1 m_MotionVectors: 1
m_LightProbeUsage: 1 m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
@ -230,6 +351,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.65, y: 0.65, z: 1} m_LocalScale: {x: 0.65, y: 0.65, z: 1}
m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 285182280031512482} - {fileID: 285182280031512482}
- {fileID: 285182279897966107} - {fileID: 285182279897966107}
@ -275,6 +397,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 285182279842109878} m_Father: {fileID: 285182279842109878}
m_RootOrder: 0 m_RootOrder: 0
@ -290,6 +413,7 @@ SpriteRenderer:
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_DynamicOccludee: 1 m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1 m_MotionVectors: 1
m_LightProbeUsage: 1 m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
@ -359,6 +483,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.66, z: 0} m_LocalPosition: {x: 0, y: -0.66, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children: [] m_Children: []
m_Father: {fileID: 285182280031512482} m_Father: {fileID: 285182280031512482}
m_RootOrder: 2 m_RootOrder: 2
@ -374,6 +499,7 @@ SpriteRenderer:
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_DynamicOccludee: 1 m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1 m_MotionVectors: 1
m_LightProbeUsage: 1 m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
@ -467,6 +593,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 285182279419378161} - {fileID: 285182279419378161}
m_Father: {fileID: 285182279137842937} m_Father: {fileID: 285182279137842937}
@ -479,7 +606,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 285182279538923131} m_GameObject: {fileID: 285182279538923131}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5421f511c7f44364cb7a8b3c23a9cf19, type: 3} m_Script: {fileID: 11500000, guid: 5421f511c7f44364cb7a8b3c23a9cf19, type: 3}
m_Name: m_Name:
@ -496,7 +623,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 285182279538923131} m_GameObject: {fileID: 285182279538923131}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 141a2c65793e39943a8304c67905de70, type: 3} m_Script: {fileID: 11500000, guid: 141a2c65793e39943a8304c67905de70, type: 3}
m_Name: m_Name:
@ -530,6 +657,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 285182279492467814} - {fileID: 285182279492467814}
m_Father: {fileID: 285182280031512482} m_Father: {fileID: 285182280031512482}
@ -546,6 +674,7 @@ SpriteRenderer:
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_DynamicOccludee: 1 m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1 m_MotionVectors: 1
m_LightProbeUsage: 1 m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
@ -614,6 +743,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.2, y: 0.2, z: 1} m_LocalScale: {x: 0.2, y: 0.2, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 285182279419378161} m_Father: {fileID: 285182279419378161}
m_RootOrder: 1 m_RootOrder: 1
@ -629,6 +759,7 @@ SpriteRenderer:
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_DynamicOccludee: 1 m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1 m_MotionVectors: 1
m_LightProbeUsage: 1 m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
@ -691,6 +822,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 285182280031512482} - component: {fileID: 285182280031512482}
- component: {fileID: 4592128791974829295}
m_Layer: 3 m_Layer: 3
m_Name: DSGUY m_Name: DSGUY
m_TagString: Untagged m_TagString: Untagged
@ -708,6 +840,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 285182279354310576} - {fileID: 285182279354310576}
- {fileID: 285182279842109878} - {fileID: 285182279842109878}
@ -715,6 +848,27 @@ Transform:
m_Father: {fileID: 285182279419378161} m_Father: {fileID: 285182279419378161}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &4592128791974829295
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 285182280031512481}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: a050595e43364bb4e9840d98fc70be72, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &285182280367868641 --- !u!1 &285182280367868641
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -741,6 +895,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 285182279137842937} - {fileID: 285182279137842937}
- {fileID: 285182279131759465} - {fileID: 285182279131759465}

View file

@ -43,13 +43,16 @@ AnimatorStateMachine:
m_Position: {x: 300, y: -50, z: 0} m_Position: {x: 300, y: -50, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -1162623208037307785} m_State: {fileID: -1162623208037307785}
m_Position: {x: 440, y: 120, z: 0} m_Position: {x: 540, y: -120, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -7899941970589434758} m_State: {fileID: -7899941970589434758}
m_Position: {x: 530, y: 20, z: 0} m_Position: {x: 300, y: -120, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 3911154433124293713} m_State: {fileID: 3911154433124293713}
m_Position: {x: 540, y: -50, z: 0} m_Position: {x: 540, y: -50, z: 0}
- serializedVersion: 1
m_State: {fileID: 5413485298585256804}
m_Position: {x: 540, y: 20, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
@ -70,8 +73,7 @@ AnimatorState:
m_Name: Catch_success m_Name: Catch_success
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: m_Transitions: []
- {fileID: 3091446025670089204}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0} m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0 m_IKOnFeet: 0
@ -135,28 +137,6 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1101 &3091446025670089204
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7133985828973644718}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.24999997
m_TransitionOffset: 0
m_ExitTime: 0.9999035
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &3911154433124293713 --- !u!1102 &3911154433124293713
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6
@ -183,6 +163,32 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &5413485298585256804
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Throw_empty
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 685d134b2d3de58479b44dfdae56572c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &7133985828973644718 --- !u!1102 &7133985828973644718
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6

View file

@ -0,0 +1,510 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Throw_empty
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.016666668
value: {x: -4.52, y: 1.57, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
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
value: {x: -4.52, y: 1.51, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
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
value: {x: -4.52, y: 1.55, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Hand
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.016666668
value: {x: 0, y: 0.47, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
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
value: {x: 0, y: 0.40999994, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
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
value: {x: 0, y: 0.3, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Sleeve
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
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_IsActive
path: Hand/catch
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
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_IsActive
path: Hand/whoosh
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
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_IsActive
path: Hand/Coin
classID: 1
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0.016666668
value: {fileID: -8498782790087183868, guid: eab6bdf53b08c644db9afb05df441329, type: 3}
- time: 0.083333336
value: {fileID: 8877829940631261346, guid: eab6bdf53b08c644db9afb05df441329, type: 3}
attribute: m_Sprite
path: Hand
classID: 212
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 2270227889
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1631782123
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1792301856
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 403452648
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1080045770
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2270227889
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -8498782790087183868, guid: eab6bdf53b08c644db9afb05df441329, type: 3}
- {fileID: 8877829940631261346, guid: eab6bdf53b08c644db9afb05df441329, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.016666668
value: -4.52
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.05
value: -4.52
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: -4.52
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Hand
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.016666668
value: 1.57
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.05
value: 1.51
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 1.55
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Hand
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.05
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Hand
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
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_IsActive
path: Hand/catch
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
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_IsActive
path: Hand/whoosh
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.05
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Sleeve
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.016666668
value: 0.47
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.05
value: 0.40999994
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 0.3
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Sleeve
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.016666668
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.05
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Sleeve
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
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_IsActive
path: Hand/Coin
classID: 1
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 685d134b2d3de58479b44dfdae56572c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -5223,3 +5223,10 @@ AnimationClip:
floatParameter: 0 floatParameter: 0
intParameter: 0 intParameter: 0
messageOptions: 0 messageOptions: 0
- time: 0.8
functionName: EnableBop
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0

View file

@ -81,6 +81,12 @@ AnimatorStateMachine:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 3405943571545831607} m_State: {fileID: 3405943571545831607}
m_Position: {x: 435, y: 565, z: 0} m_Position: {x: 435, y: 565, z: 0}
- serializedVersion: 1
m_State: {fileID: 124305183826925708}
m_Position: {x: -150, y: 280, z: 0}
- serializedVersion: 1
m_State: {fileID: -1689300076074279085}
m_Position: {x: 60, y: 280, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
@ -189,6 +195,33 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &-1689300076074279085
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UnReady
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 5072795465433690740}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 12ed406172ab704469eef9441d6ced24, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000 --- !u!91 &9100000
AnimatorController: AnimatorController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -211,6 +244,32 @@ AnimatorController:
m_IKPass: 0 m_IKPass: 0
m_SyncedLayerAffectsTiming: 0 m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 9100000}
--- !u!1102 &124305183826925708
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Ready
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 1e68bbb68caf176428534ae09e098aa4, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &388957863343072032 --- !u!1102 &388957863343072032
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6
@ -263,6 +322,28 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1101 &5072795465433690740
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 388957863343072032}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &8680951295974053903 --- !u!1101 &8680951295974053903
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

View file

@ -12516,3 +12516,10 @@ AnimationClip:
floatParameter: 0 floatParameter: 0
intParameter: 0 intParameter: 0
messageOptions: 0 messageOptions: 0
- time: 0.73333335
functionName: EnableBop
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0

File diff suppressed because it is too large Load diff

View file

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

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 12ed406172ab704469eef9441d6ced24
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -52,6 +52,32 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &-8598915556387655082
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ManChargeOut
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: b899e6821b3f03d4cad54ce868231eda, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-7840309356215755865 --- !u!1102 &-7840309356215755865
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6
@ -88,7 +114,8 @@ AnimatorState:
m_Name: ManCharge m_Name: ManCharge
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: [] m_Transitions:
- {fileID: -6495875897269842745}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0} m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0 m_IKOnFeet: 0
@ -104,6 +131,28 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1101 &-6495875897269842745
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2153695472368412942}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-3699598731561684078 --- !u!1102 &-3699598731561684078
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6
@ -256,6 +305,32 @@ AnimatorController:
m_IKPass: 0 m_IKPass: 0
m_SyncedLayerAffectsTiming: 0 m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 9100000}
--- !u!1102 &2153695472368412942
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ManReturn
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: b697eda1ad0bba3439844040d4dc6777, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &3535355717301820939 --- !u!1107 &3535355717301820939
AnimatorStateMachine: AnimatorStateMachine:
serializedVersion: 6 serializedVersion: 6
@ -304,6 +379,12 @@ AnimatorStateMachine:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -3699598731561684078} m_State: {fileID: -3699598731561684078}
m_Position: {x: 620, y: 780, z: 0} m_Position: {x: 620, y: 780, z: 0}
- serializedVersion: 1
m_State: {fileID: 2153695472368412942}
m_Position: {x: 550, y: 260, z: 0}
- serializedVersion: 1
m_State: {fileID: -8598915556387655082}
m_Position: {x: 585, y: 325, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []

File diff suppressed because it is too large Load diff

View file

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

File diff suppressed because it is too large Load diff

View file

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

View file

@ -4,5 +4,5 @@ folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: ntrbackbeat/common assetBundleName:
assetBundleVariant: assetBundleVariant:

View file

@ -26,6 +26,32 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &-2101240853689792580
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BowRelease
m_Speed: -1
m_CycleOffset: 1
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: fcb659b28562414419f0b631484e6c3f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000 --- !u!91 &9100000
AnimatorController: AnimatorController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -85,13 +111,16 @@ AnimatorStateMachine:
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -2988285179875158312} m_State: {fileID: -2988285179875158312}
m_Position: {x: 200, y: 0, z: 0} m_Position: {x: 250, y: 120, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1975330077407404661} m_State: {fileID: 1975330077407404661}
m_Position: {x: 235, y: 65, z: 0} m_Position: {x: 250, y: 170, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 8713020708790600204} m_State: {fileID: 8713020708790600204}
m_Position: {x: 270, y: 130, z: 0} m_Position: {x: 250, y: 220, z: 0}
- serializedVersion: 1
m_State: {fileID: -2101240853689792580}
m_Position: {x: 460, y: 170, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []

View file

@ -150,6 +150,12 @@ AnimatorStateMachine:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -6301654628326570588} m_State: {fileID: -6301654628326570588}
m_Position: {x: 280, y: 340, z: 0} m_Position: {x: 280, y: 340, z: 0}
- serializedVersion: 1
m_State: {fileID: 8252196376475842327}
m_Position: {x: 500, y: 190, z: 0}
- serializedVersion: 1
m_State: {fileID: 6780057120146691061}
m_Position: {x: 500, y: 240, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
@ -160,6 +166,32 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -1826418598434636915} m_DefaultState: {fileID: -1826418598434636915}
--- !u!1102 &6780057120146691061
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UnPrepare
m_Speed: -1
m_CycleOffset: 1
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: d2bedeec3b142194ba6e5208112acce1, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &7485310372438117339 --- !u!1102 &7485310372438117339
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6
@ -186,3 +218,29 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &8252196376475842327
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Prepare
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: d2bedeec3b142194ba6e5208112acce1, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

File diff suppressed because it is too large Load diff

View file

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 434 KiB

After

Width:  |  Height:  |  Size: 465 KiB

View file

@ -272,6 +272,27 @@ TextureImporter:
indices: indices:
edges: [] edges: []
weights: [] weights: []
- serializedVersion: 2
name: controllerSheet_0
rect:
serializedVersion: 2
x: 347
y: 1067
width: 554
height: 902
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: a781f3f6689516247a7cc092438330f7
internalID: -974588141
vertices: []
indices:
edges: []
weights: []
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []
@ -283,6 +304,7 @@ TextureImporter:
weights: [] weights: []
secondaryTextures: [] secondaryTextures: []
nameFileIdTable: nameFileIdTable:
controllerSheet_0: -974588141
nxJoyconL: 2557230542604182733 nxJoyconL: 2557230542604182733
nxJoyconPair: 8903944674802394384 nxJoyconPair: 8903944674802394384
nxJoyconR: 9166690998051772148 nxJoyconR: 9166690998051772148

View file

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

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 79fdafe0ab3afaa4688f58489ec64b56
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,159 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-5833589232376358195
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Open
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 6fc7e7fd19f5a1440be08d8c99a80a91, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-3316759387292632662
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NoPose
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 7a26db114b87950439166989040eed46, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DSGUY
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 8225210283384799832}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &1761228266921078275
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Close
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 79fdafe0ab3afaa4688f58489ec64b56, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &8021363370930603935
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Flick
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: d1fc31828176a88488ddee2fdcfe50bb, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &8225210283384799832
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -3316759387292632662}
m_Position: {x: 200, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: -5833589232376358195}
m_Position: {x: 235, y: 65, z: 0}
- serializedVersion: 1
m_State: {fileID: 1761228266921078275}
m_Position: {x: 270, y: 130, z: 0}
- serializedVersion: 1
m_State: {fileID: 8021363370930603935}
m_Position: {x: 305, y: 195, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -3316759387292632662}

View file

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

File diff suppressed because it is too large Load diff

View file

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

View file

@ -0,0 +1,508 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NoPose
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Eyes
m_ScaleCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: OuterCircle
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: InnerCircle
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Eyes
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: OuterCircle
classID: 1
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: InnerCircle
classID: 1
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Eyes
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 305999601
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 472405570
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 120101800
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 120101800
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 305999601
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 472405570
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 120101800
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: OuterCircle
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: OuterCircle
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: OuterCircle
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: OuterCircle
classID: 1
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: InnerCircle
classID: 1
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
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Eyes
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Eyes
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Eyes
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Eyes
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: InnerCircle
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: InnerCircle
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: InnerCircle
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: Eyes
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: Eyes
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: Eyes
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7a26db114b87950439166989040eed46
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,940 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Open
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: -3.96, 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
value: {x: 0, y: -0.33, z: 0}
inSlope: {x: -0, y: -3.96, z: -0}
outSlope: {x: 0, y: 3.96, 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.16666667
value: {x: 0, y: 0, z: 0}
inSlope: {x: -0, y: 3.96, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
value: {x: 0, y: 0, z: 0}
inSlope: {x: -0, y: -0, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Eyes
m_ScaleCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 6, y: 6, z: 6}
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.16666667
value: {x: 1, y: 1, z: 1}
inSlope: {x: 6, y: 6, z: 6}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
value: {x: 1, y: 1, z: 1}
inSlope: {x: -0, y: -0, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: OuterCircle
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 12, y: 12, z: 12}
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
value: {x: 1, y: 1, z: 1}
inSlope: {x: 12, y: 12, z: 12}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.16666667
value: {x: 1, y: 1, z: 1}
inSlope: {x: -0, y: -0, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
value: {x: 1, y: 1, z: 1}
inSlope: {x: -0, y: -0, z: -0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Eyes
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
value: {x: 1, y: 1, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: InnerCircle
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.16666667
value: 1
inSlope: Infinity
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Eyes
classID: 1
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: 1
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: InnerCircle
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.16666667
value: 1
inSlope: Infinity
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: OuterCircle
classID: 1
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 120101800
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 305999601
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 120101800
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 472405570
attribute: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 120101800
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 472405570
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 305999601
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.5
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 0
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 0
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Eyes
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: -3.96
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: -0.33
inSlope: -3.96
outSlope: 3.96
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 0
inSlope: 3.96
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Eyes
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 0
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 0
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Eyes
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.16666667
value: 1
inSlope: Infinity
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Eyes
classID: 1
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: 1
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: InnerCircle
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 6
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 1
inSlope: 6
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 1
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: OuterCircle
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 6
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 1
inSlope: 6
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 1
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: OuterCircle
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 6
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 1
inSlope: 6
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 1
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: OuterCircle
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.16666667
value: 1
inSlope: Infinity
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.5
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: OuterCircle
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 12
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 1
inSlope: 12
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 1
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 1
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: Eyes
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 12
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 1
inSlope: 12
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 1
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 1
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: Eyes
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 12
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 1
inSlope: 12
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: 1
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 1
inSlope: -0
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: Eyes
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
path: InnerCircle
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
path: InnerCircle
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
path: InnerCircle
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6fc7e7fd19f5a1440be08d8c99a80a91
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -5005,7 +5005,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -399.99994, y: 0} m_AnchoredPosition: {x: -400, y: 0}
m_SizeDelta: {x: -800.0001, y: 194} m_SizeDelta: {x: -800.0001, y: 194}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &195260752 --- !u!114 &195260752
@ -14741,6 +14741,10 @@ PrefabInstance:
propertyPath: m_RaycastTarget propertyPath: m_RaycastTarget
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8281773103246844715, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 720073bc7682b1441bece7116681f72c, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 720073bc7682b1441bece7116681f72c, type: 3}
--- !u!1 &631525710 stripped --- !u!1 &631525710 stripped
@ -21339,7 +21343,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1589389272} m_TargetGraphic: {fileID: 1589389272}
m_HandleRect: {fileID: 1589389271} m_HandleRect: {fileID: 1589389271}
m_Direction: 2 m_Direction: 2
m_Value: 0 m_Value: 1
m_Size: 1 m_Size: 1
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
@ -26111,7 +26115,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 199.06122} m_AnchoredPosition: {x: 0, y: 153.75513}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945 --- !u!222 &1154875945
@ -31313,7 +31317,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -399.99994, y: 0} m_AnchoredPosition: {x: -400, y: 0}
m_SizeDelta: {x: -800.0001, y: 194} m_SizeDelta: {x: -800.0001, y: 194}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1426168094 --- !u!114 &1426168094
@ -35301,8 +35305,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1220118245} m_TargetGraphic: {fileID: 1220118245}
m_HandleRect: {fileID: 1220118244} m_HandleRect: {fileID: 1220118244}
m_Direction: 2 m_Direction: 2
m_Value: 1 m_Value: 1.0000007
m_Size: 1 m_Size: 0.87568516
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
@ -36956,7 +36960,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000030517578} m_AnchoredPosition: {x: 0.000030517578, y: -0.000030517578}
m_SizeDelta: {x: 100, y: 350} m_SizeDelta: {x: 100, y: 350}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &1702073032 --- !u!114 &1702073032

View file

@ -1,8 +1,8 @@
using System; using System;
public static class AppInfo { public static class AppInfo {
public const string Version = "0.0.1002"; public const string Version = "0.0.1016";
public static readonly DateTime Date = new DateTime(2023, 09, 27, 22, 20, 38, 655, DateTimeKind.Utc); public static readonly DateTime Date = new DateTime(2023, 10, 20, 02, 31, 04, 288, DateTimeKind.Utc);
} }

View file

@ -3,29 +3,81 @@ using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using DG.Tweening; using DG.Tweening;
using HeavenStudio.Games;
namespace HeavenStudio namespace HeavenStudio
{ {
public class CircleCursor : MonoBehaviour public class CircleCursor : MonoBehaviour
{ {
static readonly GradientAlphaKey[] cursorAlphaKeys = new GradientAlphaKey[]
{
new GradientAlphaKey(0.5f, 0),
new GradientAlphaKey(0, 1)
};
[SerializeField] private bool follow = false; [SerializeField] private bool follow = false;
[SerializeField] private float mouseMoveSpeed; [SerializeField] private float mouseMoveSpeed;
[SerializeField] private float sideChangeTrailTime;
[Header("DSGuy")] [Header("DSGuy")]
[SerializeField] private GameObject Eyes; [SerializeField] private GameObject DSGuy;
[SerializeField] private GameObject OuterCircle; [SerializeField] private Animator DSGuyAnimator;
[SerializeField] private float flickCoeff = 0.35f;
[SerializeField] private float flickInitMul = 1.5f;
[SerializeField] private TrailRenderer splitTouchSnapEffect;
public GameObject InnerCircle; public GameObject InnerCircle;
[SerializeField] private GameObject Circle; [SerializeField] private GameObject Circle;
private Tween outerCircleTween, eyesTween; private bool isOpen;
private Vector3 vel, flickStart, flickDeltaPos;
private Color colorMain, colorL, colorR;
private Gradient gradientL, gradientR;
private bool lastLeftRightState;
private float trailEnableTime;
private SpriteRenderer innerCircleRenderer;
private void Start() private void Start()
{ {
// Cursor.visible = false; // Cursor.visible = false;
if (splitTouchSnapEffect != null)
{
splitTouchSnapEffect.emitting = false;
}
if (InnerCircle != null)
{
innerCircleRenderer = InnerCircle.GetComponent<SpriteRenderer>();
}
}
private void Open()
{
vel = Vector3.zero;
flickDeltaPos = Vector3.zero;
DSGuyAnimator.Play("Open", -1);
Circle.SetActive(false);
isOpen = true;
}
private void Close()
{
DSGuyAnimator.Play("Close", -1);
Circle.SetActive(true);
isOpen = false;
}
private void Flick(Vector3 startPos, Vector3 newVel)
{
flickStart = startPos;
vel = newVel;
DSGuyAnimator.Play("Flick", -1);
Circle.SetActive(true);
isOpen = false;
} }
private void Update() private void Update()
{ {
Vector3 pos = GameManager.instance.CursorCam.ScreenToWorldPoint(Input.mousePosition); Vector3 pos = PlayerInput.GetInputController(1).GetPointer();
Vector3 deltaPos = pos - transform.position;
if (follow) if (follow)
{ {
@ -34,32 +86,122 @@ namespace HeavenStudio
} }
else else
{ {
this.gameObject.transform.position = new Vector3(pos.x, pos.y, 0); bool lrState = PlayerInput.GetInputController(1).GetPointerLeftRight();
if (splitTouchSnapEffect != null && PlayerInput.CurrentControlStyle == InputSystem.InputController.ControlStyles.Touch && (GameManager.instance?.GameHasSplitColours ?? false))
if (PlayerInput.Pressed())
{ {
// Cursor.visible = false; if (lrState != lastLeftRightState)
Circle.transform.DOScale(0, 0.5f).SetEase(Ease.OutExpo); {
InnerCircle.SetActive(true); lastLeftRightState = lrState;
outerCircleTween.Kill(); trailEnableTime = sideChangeTrailTime;
outerCircleTween = OuterCircle.transform.DOScale(1, 0.15f).SetEase(Ease.OutExpo); splitTouchSnapEffect.emitting = true;
Eyes.SetActive(true); innerCircleRenderer.color = lastLeftRightState ? colorR : colorL;
eyesTween.Kill(); splitTouchSnapEffect.colorGradient = lastLeftRightState ? gradientR : gradientL;
eyesTween = Eyes.transform.DOLocalMoveY(0.15f, 0.15f).SetEase(Ease.OutExpo); }
if (trailEnableTime <= 0)
{
trailEnableTime = 0;
splitTouchSnapEffect.emitting = false;
}
else
{
trailEnableTime -= Time.deltaTime;
}
} }
else if (PlayerInput.PressedUp()) else if (splitTouchSnapEffect != null && splitTouchSnapEffect.emitting)
{ {
Circle.transform.DOScale(0.2f, 0.5f).SetEase(Ease.OutExpo); ClearTrail();
InnerCircle.SetActive(false); }
outerCircleTween.Kill();
outerCircleTween = OuterCircle.transform.DOScale(0, 0.15f);
eyesTween.Kill(); gameObject.transform.position = pos;
eyesTween = Eyes.transform.DOLocalMoveY(-0.66f, 0.15f).OnComplete(delegate { Eyes.SetActive(false); }); if (vel.magnitude > 0.05f)
{
vel -= flickCoeff * Time.deltaTime * vel;
flickDeltaPos += vel * Time.deltaTime;
DSGuy.transform.position = flickStart + flickDeltaPos;
}
else
{
vel = Vector3.zero;
flickDeltaPos = Vector3.zero;
DSGuy.transform.position = pos;
}
if (PlayerInput.GetIsAction(Minigame.InputAction_BasicPress))
{
Open();
}
else if (PlayerInput.GetIsAction(Minigame.InputAction_BasicRelease))
{
Close();
}
else if (PlayerInput.GetIsAction(Minigame.InputAction_FlickRelease))
{
Flick(pos, deltaPos * flickInitMul);
ClearTrail();
}
if ((!PlayerInput.PlayerHasControl()) && isOpen)
{
Close();
ClearTrail();
if (splitTouchSnapEffect != null)
{
splitTouchSnapEffect.emitting = false;
}
} }
} }
} }
}
public void LockCursor(bool toggle)
{
PlayerInput.GetInputController(1).TogglePointerLock(toggle);
ClearTrail();
}
public void ClearTrail()
{
trailEnableTime = 0;
if (splitTouchSnapEffect != null)
{
splitTouchSnapEffect.Clear();
}
}
public void SetCursorColors(Color main, Color left, Color right)
{
if (innerCircleRenderer == null) innerCircleRenderer = InnerCircle.GetComponent<SpriteRenderer>();
colorMain = main;
colorL = left;
colorR = right;
if (PlayerInput.CurrentControlStyle == InputSystem.InputController.ControlStyles.Touch && (GameManager.instance?.GameHasSplitColours ?? false))
{
innerCircleRenderer.color = lastLeftRightState ? colorR : colorL;
gradientL = new Gradient()
{
colorKeys = new GradientColorKey[]
{
new GradientColorKey(colorL, 0),
new GradientColorKey(colorL, 1)
},
alphaKeys = cursorAlphaKeys
};
gradientR = new Gradient()
{
colorKeys = new GradientColorKey[]
{
new GradientColorKey(colorR, 0),
new GradientColorKey(colorR, 1)
},
alphaKeys = cursorAlphaKeys
};
}
else
{
innerCircleRenderer.color = colorMain;
}
}
}
} }

View file

@ -6,6 +6,7 @@ using UnityEngine;
using Starpelly; using Starpelly;
using Jukebox; using Jukebox;
using HeavenStudio.Util; using HeavenStudio.Util;
using System.Data.Common;
namespace HeavenStudio namespace HeavenStudio
{ {
@ -46,6 +47,7 @@ namespace HeavenStudio
private double time; private double time;
double dspTime; double dspTime;
double absTime, absTimeAdjust; double absTime, absTimeAdjust;
double dspSizeSeconds;
double dspMargin = 128 / 44100.0; double dspMargin = 128 / 44100.0;
// the dspTime we started at // the dspTime we started at
@ -133,7 +135,8 @@ namespace HeavenStudio
{ {
musicSource.priority = 0; musicSource.priority = 0;
AudioConfiguration config = AudioSettings.GetConfiguration(); AudioConfiguration config = AudioSettings.GetConfiguration();
dspMargin = 2 * (config.dspBufferSize / (double)config.sampleRate); dspSizeSeconds = config.dspBufferSize / (double)config.sampleRate;
dspMargin = 2 * dspSizeSeconds;
addedPitchChanges.Clear(); addedPitchChanges.Clear();
} }
@ -148,7 +151,7 @@ namespace HeavenStudio
time = startPos; time = startPos;
firstBeatOffset = offset; firstBeatOffset = offset;
SeekMusicToTime(startPos); SeekMusicToTime(startPos, offset);
songPosBeat = GetBeatFromSongPos(time); songPosBeat = GetBeatFromSongPos(time);
@ -162,7 +165,9 @@ namespace HeavenStudio
if (!isPaused) if (!isPaused)
{ {
AudioConfiguration config = AudioSettings.GetConfiguration(); AudioConfiguration config = AudioSettings.GetConfiguration();
dspMargin = 2 * (config.dspBufferSize / (double)config.sampleRate); dspSizeSeconds = config.dspBufferSize / (double)config.sampleRate;
Debug.Log($"dsp size: {dspSizeSeconds}");
dspMargin = 2 * dspSizeSeconds;
addedPitchChanges.Clear(); addedPitchChanges.Clear();
addedPitchChanges.Add(new AddedPitchChange { time = 0, pitch = SongPitch }); addedPitchChanges.Add(new AddedPitchChange { time = 0, pitch = SongPitch });
} }
@ -171,34 +176,37 @@ namespace HeavenStudio
double offset = chart.data.offset; double offset = chart.data.offset;
double dspTime = AudioSettings.dspTime; double dspTime = AudioSettings.dspTime;
dspStart = dspTime;
startPos = GetSongPosFromBeat(beat); startPos = GetSongPosFromBeat(beat);
firstBeatOffset = offset; firstBeatOffset = offset;
time = startPos; time = startPos;
if (musicSource.clip != null && startPos < musicSource.clip.length - offset) if (musicSource.clip != null && startPos < musicSource.clip.length - offset)
{ {
SeekMusicToTime(startPos); SeekMusicToTime(startPos, offset);
double musicStartDelay = -offset - startPos; double musicStartDelay = -offset - startPos;
if (musicStartDelay > 0) if (musicStartDelay > 0)
{ {
musicScheduledTime = dspTime + musicStartDelay / SongPitch; musicScheduledTime = dspTime + musicStartDelay / SongPitch;
musicScheduledPitch = SongPitch; dspStart = dspTime;
} }
else else
{ {
musicScheduledTime = dspTime; musicScheduledTime = dspTime + dspMargin;
musicScheduledPitch = SongPitch; dspStart = dspTime + dspMargin;
} }
musicScheduledPitch = SongPitch;
musicSource.PlayScheduled(musicScheduledTime); musicSource.PlayScheduled(musicScheduledTime);
} }
if (musicSource.clip == null)
{
dspStart = dspTime;
}
songPosBeat = GetBeatFromSongPos(time); songPosBeat = GetBeatFromSongPos(time);
startBeat = songPosBeat; startBeat = songPosBeat;
absTimeAdjust = 0;
startTime = DateTime.Now; startTime = DateTime.Now;
absTimeAdjust = 0;
isPlaying = true; isPlaying = true;
isPaused = false; isPaused = false;
@ -266,9 +274,8 @@ namespace HeavenStudio
StopOnlyAudio(); StopOnlyAudio();
} }
void SeekMusicToTime(double fStartPos) void SeekMusicToTime(double fStartPos, double offset)
{ {
double offset = GameManager.instance.Beatmap.data.offset;
if (musicSource.clip != null && fStartPos < musicSource.clip.length - offset) if (musicSource.clip != null && fStartPos < musicSource.clip.length - offset)
{ {
// https://www.desmos.com/calculator/81ywfok6xk // https://www.desmos.com/calculator/81ywfok6xk

View file

@ -16,24 +16,27 @@ namespace HeavenStudio.DiscordRPC
private long lastStartTime; private long lastStartTime;
private bool quitting;
private void Awake() private void Awake()
{ {
// instance = this;
} }
private void Start() private void Start()
{ {
DontDestroyOnLoad(this.gameObject); DontDestroyOnLoad(this.gameObject);
instance = this;
} }
private void OnApplicationQuit() // private void OnApplicationQuit()
{ // {
Disconnect(); // quitting = true;
} // }
public void Connect() public void Connect()
{ {
discord = new Discord.Discord(DiscordRPC.clientID, (System.UInt64)Discord.CreateFlags.NoRequireDiscord); discord = new Discord.Discord(DiscordRPC.clientID, (System.UInt64)Discord.CreateFlags.NoRequireDiscord);
quitting = false;
} }
public void Disconnect() public void Disconnect()
@ -41,6 +44,7 @@ namespace HeavenStudio.DiscordRPC
if (discord != null) if (discord != null)
{ {
discord.Dispose(); discord.Dispose();
quitting = true;
} }
} }
@ -101,7 +105,7 @@ namespace HeavenStudio.DiscordRPC
void Update() void Update()
{ {
if (discord != null) if ((!quitting) && discord != null)
{ {
discord.RunCallbacks(); discord.RunCallbacks();
} }

View file

@ -4,7 +4,7 @@ MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
defaultReferences: [] defaultReferences: []
executionOrder: 0 executionOrder: -48
icon: {instanceID: 0} icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:

View file

@ -10,6 +10,7 @@ using Jukebox;
using HeavenStudio.Util; using HeavenStudio.Util;
using HeavenStudio.Games; using HeavenStudio.Games;
using HeavenStudio.Common; using HeavenStudio.Common;
using Cysharp.Threading.Tasks;
namespace HeavenStudio namespace HeavenStudio
{ {
@ -51,6 +52,16 @@ namespace HeavenStudio
[NonSerialized] public RiqEntity currentSection, nextSection; [NonSerialized] public RiqEntity currentSection, nextSection;
public double sectionProgress { get; private set; } public double sectionProgress { get; private set; }
public bool GameHasSplitColours
{
get
{
var inf = GetGameInfo(currentGame);
if (inf == null) return false;
return inf.splitColorL != null && inf.splitColorR != null;
}
}
bool AudioLoadDone; bool AudioLoadDone;
bool ChartLoadError; bool ChartLoadError;
@ -176,6 +187,7 @@ namespace HeavenStudio
if (playOnStart) if (playOnStart)
{ {
StartCoroutine(WaitReadyAndPlayCo(startBeat)); StartCoroutine(WaitReadyAndPlayCo(startBeat));
CircleCursor.LockCursor(true);
} }
} }
@ -338,15 +350,15 @@ namespace HeavenStudio
{ {
int aLen = a.Length; int aLen = a.Length;
int bLen = b.Length; int bLen = b.Length;
int ap = 0; int bp = 0; int ap = 0; int bp = 0;
while (ap < aLen && bp < bLen && a [ap] == b [bp]) while (ap < aLen && bp < bLen && a[ap] == b[bp])
{ {
ap++; ap++;
bp++; bp++;
} }
return (bp == bLen); return (bp == bLen);
} }
@ -365,8 +377,7 @@ namespace HeavenStudio
if (inf != null && inf.usesAssetBundle && !inf.AssetsLoaded) if (inf != null && inf.usesAssetBundle && !inf.AssetsLoaded)
{ {
Debug.Log($"ASYNC loading assetbundles for game {gameName}"); Debug.Log($"ASYNC loading assetbundles for game {gameName}");
StartCoroutine(inf.LoadCommonAssetBundleAsync()); inf.LoadAssetsAsync().Forget();
StartCoroutine(inf.LoadLocalizedAssetBundleAsync());
} }
currentPreSwitch++; currentPreSwitch++;
} }
@ -391,8 +402,7 @@ namespace HeavenStudio
if (inf != null && inf.usesAssetBundle && !inf.AssetsLoaded) if (inf != null && inf.usesAssetBundle && !inf.AssetsLoaded)
{ {
Debug.Log($"ASYNC loading assetbundles for game {gameName}"); Debug.Log($"ASYNC loading assetbundles for game {gameName}");
StartCoroutine(inf.LoadCommonAssetBundleAsync()); inf.LoadAssetsAsync().Forget();
StartCoroutine(inf.LoadLocalizedAssetBundleAsync());
} }
currentPreEvent++; currentPreEvent++;
} }
@ -619,7 +629,8 @@ namespace HeavenStudio
if (miniGame != null) if (miniGame != null)
miniGame.OnPlay(beat); miniGame.OnPlay(beat);
} }
Application.backgroundLoadingPriority = ThreadPriority.Low;
Conductor.instance.Play(beat); Conductor.instance.Play(beat);
} }
@ -663,6 +674,10 @@ namespace HeavenStudio
{ {
Play(0, restartDelay); Play(0, restartDelay);
} }
else
{
Application.backgroundLoadingPriority = ThreadPriority.Normal;
}
// when rating screen gets added playOnStart will instead move to that scene // when rating screen gets added playOnStart will instead move to that scene
} }
@ -946,7 +961,7 @@ namespace HeavenStudio
{ {
var gameInfo = GetGameInfo(game); var gameInfo = GetGameInfo(game);
//load the games' sound sequences //load the games' sound sequences
// TODO: this blocks the main thread, and sound sequences sould be stored in a ScriptableObject // TODO: sound sequences sould be stored in a ScriptableObject
if (gameInfo != null && gameInfo.LoadedSoundSequences == null) if (gameInfo != null && gameInfo.LoadedSoundSequences == null)
gameInfo.LoadedSoundSequences = GetGame(game).GetComponent<Minigame>().SoundSequences; gameInfo.LoadedSoundSequences = GetGame(game).GetComponent<Minigame>().SoundSequences;
} }
@ -971,7 +986,9 @@ namespace HeavenStudio
if (gameInfo.usesAssetBundle) if (gameInfo.usesAssetBundle)
{ {
//game is packed in an assetbundle, load from that instead //game is packed in an assetbundle, load from that instead
// this is fucked!! figure out a way to make this async if (gameInfo.LoadedPrefab != null) return gameInfo.LoadedPrefab;
// StartCoroutine(gameInfo.LoadCommonAudioClipsAsync());
// StartCoroutine(gameInfo.LoadLocalizedAudioClipsAsync());
return gameInfo.GetCommonAssetBundle().LoadAsset<GameObject>(name); return gameInfo.GetCommonAssetBundle().LoadAsset<GameObject>(name);
} }
name = gameInfo.LoadableName; name = gameInfo.LoadableName;
@ -985,20 +1002,20 @@ namespace HeavenStudio
return eventCaller.minigames.Find(c => c.name == name); return eventCaller.minigames.Find(c => c.name == name);
} }
Color colMain;
public void SetCurrentGame(string game, bool useMinigameColor = true) public void SetCurrentGame(string game, bool useMinigameColor = true)
{ {
currentGame = game; currentGame = game;
if (GetGameInfo(currentGame) != null) if (GetGameInfo(currentGame) != null)
{ {
CircleCursor.InnerCircle.GetComponent<SpriteRenderer>().color = Colors.Hex2RGB(GetGameInfo(currentGame).color); colMain = Colors.Hex2RGB(GetGameInfo(currentGame).color);
if (useMinigameColor) HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(Colors.Hex2RGB(GetGameInfo(currentGame).color), true); CircleCursor.SetCursorColors(colMain, Colors.Hex2RGB(GetGameInfo(currentGame).splitColorL), Colors.Hex2RGB(GetGameInfo(currentGame).splitColorR));
//else HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(HeavenStudio.GameCamera.currentColor, false); if (useMinigameColor) HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(colMain, true);
else HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(Color.black, false); else HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(Color.black, false);
} }
else else
{ {
CircleCursor.InnerCircle.GetComponent<SpriteRenderer>().color = Color.white; CircleCursor.SetCursorColors(Color.white, Color.white, Color.white);
//HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(HeavenStudio.GameCamera.currentColor, false);
HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(Color.black, false); HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(Color.black, false);
} }
} }

View file

@ -3,11 +3,12 @@ using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using HeavenStudio.Util; using HeavenStudio.Util;
using HeavenStudio.InputSystem;
namespace HeavenStudio.Games.Loaders namespace HeavenStudio.Games.Loaders
{ {
using static Minigames; using static Minigames;
public static class RvlBadmintonLoader public static class RvlBadmintonLoader
{ {
public static Minigame AddGame(EventCaller e) public static Minigame AddGame(EventCaller e)
@ -16,16 +17,16 @@ namespace HeavenStudio.Games.Loaders
{ {
new GameAction("rally", "Rally") new GameAction("rally", "Rally")
{ {
preFunction = delegate { AirRally.PreStartRally(e.currentEntity.beat); }, preFunction = delegate { AirRally.PreStartRally(e.currentEntity.beat); },
defaultLength = 2f, defaultLength = 2f,
preFunctionLength = 1 preFunctionLength = 1
}, },
new GameAction("ba bum bum bum", "Ba Bum Bum Bum") new GameAction("ba bum bum bum", "Ba Bum Bum Bum")
{ {
preFunction = delegate { AirRally.PreStartBaBumBumBum(e.currentEntity.beat, e.currentEntity["toggle"], e.currentEntity["toggle2"]); }, preFunction = delegate { AirRally.PreStartBaBumBumBum(e.currentEntity.beat, e.currentEntity["toggle"], e.currentEntity["toggle2"]); },
defaultLength = 6f, defaultLength = 6f,
parameters = new List<Param>() parameters = new List<Param>()
{ {
new Param("toggle", true, "Count", "Make Forthington Count"), new Param("toggle", true, "Count", "Make Forthington Count"),
new Param("toggle2", false, "Alternate Voiceline") new Param("toggle2", false, "Alternate Voiceline")
}, },
@ -94,9 +95,9 @@ namespace HeavenStudio.Games.Loaders
new GameAction("forthington voice lines", "Count") new GameAction("forthington voice lines", "Count")
{ {
function = delegate { AirRally.instance.ForthVoiceDo(e.currentEntity.beat); }, function = delegate { AirRally.instance.ForthVoiceDo(e.currentEntity.beat); },
preFunction = delegate { AirRally.ForthVoice(e.currentEntity.beat, e.currentEntity["type"]); }, preFunction = delegate { AirRally.ForthVoice(e.currentEntity.beat, e.currentEntity["type"]); },
parameters = new List<Param>() parameters = new List<Param>()
{ {
new Param("type", AirRally.CountSound.one, "Type", "The number Forthington will say"), new Param("type", AirRally.CountSound.one, "Type", "The number Forthington will say"),
}, },
}, },
@ -130,7 +131,7 @@ namespace HeavenStudio.Games.Loaders
}, },
new GameAction("day", "Day/Night Cycle") new GameAction("day", "Day/Night Cycle")
{ {
function = delegate function = delegate
{ {
AirRally.instance.SetDayNightCycle(e.currentEntity.beat, e.currentEntity.length, AirRally.instance.SetDayNightCycle(e.currentEntity.beat, e.currentEntity.length,
(AirRally.DayNightCycle)e.currentEntity["start"], (AirRally.DayNightCycle)e.currentEntity["end"], (AirRally.DayNightCycle)e.currentEntity["start"], (AirRally.DayNightCycle)e.currentEntity["end"],
@ -148,7 +149,7 @@ namespace HeavenStudio.Games.Loaders
{ {
function = delegate function = delegate
{ {
AirRally.instance.SetCloudRates(e.currentEntity.beat, e.currentEntity.length, e.currentEntity["main"], e.currentEntity["side"], e.currentEntity["top"], AirRally.instance.SetCloudRates(e.currentEntity.beat, e.currentEntity.length, e.currentEntity["main"], e.currentEntity["side"], e.currentEntity["top"],
e.currentEntity["speed"], e.currentEntity["endSpeed"], e.currentEntity["ease"]); e.currentEntity["speed"], e.currentEntity["endSpeed"], e.currentEntity["ease"]);
}, },
resizable = true, resizable = true,
@ -166,7 +167,7 @@ namespace HeavenStudio.Games.Loaders
{ {
function = delegate function = delegate
{ {
AirRally.instance.SetSnowflakeRates(e.currentEntity.beat, e.currentEntity.length, e.currentEntity["cps"], AirRally.instance.SetSnowflakeRates(e.currentEntity.beat, e.currentEntity.length, e.currentEntity["cps"],
e.currentEntity["speed"], e.currentEntity["endSpeed"], e.currentEntity["ease"]); e.currentEntity["speed"], e.currentEntity["endSpeed"], e.currentEntity["ease"]);
}, },
resizable = true, resizable = true,
@ -220,9 +221,9 @@ namespace HeavenStudio.Games.Loaders
resizable = true, resizable = true,
} }
}, },
new List<string>() {"rvl", "normal"}, new List<string>() { "rvl", "normal" },
"rvlbadminton", "en", "rvlbadminton", "en",
new List<string>() {"en"} new List<string>() { "en" }
); );
} }
} }
@ -377,12 +378,23 @@ namespace HeavenStudio.Games
{ {
InitClouds(0); InitClouds(0);
} }
} }
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
if(PlayerInput.Pressed() && !IsExpectingInputNow()) if (PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch && !GameManager.instance.autoplay)
{
if (PlayerInput.GetIsAction(InputAction_BasicPress))
{
Baxter.DoScaledAnimationAsync(GetDistanceStringAtBeat(Conductor.instance.songPositionInBeatsAsDouble, false, true) + "Ready", 0.5f);
}
if (PlayerInput.GetIsAction(InputAction_BasicRelease))
{
Baxter.DoScaledAnimationAsync("Idle", 0.5f);
}
}
if (PlayerInput.GetIsAction(InputAction_FlickPress) && !IsExpectingInputNow(InputAction_FlickPress))
{ {
Baxter.DoScaledAnimationAsync("Hit", 0.5f); Baxter.DoScaledAnimationAsync("Hit", 0.5f);
SoundByte.PlayOneShotGame("airRally/swing"); SoundByte.PlayOneShotGame("airRally/swing");
@ -466,7 +478,7 @@ namespace HeavenStudio.Games
spawnedBird.speedMultX = invert ? -xSpeed : xSpeed; spawnedBird.speedMultX = invert ? -xSpeed : xSpeed;
spawnedBird.speedMultZ = zSpeed; spawnedBird.speedMultZ = zSpeed;
spawnedBird.transform.position = spawnedBird.transform.position =
new Vector3(invert ? -spawnedBird.transform.position.x : spawnedBird.transform.position.x, new Vector3(invert ? -spawnedBird.transform.position.x : spawnedBird.transform.position.x,
spawnedBird.transform.position.y, startZ); spawnedBird.transform.position.y, startZ);
spawnedBird.transform.localScale = new Vector3(invert ? -1 : 1, 1, 1); spawnedBird.transform.localScale = new Vector3(invert ? -1 : 1, 1, 1);
} }
@ -785,7 +797,7 @@ namespace HeavenStudio.Games
Forthington.DoScaledAnimationAsync("Hit", 0.5f); Forthington.DoScaledAnimationAsync("Hit", 0.5f);
}) })
}); });
} }
public void ReturnObject(double beat, double targetBeat, bool type) public void ReturnObject(double beat, double targetBeat, bool type)
@ -910,13 +922,13 @@ namespace HeavenStudio.Games
instance.ForthVoiceAction(beat) instance.ForthVoiceAction(beat)
}); });
} }
public static void ForthVoice(double beat, int type) public static void ForthVoice(double beat, int type)
{ {
float offset = countInOffsets[type]; float offset = countInOffsets[type];
DistanceSound distance = DistanceAtBeat(beat); DistanceSound distance = DistanceAtBeat(beat);
switch (distance) switch (distance)
{ {
case DistanceSound.close: case DistanceSound.close:
@ -1010,11 +1022,11 @@ namespace HeavenStudio.Games
private static bool TryGetLastDistanceEvent(double beat, out RiqEntity distanceEvent) private static bool TryGetLastDistanceEvent(double beat, out RiqEntity distanceEvent)
{ {
var allDistances = EventCaller.GetAllInGameManagerList("airRally", new string[] { "set distance" }).FindAll(x => x.beat <= beat); var allDistances = EventCaller.GetAllInGameManagerList("airRally", new string[] { "set distance" }).FindAll(x => x.beat <= beat);
if (allDistances.Count == 0) if (allDistances.Count == 0)
{ {
distanceEvent = null; distanceEvent = null;
return false; return false;
} }
distanceEvent = allDistances[^1]; distanceEvent = allDistances[^1];
return true; return true;
} }
@ -1088,7 +1100,7 @@ namespace HeavenStudio.Games
var cloudEvent = EventCaller.GetAllInGameManagerList("airRally", new string[] { "cloud" }).Find(x => x.beat == beat); var cloudEvent = EventCaller.GetAllInGameManagerList("airRally", new string[] { "cloud" }).Find(x => x.beat == beat);
if (cloudEvent != null) if (cloudEvent != null)
{ {
SetCloudRates(cloudEvent.beat, cloudEvent.length, cloudEvent["main"], cloudEvent["side"], cloudEvent["top"], SetCloudRates(cloudEvent.beat, cloudEvent.length, cloudEvent["main"], cloudEvent["side"], cloudEvent["top"],
cloudEvent["speed"], cloudEvent["endSpeed"], cloudEvent["ease"]); cloudEvent["speed"], cloudEvent["endSpeed"], cloudEvent["ease"]);
} }
cloudManagerMain.Init(); cloudManagerMain.Init();
@ -1099,7 +1111,7 @@ namespace HeavenStudio.Games
var snowflakeEvent = EventCaller.GetAllInGameManagerList("airRally", new string[] { "snowflake" }).Find(x => x.beat == beat); var snowflakeEvent = EventCaller.GetAllInGameManagerList("airRally", new string[] { "snowflake" }).Find(x => x.beat == beat);
if (snowflakeEvent != null) if (snowflakeEvent != null)
{ {
SetSnowflakeRates(snowflakeEvent.beat, snowflakeEvent.length, snowflakeEvent["cps"], snowflakeEvent["speed"], SetSnowflakeRates(snowflakeEvent.beat, snowflakeEvent.length, snowflakeEvent["cps"], snowflakeEvent["speed"],
snowflakeEvent["endSpeed"], snowflakeEvent["ease"]); snowflakeEvent["endSpeed"], snowflakeEvent["ease"]);
} }
@ -1217,7 +1229,7 @@ namespace HeavenStudio.Games
string distanceString = GetDistanceStringAtBeat(beat); string distanceString = GetDistanceStringAtBeat(beat);
if (distanceString != "Close") SoundByte.PlayOneShotGame("airRally/whooshForth_" + distanceString, beat + 1, 1, 1, false, false, whooshOffsetsRally[(int)DistanceAtBeat(beat)]); if (distanceString != "Close") SoundByte.PlayOneShotGame("airRally/whooshForth_" + distanceString, beat + 1, 1, 1, false, false, whooshOffsetsRally[(int)DistanceAtBeat(beat)]);
if (!(silent || isBaBumBeat) || (isCatch && !silent)) if (!(silent || isBaBumBeat) || (isCatch && !silent))
SoundByte.PlayOneShotGame("airRally/nya_" + distanceString, beat, 1, 1, false, false, nyaOffsets[(int)DistanceAtBeat(beat)]); SoundByte.PlayOneShotGame("airRally/nya_" + distanceString, beat, 1, 1, false, false, nyaOffsets[(int)DistanceAtBeat(beat)]);
BeatAction.New(this, new List<BeatAction.Action>() BeatAction.New(this, new List<BeatAction.Action>()
@ -1234,7 +1246,10 @@ namespace HeavenStudio.Games
new BeatAction.Action(beat, delegate new BeatAction.Action(beat, delegate
{ {
string distanceString = GetDistanceStringAtBeat(beat); string distanceString = GetDistanceStringAtBeat(beat);
Baxter.DoScaledAnimationAsync((distanceString == "Close") ? "CloseReady" : "FarReady", 0.5f); if (PlayerInput.CurrentControlStyle != InputController.ControlStyles.Touch || GameManager.instance.autoplay)
{
Baxter.DoScaledAnimationAsync((distanceString == "Close") ? "CloseReady" : "FarReady", 0.5f);
}
SoundByte.PlayOneShotGame("airRally/hitForth_" + distanceString); SoundByte.PlayOneShotGame("airRally/hitForth_" + distanceString);
}), }),
new BeatAction.Action(beat + 1, delegate new BeatAction.Action(beat + 1, delegate
@ -1243,9 +1258,9 @@ namespace HeavenStudio.Games
}) })
}); });
ScheduleInput(beat, 1f, InputType.STANDARD_DOWN, RallyOnHit, RallyOnMiss, RallyEmpty); ScheduleInput(beat, 1f, InputAction_FlickPress, RallyOnHit, RallyOnMiss, RallyEmpty);
} }
private bool IsBaBumBeat(double beat) private bool IsBaBumBeat(double beat)
{ {
return EventCaller.GetAllInGameManagerList("airRally", new string[] { "ba bum bum bum" }).Find(x => x.beat == beat) != null; return EventCaller.GetAllInGameManagerList("airRally", new string[] { "ba bum bum bum" }).Find(x => x.beat == beat) != null;
@ -1290,14 +1305,14 @@ namespace HeavenStudio.Games
new MultiSound.Sound("airRally/baBumBumBum_" + GetDistanceStringAlt(beat) + "2", beat, offset: GetBaBumOffset(beat, 0)), new MultiSound.Sound("airRally/baBumBumBum_" + GetDistanceStringAlt(beat) + "2", beat, offset: GetBaBumOffset(beat, 0)),
new MultiSound.Sound("airRally/baBumBumBum_" + GetDistanceStringAlt(beat + 1f) + "3", beat + 1, offset: GetBaBumOffset(beat + 1, 0)), new MultiSound.Sound("airRally/baBumBumBum_" + GetDistanceStringAlt(beat + 1f) + "3", beat + 1, offset: GetBaBumOffset(beat + 1, 0)),
new MultiSound.Sound("airRally/baBumBumBum_" + GetDistanceStringAlt(beat + 2f) + "4", beat + 2, offset: GetBaBumOffset(beat + 2, 0)), new MultiSound.Sound("airRally/baBumBumBum_" + GetDistanceStringAlt(beat + 2f) + "4", beat + 2, offset: GetBaBumOffset(beat + 2, 0)),
}); });
if (distanceStringTwoBeat != "Close") if (distanceStringTwoBeat != "Close")
{ {
sounds.Add(new MultiSound.Sound("airRally/whooshForth_" + distanceStringTwoBeat + "2", beat + 4, 1, 1, false, whooshOffsetsBaBum[(int)DistanceAtBeat(beat + 2)])); sounds.Add(new MultiSound.Sound("airRally/whooshForth_" + distanceStringTwoBeat + "2", beat + 4, 1, 1, false, whooshOffsetsBaBum[(int)DistanceAtBeat(beat + 2)]));
sounds.Add(new MultiSound.Sound("airRally/hitForth_" + distanceStringTwoBeat + "2", beat + 2)); sounds.Add(new MultiSound.Sound("airRally/hitForth_" + distanceStringTwoBeat + "2", beat + 2));
} }
else else
{ {
sounds.Add(new MultiSound.Sound("airRally/hitForth_Close", beat + 2)); sounds.Add(new MultiSound.Sound("airRally/hitForth_Close", beat + 2));
@ -1338,31 +1353,34 @@ namespace HeavenStudio.Games
BeatAction.New(this, new List<BeatAction.Action>() BeatAction.New(this, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat, delegate new BeatAction.Action(beat, delegate
{ {
if (isCatch) return; if (isCatch) return;
if (isBaBumBeat) BaBumBumBum(beat + 4, countBaBum, altBum); if (isBaBumBeat) BaBumBumBum(beat + 4, countBaBum, altBum);
else RallyRecursion(beat + 6); else RallyRecursion(beat + 6);
}), }),
new BeatAction.Action(beat + 1f, delegate new BeatAction.Action(beat + 1f, delegate
{ {
Forthington.DoScaledAnimationAsync("Ready", 0.5f); Forthington.DoScaledAnimationAsync("Ready", 0.5f);
ServeObject(beat + 2f, beat + 4f, true); ServeObject(beat + 2f, beat + 4f, true);
}), }),
new BeatAction.Action(beat + 2f, delegate new BeatAction.Action(beat + 2f, delegate
{ {
Baxter.DoScaledAnimationAsync(GetDistanceStringAtBeat(beat + 2f, false, true) + "Ready", 0.5f); if (PlayerInput.CurrentControlStyle != InputController.ControlStyles.Touch || GameManager.instance.autoplay)
} ), {
Baxter.DoScaledAnimationAsync(GetDistanceStringAtBeat(beat + 2f, false, true) + "Ready", 0.5f);
}
}),
new BeatAction.Action(beat + 3f, delegate { Forthington.DoScaledAnimationAsync("TalkShort", 0.5f); }), new BeatAction.Action(beat + 3f, delegate { Forthington.DoScaledAnimationAsync("TalkShort", 0.5f); }),
new BeatAction.Action(beat + 3.5f, delegate { if(!count || isBaBumBeat) Forthington.DoScaledAnimationAsync("TalkShort", 0.5f); }), new BeatAction.Action(beat + 3.5f, delegate { if(!count || isBaBumBeat) Forthington.DoScaledAnimationAsync("TalkShort", 0.5f); }),
new BeatAction.Action(beat + 4f, delegate { Forthington.DoScaledAnimationAsync("Ready", 0.5f); }), new BeatAction.Action(beat + 4f, delegate { Forthington.DoScaledAnimationAsync("Ready", 0.5f); }),
}); });
ScheduleInput(beat, 4f, InputType.STANDARD_DOWN, LongShotOnHit, RallyOnMiss, RallyEmpty); ScheduleInput(beat, 4f, InputAction_FlickPress, LongShotOnHit, RallyOnMiss, RallyEmpty);
} }
private void CatchBirdie() private void CatchBirdie()
{ {
Forthington.DoScaledAnimationAsync("Catch", 0.5f); Forthington.DoScaledAnimationAsync("Catch", 0.5f);
SoundByte.PlayOneShotGame("airRally/birdieCatch"); SoundByte.PlayOneShotGame("airRally/birdieCatch");
@ -1376,7 +1394,7 @@ namespace HeavenStudio.Games
Baxter.DoScaledAnimationAsync("Hit", 0.5f); Baxter.DoScaledAnimationAsync("Hit", 0.5f);
if (state >= 1 || state <= -1) if (state >= 1 || state <= -1)
{ {
ActiveShuttle.DoNearMiss(); ActiveShuttle.DoNearMiss();
hasMissed = true; hasMissed = true;
shuttleActive = false; shuttleActive = false;
@ -1416,7 +1434,7 @@ namespace HeavenStudio.Games
Baxter.DoScaledAnimationAsync("Hit", 0.5f); Baxter.DoScaledAnimationAsync("Hit", 0.5f);
if (state >= 1 || state <= -1) if (state >= 1 || state <= -1)
{ {
ActiveShuttle.DoThrough(); ActiveShuttle.DoThrough();
hasMissed = true; hasMissed = true;
shuttleActive = false; shuttleActive = false;

View file

@ -1,6 +1,7 @@
using DG.Tweening; using DG.Tweening;
using NaughtyBezierCurves; using NaughtyBezierCurves;
using HeavenStudio.Util; using HeavenStudio.Util;
using HeavenStudio.InputSystem;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -10,17 +11,18 @@ namespace HeavenStudio.Games.Loaders
using static Minigames; using static Minigames;
public static class CtrBearLoader public static class CtrBearLoader
{ {
public static Minigame AddGame(EventCaller eventCaller) { public static Minigame AddGame(EventCaller eventCaller)
return new Minigame("blueBear", "Blue Bear", "b4e6f6", false, false, new List<GameAction>() {
return new Minigame("blueBear", "Blue Bear", "b4e6f6", "e7e7e7", "bf9d34", false, false, new List<GameAction>()
{ {
new GameAction("donut", "Donut") new GameAction("donut", "Donut")
{ {
function = delegate { BlueBear.instance.SpawnTreat(eventCaller.currentEntity.beat, false); }, function = delegate { BlueBear.instance.SpawnTreat(eventCaller.currentEntity.beat, false); },
defaultLength = 3, defaultLength = 3,
}, },
new GameAction("cake", "Cake") new GameAction("cake", "Cake")
{ {
function = delegate { BlueBear.instance.SpawnTreat(eventCaller.currentEntity.beat, true); }, function = delegate { BlueBear.instance.SpawnTreat(eventCaller.currentEntity.beat, true); },
defaultLength = 4, defaultLength = 4,
}, },
new GameAction("setEmotion", "Set Emotion") new GameAction("setEmotion", "Set Emotion")
@ -49,9 +51,9 @@ namespace HeavenStudio.Games.Loaders
} }
} }
}, },
new List<string>() {"ctr", "normal"}, new List<string>() { "ctr", "normal" },
"ctrbear", "en", "ctrbear", "en",
new List<string>() {} new List<string>() { }
); );
} }
} }
@ -110,6 +112,61 @@ namespace HeavenStudio.Games
public static BlueBear instance; public static BlueBear instance;
const int IALeft = 0;
const int IARight = 1;
protected static bool IA_PadLeft(out double dt)
{
return PlayerInput.GetPadDown(InputController.ActionsPad.Up, out dt)
|| PlayerInput.GetPadDown(InputController.ActionsPad.Down, out dt)
|| PlayerInput.GetPadDown(InputController.ActionsPad.Left, out dt)
|| PlayerInput.GetPadDown(InputController.ActionsPad.Right, out dt);
}
protected static bool IA_BatonLeft(out double dt)
{
return PlayerInput.GetBatonDown(InputController.ActionsBaton.West, out dt);
}
protected static bool IA_TouchLeft(out double dt)
{
bool want = PlayerInput.GetTouchDown(InputController.ActionsTouch.Left, out dt);
bool simul = false;
// if (!want)
// {
// simul = PlayerInput.GetTouchDown(InputController.ActionsTouch.Tap, out dt)
// && instance.IsExpectingInputNow(InputAction_Left.inputLockCategory)
// && instance.IsExpectingInputNow(InputAction_Right.inputLockCategory);
// }
return want || simul;
}
protected static bool IA_PadRight(out double dt)
{
return PlayerInput.GetPadDown(InputController.ActionsPad.East, out dt);
}
protected static bool IA_BatonRight(out double dt)
{
return PlayerInput.GetBatonDown(InputController.ActionsBaton.East, out dt);
}
protected static bool IA_TouchRight(out double dt)
{
bool want = PlayerInput.GetTouchDown(InputController.ActionsTouch.Right, out dt);
bool simul = false;
// if (!want)
// {
// simul = PlayerInput.GetTouchDown(InputController.ActionsTouch.Tap, out dt)
// && instance.IsExpectingInputNow(InputAction_Right.inputLockCategory)
// && instance.IsExpectingInputNow(InputAction_Left.inputLockCategory);
// }
return want || simul;
}
public static PlayerInput.InputAction InputAction_Left =
new("CtrBearLeft", new int[] { IALeft, IALeft, IALeft },
IA_PadLeft, IA_TouchLeft, IA_BatonLeft);
public static PlayerInput.InputAction InputAction_Right =
new("CtrBearRight", new int[] { IARight, IARight, IARight },
IA_PadRight, IA_TouchRight, IA_BatonRight);
void OnDestroy() void OnDestroy()
{ {
if (Conductor.instance.isPlaying || Conductor.instance.isPaused) return; if (Conductor.instance.isPlaying || Conductor.instance.isPaused) return;
@ -132,16 +189,16 @@ namespace HeavenStudio.Games
{ {
headAndBodyAnim.SetBool("ShouldOpenMouth", foodHolder.childCount != 0); headAndBodyAnim.SetBool("ShouldOpenMouth", foodHolder.childCount != 0);
if (PlayerInput.GetAnyDirectionDown() && !IsExpectingInputNow(InputType.DIRECTION_DOWN)) if (PlayerInput.GetIsAction(InputAction_Left) && !IsExpectingInputNow(InputAction_Left.inputLockCategory))
{ {
Bite(true); Bite(true);
} }
else if (PlayerInput.Pressed() && !IsExpectingInputNow(InputType.STANDARD_DOWN)) else if (PlayerInput.GetIsAction(InputAction_Right) && !IsExpectingInputNow(InputAction_Right.inputLockCategory))
{ {
Bite(false); Bite(false);
} }
var cond = Conductor.instance; Conductor cond = Conductor.instance;
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
@ -274,7 +331,7 @@ namespace HeavenStudio.Games
{ {
var objectToSpawn = isCake ? cakeBase : donutBase; var objectToSpawn = isCake ? cakeBase : donutBase;
var newTreat = GameObject.Instantiate(objectToSpawn, foodHolder); var newTreat = GameObject.Instantiate(objectToSpawn, foodHolder);
var treatComp = newTreat.GetComponent<Treat>(); var treatComp = newTreat.GetComponent<Treat>();
treatComp.startBeat = beat; treatComp.startBeat = beat;
treatComp.curve = isCake ? cakeCurve : donutCurve; treatComp.curve = isCake ? cakeCurve : donutCurve;

View file

@ -21,7 +21,7 @@ namespace HeavenStudio.Games.Scripts_BlueBear
[NonSerialized] public BezierCurve3D curve; [NonSerialized] public BezierCurve3D curve;
private BlueBear game; private BlueBear game;
private void Awake() private void Awake()
{ {
game = BlueBear.instance; game = BlueBear.instance;
@ -30,7 +30,7 @@ namespace HeavenStudio.Games.Scripts_BlueBear
private void Start() private void Start()
{ {
flyBeats = isCake ? 3f : 2f; flyBeats = isCake ? 3f : 2f;
game.ScheduleInput(startBeat, flyBeats, isCake ? InputType.DIRECTION_DOWN : InputType.STANDARD_DOWN, Just, Out, Out); game.ScheduleInput(startBeat, flyBeats, isCake ? BlueBear.InputAction_Left : BlueBear.InputAction_Right, Just, Out, Out);
} }
private void Update() private void Update()
@ -45,7 +45,7 @@ namespace HeavenStudio.Games.Scripts_BlueBear
if (flyPos > 1f) if (flyPos > 1f)
{ {
GameObject.Destroy(gameObject); Destroy(gameObject);
return; return;
} }
@ -76,7 +76,8 @@ namespace HeavenStudio.Games.Scripts_BlueBear
private void Just(PlayerActionEvent caller, float state) private void Just(PlayerActionEvent caller, float state)
{ {
if (state >= 1f || state <= -1f) { //todo: proper near miss feedback if (state >= 1f || state <= -1f)
{ //todo: proper near miss feedback
if (isCake) if (isCake)
{ {
game.headAndBodyAnim.Play("BiteL", 0, 0); game.headAndBodyAnim.Play("BiteL", 0, 0);
@ -85,14 +86,14 @@ namespace HeavenStudio.Games.Scripts_BlueBear
{ {
game.headAndBodyAnim.Play("BiteR", 0, 0); game.headAndBodyAnim.Play("BiteR", 0, 0);
} }
return; return;
} }
EatFood(); EatFood();
} }
private void Miss(PlayerActionEvent caller) {} private void Miss(PlayerActionEvent caller) { }
private void Out(PlayerActionEvent caller) {} private void Out(PlayerActionEvent caller) { }
void SpawnCrumbs() void SpawnCrumbs()
{ {

View file

@ -130,7 +130,7 @@ namespace HeavenStudio.Games
{ {
SingleBop(); SingleBop();
} }
if(PlayerInput.Pressed() && !IsExpectingInputNow(InputType.STANDARD_DOWN)) if (PlayerInput.GetIsAction(InputAction_BasicPressing) && !IsExpectingInputNow(InputAction_BasicPress.inputLockCategory))
{ {
if (executives[executiveCount - 1].spinning) if (executives[executiveCount - 1].spinning)
{ {
@ -214,7 +214,7 @@ namespace HeavenStudio.Games
}), }),
new BeatAction.Action(beat + 2.5f, delegate { assistantCanBop = true; }) new BeatAction.Action(beat + 2.5f, delegate { assistantCanBop = true; })
}); });
ScheduleInput(beat, 2f, InputType.STANDARD_DOWN, JustAssistant, MissAssistant, Empty); ScheduleInput(beat, 2f, InputAction_BasicPress, JustAssistant, MissAssistant, Empty);
} }
public void Stop(double beat, float length) public void Stop(double beat, float length)
@ -255,7 +255,7 @@ namespace HeavenStudio.Games
} }
stops.Add(new BeatAction.Action(beat + length * executiveCount + 0.5f, delegate { executivesCanBop = true; })); stops.Add(new BeatAction.Action(beat + length * executiveCount + 0.5f, delegate { executivesCanBop = true; }));
BeatAction.New(instance, stops); BeatAction.New(instance, stops);
ScheduleInput(beat, length * (executiveCount - 1), InputType.STANDARD_DOWN, Just, Miss, Empty); ScheduleInput(beat, length * (executiveCount - 1), InputAction_BasicPress, Just, Miss, Empty);
} }
public void Prepare() public void Prepare()

View file

@ -30,7 +30,7 @@ namespace HeavenStudio.Games.Scripts_BuiltToScaleDS
hitBeat = windupBeat + createLength; hitBeat = windupBeat + createLength;
sinkBeat = hitBeat + (createLength * 2f); sinkBeat = hitBeat + (createLength * 2f);
game.ScheduleInput(windupBeat, createLength, InputType.STANDARD_DOWN, Just, Miss, Out); game.ScheduleInput(windupBeat, createLength, BuiltToScaleDS.InputAction_FlickPress, Just, Miss, Out);
} }
private void Update() private void Update()
@ -39,7 +39,8 @@ namespace HeavenStudio.Games.Scripts_BuiltToScaleDS
double currentBeat = Conductor.instance.songPositionInBeatsAsDouble; double currentBeat = Conductor.instance.songPositionInBeatsAsDouble;
var shooterState = game.shooterAnim.GetCurrentAnimatorStateInfo(0); var shooterState = game.shooterAnim.GetCurrentAnimatorStateInfo(0);
if (currentBeat > windupBeat && currentBeat < hitBeat if ((PlayerInput.CurrentControlStyle != InputSystem.InputController.ControlStyles.Touch || !PlayerInput.PlayerHasControl())
&& currentBeat > windupBeat && currentBeat < hitBeat
&& !shooterState.IsName("Windup") && !shooterState.IsName("Windup")
&& !game.lastShotOut) && !game.lastShotOut)
{ {
@ -52,9 +53,6 @@ namespace HeavenStudio.Games.Scripts_BuiltToScaleDS
private void Just(PlayerActionEvent caller, float state) private void Just(PlayerActionEvent caller, float state)
{ {
var shooterState = game.shooterAnim.GetCurrentAnimatorStateInfo(0);
if (!shooterState.IsName("Windup")) return;
// near miss // near miss
if (state >= 1f || state <= -1f) { if (state >= 1f || state <= -1f) {
NearMiss(); NearMiss();

View file

@ -258,6 +258,7 @@ namespace HeavenStudio.Games
List<RiqEntity> spawnedBlockEvents = new List<RiqEntity>(); List<RiqEntity> spawnedBlockEvents = new List<RiqEntity>();
void Update() void Update()
{ {
shootingThisFrame = false;
if (!Conductor.instance.isPlaying && !Conductor.instance.isPaused) if (!Conductor.instance.isPlaying && !Conductor.instance.isPaused)
return; return;
@ -283,21 +284,13 @@ namespace HeavenStudio.Games
HandleLights(); HandleLights();
} }
currentBeltOffset = (currentBeltOffset + Time.deltaTime * -beltSpeed) % 1f;
beltMaterial.mainTextureOffset = new Vector2(0f, currentBeltOffset);
environmentRenderer.materials = environmentMaterials;
elevatorRenderer.materials = elevatorMaterials;
}
void LateUpdate()
{
var shooterState = shooterAnim.GetCurrentAnimatorStateInfo(0); var shooterState = shooterAnim.GetCurrentAnimatorStateInfo(0);
bool canShoot = (!shooterState.IsName("Shoot") || shooterAnim.IsAnimationNotPlaying()) && !shootingThisFrame; bool canShoot = (!shooterState.IsName("Shoot") || shooterAnim.IsAnimationNotPlaying()) && !shootingThisFrame;
if (canShoot && lastShotOut) if (canShoot && lastShotOut)
lastShotOut = false; lastShotOut = false;
if (canShoot && !lastShotOut && PlayerInput.Pressed() && !IsExpectingInputNow(InputType.STANDARD_DOWN)) if (canShoot && !lastShotOut && PlayerInput.GetIsAction(InputAction_FlickPress) && !IsExpectingInputNow(InputAction_FlickPress.inputLockCategory))
{ {
lastShotOut = true; lastShotOut = true;
shootingThisFrame = true; shootingThisFrame = true;
@ -306,15 +299,36 @@ namespace HeavenStudio.Games
SoundByte.PlayOneShotGame("builtToScaleDS/Boing"); SoundByte.PlayOneShotGame("builtToScaleDS/Boing");
} }
if (!shootingThisFrame) currentBeltOffset = (currentBeltOffset + Time.deltaTime * -beltSpeed) % 1f;
beltMaterial.mainTextureOffset = new Vector2(0f, currentBeltOffset);
environmentRenderer.materials = environmentMaterials;
elevatorRenderer.materials = elevatorMaterials;
if (PlayerInput.PlayerHasControl() && PlayerInput.CurrentControlStyle is InputSystem.InputController.ControlStyles.Touch)
{ {
if (blocksHolder.childCount == 0 && shooterState.IsName("Windup") && shooterAnim.IsAnimationNotPlaying()) if (PlayerInput.GetIsAction(InputAction_BasicPress))
{ {
shooterAnim.Play("WindDown", 0, 0); shooterAnim.Play("Windup", 0, 0);
}
if (PlayerInput.GetIsAction(InputAction_BasicRelease) && !shootingThisFrame)
{
shooterAnim.Play("WindDown", 0, 23 / 28f);
} }
} }
else
{
if (!shootingThisFrame)
{
if (blocksHolder.childCount == 0 && shooterState.IsName("Windup") && shooterAnim.IsAnimationNotPlaying())
{
shooterAnim.Play("WindDown", 0, 0);
}
}
}
}
shootingThisFrame = false; void LateUpdate()
{
} }
public void Lights(double beat, float length, bool autoLights, bool shouldLights) public void Lights(double beat, float length, bool autoLights, bool shouldLights)

View file

@ -3,6 +3,7 @@ using HeavenStudio.Util;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using HeavenStudio.InputSystem;
namespace HeavenStudio.Games.Loaders namespace HeavenStudio.Games.Loaders
{ {
@ -12,7 +13,7 @@ namespace HeavenStudio.Games.Loaders
// minigame menu items // minigame menu items
public static Minigame AddGame(EventCaller eventCaller) public static Minigame AddGame(EventCaller eventCaller)
{ {
return new Minigame("catchyTune", "Catchy Tune", "f2f2f2", false, false, new List<GameAction>() return new Minigame("catchyTune", "Catchy Tune", "f2f2f2", "ff376c", "f2f2f2", false, false, new List<GameAction>()
{ {
new GameAction("orange", "Orange") new GameAction("orange", "Orange")
{ {
@ -55,10 +56,10 @@ namespace HeavenStudio.Games.Loaders
}, },
} }
}, },
new List<string>() {"ctr", "normal"}, new List<string>() { "ctr", "normal" },
"ctrcatchy", "ctrcatchy",
"en", "en",
new List<string>(){} new List<string>() { }
); );
} }
} }
@ -125,6 +126,61 @@ namespace HeavenStudio.Games
public float endSmile; public float endSmile;
} }
const int IALeft = 0;
const int IARight = 1;
protected static bool IA_PadLeft(out double dt)
{
return PlayerInput.GetPadDown(InputController.ActionsPad.Up, out dt)
|| PlayerInput.GetPadDown(InputController.ActionsPad.Down, out dt)
|| PlayerInput.GetPadDown(InputController.ActionsPad.Left, out dt)
|| PlayerInput.GetPadDown(InputController.ActionsPad.Right, out dt);
}
protected static bool IA_BatonLeft(out double dt)
{
return PlayerInput.GetBatonDown(InputController.ActionsBaton.West, out dt);
}
protected static bool IA_TouchLeft(out double dt)
{
bool want = PlayerInput.GetTouchDown(InputController.ActionsTouch.Left, out dt);
bool simul = false;
if (!want)
{
simul = PlayerInput.GetTouchDown(InputController.ActionsTouch.Right, out dt)
&& instance.IsExpectingInputNow(InputAction_Left)
&& instance.IsExpectingInputNow(InputAction_Right);
}
return want || simul;
}
protected static bool IA_PadRight(out double dt)
{
return PlayerInput.GetPadDown(InputController.ActionsPad.East, out dt);
}
protected static bool IA_BatonRight(out double dt)
{
return PlayerInput.GetBatonDown(InputController.ActionsBaton.East, out dt);
}
protected static bool IA_TouchRight(out double dt)
{
bool want = PlayerInput.GetTouchDown(InputController.ActionsTouch.Right, out dt);
bool simul = false;
if (!want)
{
simul = PlayerInput.GetTouchDown(InputController.ActionsTouch.Left, out dt)
&& instance.IsExpectingInputNow(InputAction_Left)
&& instance.IsExpectingInputNow(InputAction_Right);
}
return want || simul;
}
public static PlayerInput.InputAction InputAction_Left =
new("CtrStepLeft", new int[] { IALeft, IALeft, IALeft },
IA_PadLeft, IA_TouchLeft, IA_BatonLeft);
public static PlayerInput.InputAction InputAction_Right =
new("CtrStepRight", new int[] { IARight, IARight, IARight },
IA_PadRight, IA_TouchRight, IA_BatonRight);
private void Awake() private void Awake()
{ {
instance = this; instance = this;
@ -193,16 +249,13 @@ namespace HeavenStudio.Games
} }
} }
if (!IsExpectingInputNow()) if (PlayerInput.GetIsAction(InputAction_Left) && !IsExpectingInputNow(InputAction_Left.inputLockCategory))
{ {
if (PlayerInput.GetAnyDirectionDown()) catchWhiff(false);
{ }
catchWhiff(false); if (PlayerInput.GetIsAction(InputAction_Right) && !IsExpectingInputNow(InputAction_Right.inputLockCategory))
} {
if (PlayerInput.Pressed()) catchWhiff(true);
{
catchWhiff(true);
}
} }
} }
} }
@ -346,7 +399,7 @@ namespace HeavenStudio.Games
double beat = Conductor.instance.songPositionInBeatsAsDouble; double beat = Conductor.instance.songPositionInBeatsAsDouble;
string fruitType = isPineapple ? "Pineapple" : "Orange"; string fruitType = isPineapple ? "Pineapple" : "Orange";
if (side) if (side)
{ {
alalinAnim.Play("miss" + fruitType, 0, 0); alalinAnim.Play("miss" + fruitType, 0, 0);
@ -382,7 +435,7 @@ namespace HeavenStudio.Games
public void whiffAnim(bool side) public void whiffAnim(bool side)
{ {
double beat = Conductor.instance.songPositionInBeatsAsDouble; double beat = Conductor.instance.songPositionInBeatsAsDouble;
if (side) if (side)
{ {
alalinAnim.Play("whiff", 0, 0); alalinAnim.Play("whiff", 0, 0);

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