mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update plugins and buildscript

Browse source
This commit is contained in:
minenice55 2023-10-18 23:32:52 -04:00
parent 8017f10aa3
commit c679ad1c24
46 changed files with 270 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assets/Editor/BuildScript.cs
View file

@ -22,7 +22,7 @@ namespace UnityBuilderAction
string appName = PlayerSettings.productName;
// Get filename.
string path = EditorUtility.SaveFilePanel("Build out WINDOWS to...", "", appName, "exe");
Build( BuildTarget.StandaloneWindows, 0, path);
Build( BuildTarget.StandaloneWindows64, 0, path);
}
[MenuItem("File/Build Linux")]

2
Assets/Plugins/JSL/x64.meta → Assets/Plugins/Discord/Plugins/aarch64.meta
View file

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

BIN
Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.bundle Normal file
View file

Binary file not shown.

31
Assets/Plugins/JSL/x64/libJoyShockLibrary.dylib.meta → Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.bundle.meta
View file

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

BIN
Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.dylib Normal file
View file

Binary file not shown.

63
Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.dylib.meta Normal file
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:

0
Assets/Plugins/Discord/Plugins/x86_64.meta → Assets/Plugins/Discord/Plugins/x64.meta
View file

0
Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.bundle → Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.bundle
View file

2
Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.bundle.meta → Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.bundle.meta
View file

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

0
Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dll → Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll
View file

0
Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dll.lib → Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll.lib
View file

0
Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dll.lib.meta → Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll.lib.meta
View file

0
Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dll.meta → Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll.meta
View file

0
Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dylib → Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dylib
View file

0
Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.dylib.meta → Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dylib.meta
View file

0
Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.so → Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.so
View file

0
Assets/Plugins/Discord/Plugins/x86_64/discord_game_sdk.so.meta → Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.so.meta
View file

19
Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll.meta
View file

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

BIN
Assets/Plugins/JSL/.DS_Store vendored
View file

Binary file not shown.

BIN
Assets/Plugins/JSL/x64/JoyShockLibrary.exp
View file

Binary file not shown.

BIN
Assets/Plugins/JSL/x64/JoyShockLibrary.lib
View file

Binary file not shown.

7
Assets/Plugins/JSL/x64/JoyShockLibrary.lib.meta
View file

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

BIN
Assets/Plugins/JSL/x64/libJoyShockLibrary.so
View file

Binary file not shown.

0
Assets/Plugins/JSL.meta → Assets/Plugins/JoyShockLibrary.meta
View file

68
Assets/Plugins/JSL/JoyShockLibrary.cs → Assets/Plugins/JoyShockLibrary/JoyShockLibrary.cs
View file

@ -130,13 +130,13 @@ public static class JSL
public delegate void ConnectionCallback(int handle);
public delegate void DeconnectionCallback(int handle, bool isConnected);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslConnectDevices();
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslGetConnectedDeviceHandles(int[] deviceHandleArray, int size);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslDisconnectAndDisposeAll();
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern bool JslStillConnected(int deviceId);
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
@ -148,72 +148,72 @@ public static class JSL
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern TOUCH_STATE JslGetTouchState(int deviceId);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslSetGyroSpace(int deviceId, int gyroSpace);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern float JslGetStickStep(int deviceId);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern float JslGetTriggerStep(int deviceId);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern float JslGetPollRate(int deviceId);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern float JslGetTimeSinceLastUpdate(int deviceId);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
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);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
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);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslResetContinuousCalibration(int deviceId);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslStartContinuousCalibration(int deviceId);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
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);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
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);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslSetCallback(EventCallback callback);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern void JslSetTouchCallback(TouchCallback callback);
// 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);
// 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);
// 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);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslGetControllerType(int deviceId);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslGetControllerSplitType(int deviceId);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslGetControllerColour(int deviceId);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslGetControllerButtonColour(int deviceId);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslGetControllerLeftGripColour(int deviceId);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
public static extern int JslGetControllerRightGripColour(int deviceId);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
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);
[DllImport("JoyShockLibrary")]
[DllImport("JoyShockLibrary", CallingConvention = CallingConvention.Cdecl)]
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);
}

0
Assets/Plugins/JSL/JoyShockLibrary.cs.meta → Assets/Plugins/JoyShockLibrary/JoyShockLibrary.cs.meta
View file

0
Assets/Plugins/JSL/LICENSE.md → Assets/Plugins/JoyShockLibrary/LICENSE.md
View file

0
Assets/Plugins/JSL/LICENSE.md.meta → Assets/Plugins/JoyShockLibrary/LICENSE.md.meta
View file

3
Assets/Plugins/JSL/x64/JoyShockLibrary.exp.meta → Assets/Plugins/JoyShockLibrary/Plugins.meta
View file

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

BIN
Assets/Plugins/JSL/x64/JoyShockLibrary.dll → Assets/Plugins/JoyShockLibrary/Plugins/JoyShockLibrary.dll
View file

Binary file not shown.

10
Assets/Plugins/JSL/x64/JoyShockLibrary.dll.meta → Assets/Plugins/JoyShockLibrary/Plugins/JoyShockLibrary.dll.meta
View file

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

0
Assets/Plugins/JSL/JoyShockLibrary.h → Assets/Plugins/JoyShockLibrary/Plugins/JoyShockLibrary.h
View file

63
Assets/Plugins/JoyShockLibrary/Plugins/JoyShockLibrary.h.meta Normal file
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:

BIN
Assets/Plugins/JSL/x64/libJoyShockLibrary.dylib → Assets/Plugins/JoyShockLibrary/Plugins/libJoyShockLibrary.dylib Executable file → Normal file
View file

Binary file not shown.

20
Assets/Plugins/JSL/JoyShockLibrary.h.meta → Assets/Plugins/JoyShockLibrary/Plugins/libJoyShockLibrary.dylib.meta
View file

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

BIN
Assets/Plugins/JoyShockLibrary/Plugins/libJoyShockLibrary.so Normal file
View file

Binary file not shown.

4
Assets/Plugins/JSL/x64/libJoyShockLibrary.so.meta → Assets/Plugins/JoyShockLibrary/Plugins/libJoyShockLibrary.so.meta
View file

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

0
Assets/Plugins/JSL/README.md → Assets/Plugins/JoyShockLibrary/README.md
View file

0
Assets/Plugins/JSL/README.md.meta → Assets/Plugins/JoyShockLibrary/README.md.meta
View file

54
Assets/Scenes/Editor.unity
View file

@ -371,9 +371,9 @@ RectTransform:
m_Father: {fileID: 574002313}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &9435782
@ -3519,9 +3519,9 @@ RectTransform:
m_Father: {fileID: 539838476}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 32, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &121871281
@ -3664,9 +3664,9 @@ RectTransform:
m_Father: {fileID: 539838476}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 72, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &129013734
@ -3786,9 +3786,9 @@ RectTransform:
m_Father: {fileID: 539838476}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 112, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &151246938
@ -10377,7 +10377,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 177.66986, y: -60.01}
m_AnchoredPosition: {x: 177.66988, y: -60.01}
m_SizeDelta: {x: 42, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &449176922
@ -14741,6 +14741,10 @@ PrefabInstance:
propertyPath: m_RaycastTarget
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8281773103246844715, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 720073bc7682b1441bece7116681f72c, type: 3}
--- !u!1 &631525710 stripped
@ -16659,7 +16663,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 486, y: -110}
m_AnchoredPosition: {x: 486, y: -109.99997}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0, y: 0}
--- !u!114 &683816223
@ -21339,7 +21343,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1589389272}
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
m_Value: 0
m_Value: 1
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@ -26111,7 +26115,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 199.06122}
m_AnchoredPosition: {x: 0, y: 153.75505}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945
@ -30191,9 +30195,9 @@ RectTransform:
m_Father: {fileID: 574002313}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 40, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1345846031
@ -35301,8 +35305,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1220118245}
m_HandleRect: {fileID: 1220118244}
m_Direction: 2
m_Value: 1
m_Size: 1
m_Value: 1.0000007
m_Size: 0.87568516
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -36956,7 +36960,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000030517578}
m_AnchoredPosition: {x: 0.000030517578, y: -0.000030517578}
m_SizeDelta: {x: 100, y: 350}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1702073032
@ -38048,9 +38052,9 @@ RectTransform:
m_Father: {fileID: 574002313}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 80, y: -21}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1783491359

4
Assets/Scripts/AppInfo.cs
View file

@ -1,8 +1,8 @@
using System;
public static class AppInfo {
public const string Version = "0.0.1003";
public static readonly DateTime Date = new DateTime(2023, 10, 08, 01, 35, 34, 715, DateTimeKind.Utc);
public const string Version = "0.0.1012";
public static readonly DateTime Date = new DateTime(2023, 10, 19, 03, 18, 26, 972, DateTimeKind.Utc);
}

24
Assets/Scripts/CircleCursor.cs
View file

@ -39,8 +39,14 @@ namespace HeavenStudio
private void Start()
{
// Cursor.visible = false;
splitTouchSnapEffect.emitting = false;
innerCircleRenderer = InnerCircle.GetComponent<SpriteRenderer>();
if (splitTouchSnapEffect != null)
{
splitTouchSnapEffect.emitting = false;
}
if (InnerCircle != null)
{
innerCircleRenderer = InnerCircle.GetComponent<SpriteRenderer>();
}
}
private void Open()
@ -81,7 +87,7 @@ namespace HeavenStudio
else
{
bool lrState = PlayerInput.GetInputController(1).GetPointerLeftRight();
if (PlayerInput.CurrentControlStyle == InputSystem.InputController.ControlStyles.Touch && (GameManager.instance?.GameHasSplitColours ?? false))
if (splitTouchSnapEffect != null && PlayerInput.CurrentControlStyle == InputSystem.InputController.ControlStyles.Touch && (GameManager.instance?.GameHasSplitColours ?? false))
{
if (lrState != lastLeftRightState)
{
@ -103,7 +109,7 @@ namespace HeavenStudio
trailEnableTime -= Time.deltaTime;
}
}
else if (splitTouchSnapEffect.emitting)
else if (splitTouchSnapEffect != null && splitTouchSnapEffect.emitting)
{
ClearTrail();
}
@ -140,7 +146,10 @@ namespace HeavenStudio
{
Close();
ClearTrail();
splitTouchSnapEffect.emitting = false;
if (splitTouchSnapEffect != null)
{
splitTouchSnapEffect.emitting = false;
}
}
}
}
@ -153,8 +162,11 @@ namespace HeavenStudio
public void ClearTrail()
{
splitTouchSnapEffect.Clear();
trailEnableTime = 0;
if (splitTouchSnapEffect != null)
{
splitTouchSnapEffect.Clear();
}
}
public void SetCursorColors(Color main, Color left, Color right)

16
Assets/Scripts/DiscordController.cs
View file

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

2
Assets/Scripts/DiscordController.cs.meta
View file

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

2
Assets/Scripts/GlobalGameManager.cs
View file

@ -386,6 +386,8 @@ namespace HeavenStudio
PlayerInput.CleanUp();
Debug.Log("Clearing RIQ Cache...");
Jukebox.RiqFileHandler.ClearCache();
Debug.Log("Closing Discord GameSDK...");
DiscordRPC.DiscordController.instance?.Disconnect();
}
private static bool WantsToQuit()

8
ProjectSettings/ProjectSettings.asset
View file

@ -86,7 +86,7 @@ PlayerSettings:
submitAnalytics: 1
usePlayerLog: 1
bakeCollisionMeshes: 0
forceSingleInstance: 0
forceSingleInstance: 1
useFlipModelSwapchain: 1
resizableWindow: 1
useMacAppStoreValidation: 0
@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.0.1003
bundleVersion: 0.0.1012
preloadedAssets:
- {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3}
metroInputSource: 0
@ -158,11 +158,11 @@ PlayerSettings:
applicationIdentifier:
Standalone: com.RHeavenStudio.Heaven-Studio
buildNumber:
Standalone: 1003
Standalone: 1012
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 0
AndroidBundleVersionCode: 1003
AndroidBundleVersionCode: 1012
AndroidMinSdkVersion: 22
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1