diff --git a/.gitmodules b/.gitmodules index 46fd90e..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "AxibugEmuOnline.Client/Assets/AlienUICore"] - path = AxibugEmuOnline.Client/Assets/AlienUICore - url = https://github.com/AlienJack/AlienUICore.git diff --git a/AxibugEmuOnline.Client/Assets/AlienUICore b/AxibugEmuOnline.Client/Assets/AlienUICore deleted file mode 160000 index 1acd834..0000000 --- a/AxibugEmuOnline.Client/Assets/AlienUICore +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1acd8341ce457e66d172834dfb909569db309c33 diff --git a/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity b/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity index 534f156..9b4126d 100644 --- a/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity +++ b/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity @@ -123,63 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &97806773 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4005479443711313684, guid: 67f367c700cae114baf1586d5103e455, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 4005479443711313684, guid: 67f367c700cae114baf1586d5103e455, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005479443711313684, guid: 67f367c700cae114baf1586d5103e455, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005479443711313684, guid: 67f367c700cae114baf1586d5103e455, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005479443711313684, guid: 67f367c700cae114baf1586d5103e455, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4005479443711313684, guid: 67f367c700cae114baf1586d5103e455, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005479443711313684, guid: 67f367c700cae114baf1586d5103e455, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005479443711313684, guid: 67f367c700cae114baf1586d5103e455, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005479443711313684, guid: 67f367c700cae114baf1586d5103e455, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005479443711313684, guid: 67f367c700cae114baf1586d5103e455, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005479443711313684, guid: 67f367c700cae114baf1586d5103e455, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4022843710785433633, guid: 67f367c700cae114baf1586d5103e455, type: 3} - propertyPath: m_Name - value: UIManager - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 67f367c700cae114baf1586d5103e455, type: 3} --- !u!1 &537454904 GameObject: m_ObjectHideFlags: 0 diff --git a/AxibugEmuOnline.Client/Assets/Script/AppAxibugEmuOnline.cs b/AxibugEmuOnline.Client/Assets/Script/AppAxibugEmuOnline.cs index 7fdf35f..f5b21d4 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppAxibugEmuOnline.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppAxibugEmuOnline.cs @@ -1,9 +1,7 @@ using AxibugEmuOnline.Client.Manager; using AxibugEmuOnline.Client.Network; -using System; using System.Collections; using UnityEngine; -using static AxibugEmuOnline.Client.Manager.LogManager; namespace AxibugEmuOnline.Client.ClientCore { diff --git a/AxibugEmuOnline.Client/Assets/Script/AxibugEmuOnline.Client.asmdef b/AxibugEmuOnline.Client/Assets/Script/AxibugEmuOnline.Client.asmdef index 46da217..abae45b 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AxibugEmuOnline.Client.asmdef +++ b/AxibugEmuOnline.Client/Assets/Script/AxibugEmuOnline.Client.asmdef @@ -2,7 +2,8 @@ "name": "AxibugEmuOnline.Client", "rootNamespace": "AxibugEmuOnline.Client", "references": [ - "GUID:390a2c4058e5c304a87e8be70c84d80b" + "GUID:390a2c4058e5c304a87e8be70c84d80b", + "GUID:49026977fc7499e4e8ef521d6a2b0324" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/CoreLibs/MemoryUtility.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/CoreLibs/MemoryUtility.cs index 736f94c..eea81c1 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/CoreLibs/MemoryUtility.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/CoreLibs/MemoryUtility.cs @@ -1,7 +1,5 @@ using System; using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Unity.Collections.LowLevel.Unsafe; namespace VirtualNes.Core {