Native Plugin

MarshMello0 · Nov 14, 2018 · 905aef0 · 905aef0
1 parent e4cc0dc
commit 905aef0
Show file tree

Hide file tree

Showing 44 changed files with 73 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,8 +3,8 @@
 [Oo]bj/
 [Bb]uild/
 [Bb]uilds/
+[Dd]ependencies/
 Assets/AssetStoreTools*
-
 # Visual Studio cache directory
 .vs/
 

diff --git a/Art Assets/logo.jpg b/Art Assets/logo.jpg
diff --git a/Art Assets/marshmello.jpg b/Art Assets/marshmello.jpg
diff --git a/Assets/Editor/UERP/Scripts.meta b/Assets/Editor/UERP/Scripts.meta
diff --git a/Assets/Editor/UERP/Scripts/DiscordRpc.cs.meta b/Assets/Editor/UERP/Scripts/DiscordRpc.cs.meta
diff --git a/Assets/Editor/UERP/Scripts/UERP.cs.meta b/Assets/Editor/UERP/Scripts/UERP.cs.meta
diff --git a/Assets/UERP.unitypackage.meta b/Assets/UERP.unitypackage.meta
diff --git a/Assets/Editor/UERP/Scripts/DiscordRpc.cs → Native Plugin/DiscordRpc.cs b/Assets/Editor/UERP/Scripts/DiscordRpc.cs → Native Plugin/DiscordRpc.cs
diff --git a/Native Plugin/Properties/AssemblyInfo.cs b/Native Plugin/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("UERP")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("UERP")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("5d8afb0d-91ff-4a02-9cb2-950b6831f26c")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Assets/Editor/UERP/Scripts/UERP.cs → Native Plugin/UERP.cs b/Assets/Editor/UERP/Scripts/UERP.cs → Native Plugin/UERP.cs
diff --git a/Native Plugin/bin/Release/UERP.dll b/Native Plugin/bin/Release/UERP.dll
diff --git a/Assets/Editor.meta → Unity Project/Assets/Editor.meta b/Assets/Editor.meta → Unity Project/Assets/Editor.meta
diff --git a/Assets/Editor/UERP.meta → Unity Project/Assets/Editor/UERP.meta b/Assets/Editor/UERP.meta → Unity Project/Assets/Editor/UERP.meta
diff --git a/Assets/Editor/UERP/Plugins.meta → ...y Project/Assets/Editor/UERP/Plugins.meta b/Assets/Editor/UERP/Plugins.meta → ...y Project/Assets/Editor/UERP/Plugins.meta
diff --git a/Unity Project/Assets/Editor/UERP/Plugins/UERP.dll b/Unity Project/Assets/Editor/UERP/Plugins/UERP.dll
diff --git a/Unity Project/Assets/Editor/UERP/Plugins/UERP.dll.meta b/Unity Project/Assets/Editor/UERP/Plugins/UERP.dll.meta
diff --git a/Assets/Editor/UERP/Plugins/x86.meta → ...oject/Assets/Editor/UERP/Plugins/x86.meta b/Assets/Editor/UERP/Plugins/x86.meta → ...oject/Assets/Editor/UERP/Plugins/x86.meta
diff --git a/...s/Editor/UERP/Plugins/x86/discord-rpc.dll → ...s/Editor/UERP/Plugins/x86/discord-rpc.dll b/...s/Editor/UERP/Plugins/x86/discord-rpc.dll → ...s/Editor/UERP/Plugins/x86/discord-rpc.dll
diff --git a/...tor/UERP/Plugins/x86/discord-rpc.dll.meta → ...tor/UERP/Plugins/x86/discord-rpc.dll.meta b/...tor/UERP/Plugins/x86/discord-rpc.dll.meta → ...tor/UERP/Plugins/x86/discord-rpc.dll.meta
diff --git a/Assets/Editor/UERP/Plugins/x86_64.meta → ...ct/Assets/Editor/UERP/Plugins/x86_64.meta b/Assets/Editor/UERP/Plugins/x86_64.meta → ...ct/Assets/Editor/UERP/Plugins/x86_64.meta
diff --git a/...ditor/UERP/Plugins/x86_64/discord-rpc.dll → ...ditor/UERP/Plugins/x86_64/discord-rpc.dll b/...ditor/UERP/Plugins/x86_64/discord-rpc.dll → ...ditor/UERP/Plugins/x86_64/discord-rpc.dll
diff --git a/.../UERP/Plugins/x86_64/discord-rpc.dll.meta → .../UERP/Plugins/x86_64/discord-rpc.dll.meta b/.../UERP/Plugins/x86_64/discord-rpc.dll.meta → .../UERP/Plugins/x86_64/discord-rpc.dll.meta
diff --git a/Assets/Editor/UERP/Scenes.meta → Unity Project/Assets/Editor/UERP/Scenes.meta b/Assets/Editor/UERP/Scenes.meta → Unity Project/Assets/Editor/UERP/Scenes.meta
diff --git a/...itor/UERP/Scenes/UERP Example Scene.unity → ...itor/UERP/Scenes/UERP Example Scene.unity b/...itor/UERP/Scenes/UERP Example Scene.unity → ...itor/UERP/Scenes/UERP Example Scene.unity
diff --git a/...UERP/Scenes/UERP Example Scene.unity.meta → ...UERP/Scenes/UERP Example Scene.unity.meta b/...UERP/Scenes/UERP Example Scene.unity.meta → ...UERP/Scenes/UERP Example Scene.unity.meta
diff --git a/Icons/Logo.png → Unity Project/Icons/Logo.png b/Icons/Logo.png → Unity Project/Icons/Logo.png
diff --git a/Packages/manifest.json → Unity Project/Packages/manifest.json b/Packages/manifest.json → Unity Project/Packages/manifest.json
diff --git a/ProjectSettings/AudioManager.asset → ...roject/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset → ...roject/ProjectSettings/AudioManager.asset
diff --git a/ProjectSettings/ClusterInputManager.asset → ...ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset → ...ProjectSettings/ClusterInputManager.asset
diff --git a/ProjectSettings/DynamicsManager.asset → ...ect/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset → ...ect/ProjectSettings/DynamicsManager.asset
diff --git a/ProjectSettings/EditorBuildSettings.asset → ...ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset → ...ProjectSettings/EditorBuildSettings.asset
@@ -5,7 +5,7 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 1
-    path: Assets/Scenes/SampleScene.unity
-    guid: 99c9720ab356a0642a771bea13969a05
+  - enabled: 0
+    path: 
+    guid: 00000000000000000000000000000000
   m_configObjects: {}
diff --git a/ProjectSettings/EditorSettings.asset → ...ject/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset → ...ject/ProjectSettings/EditorSettings.asset
diff --git a/ProjectSettings/GraphicsSettings.asset → ...ct/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset → ...ct/ProjectSettings/GraphicsSettings.asset
@@ -36,6 +36,8 @@ GraphicsSettings:
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

diff --git a/ProjectSettings/InputManager.asset → ...roject/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset → ...roject/ProjectSettings/InputManager.asset
diff --git a/ProjectSettings/NavMeshAreas.asset → ...roject/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset → ...roject/ProjectSettings/NavMeshAreas.asset
diff --git a/ProjectSettings/NetworkManager.asset → ...ject/ProjectSettings/NetworkManager.asset b/ProjectSettings/NetworkManager.asset → ...ject/ProjectSettings/NetworkManager.asset
diff --git a/ProjectSettings/Physics2DSettings.asset → ...t/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset → ...t/ProjectSettings/Physics2DSettings.asset
diff --git a/ProjectSettings/PresetManager.asset → ...oject/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset → ...oject/ProjectSettings/PresetManager.asset
diff --git a/ProjectSettings/ProjectSettings.asset → ...ect/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset → ...ect/ProjectSettings/ProjectSettings.asset
diff --git a/ProjectSettings/ProjectVersion.txt → ...roject/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt → ...roject/ProjectSettings/ProjectVersion.txt
diff --git a/ProjectSettings/QualitySettings.asset → ...ect/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset → ...ect/ProjectSettings/QualitySettings.asset
diff --git a/ProjectSettings/TagManager.asset → ... Project/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset → ... Project/ProjectSettings/TagManager.asset
diff --git a/ProjectSettings/TimeManager.asset → ...Project/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset → ...Project/ProjectSettings/TimeManager.asset
diff --git a/ProjectSettings/UnityConnectSettings.asset → ...rojectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset → ...rojectSettings/UnityConnectSettings.asset
@@ -3,7 +3,7 @@
 --- !u!310 &1
 UnityConnectSettings:
   m_ObjectHideFlags: 0
-  m_Enabled: 0
+  m_Enabled: 1
   m_TestMode: 0
   m_TestEventUrl: 
   m_TestConfigUrl: