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

change to remove broken code so that this will actually work for now

Browse source
This commit is contained in:
Firerise9402 2023-08-14 15:03:44 -04:00
parent 992fd043fd
commit 51c099341c
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assets/Scripts/AppInfo.cs
View file

@ -1,8 +1,8 @@
using System;
public static class AppInfo {
public const string Version = "0.0.1040";
public static readonly DateTime Date = new DateTime(2023, 08, 14, 16, 49, 15, 063, DateTimeKind.Utc);
public const string Version = "0.0.1041";
public static readonly DateTime Date = new DateTime(2023, 08, 14, 17, 16, 03, 539, DateTimeKind.Utc);
}

20
Assets/Scripts/WindowController.cs
View file

@ -10,12 +10,12 @@ using Jukebox;
using Jukebox.Legacy;
using System;
#if UNITY_STANDALONE_WIN
using System.Runtime.InteropServices;
#elif UNITY_STANDALONE_OSX
/*#if UNITY_STANDALONE_OSX
using AppKit;
using Foundation;
using Appkit;
#endif
#endif*/
@ -98,7 +98,7 @@ namespace HeavenStudio
System.IntPtr HWND_TOP = new System.IntPtr(0);
System.IntPtr HWND_TOPMOST = new System.IntPtr(-1);
System.IntPtr HWND_NOTOPMOST = new System.IntPtr(-2);
#elif UNITY_STANDALONE_OSX
/*#elif UNITY_STANDALONE_OSX
NSWindow _window;
var style = NSWindowStyle.Closable | NSWindowStyle.Resizable | NSWindowStyle.tilted;
@ -117,7 +117,7 @@ namespace HeavenStudio
public override NSWindow mainWindowDisplayInfo
{
get { return _window; }
}
}*/
#endif
@ -128,8 +128,8 @@ namespace HeavenStudio
if(Application.isEditor || !Editor.Editor.instance.fullscreen) return;
#if UNITY_STANDALONE_WIN
SetWindowPos(ptr, HWND_NOTOPMOST, x, y, resX, resY, SWP_SHOWWINDOW);
#elif UNITY_STANDALONE_OSX
SetWindowPos(x, y, resX, resY);
//#elif UNITY_STANDALONE_OSX
//SetWindowPos(x, y, resX, resY);
#endif
}
@ -192,7 +192,7 @@ namespace HeavenStudio
#if UNITY_STANDALONE_WIN
SetPosition(hWnd, Convert.ToInt16(pan.x), Convert.ToInt16(pan.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y));
#elif UNITY_STANDALONE_OSX
SetPosition(pan.x, pan.y, scale.x, scale.y);
//SetPosition(pan.x, pan.y, scale.x, scale.y);
#endif
//SetPosition(hWnd, Convert.ToInt16(pan.x + shakeResult.x), Convert.ToInt16(pan.y + shakeResult.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y));
}
@ -307,7 +307,7 @@ namespace HeavenStudio
#if UNITY_STANDALONE_WIN
SetWindowPos(hWnd, HWND_NOTOPMOST, Convert.ToInt16(pan.x), Convert.ToInt16(pan.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y), SWP_SHOWWINDOW);
#elif UNITY_STANDALONE_OSX
SetWindowPos(pan.x, pan.y, scale.x, scale.y);
//SetWindowPos(pan.x, pan.y, scale.x, scale.y);
#endif
}
}

6
ProjectSettings/ProjectSettings.asset
View file

@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.0.1040
bundleVersion: 0.0.1041
preloadedAssets:
- {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3}
metroInputSource: 0
@ -158,11 +158,11 @@ PlayerSettings:
applicationIdentifier:
Standalone: com.RHeavenStudio.Heaven-Studio
buildNumber:
Standalone: 1040
Standalone: 1041
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 0
AndroidBundleVersionCode: 1040
AndroidBundleVersionCode: 1041
AndroidMinSdkVersion: 22
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1