From 34e9090446967c291453715ee3248c9df24e68c3 Mon Sep 17 00:00:00 2001 From: "ALIENJACK\\alien" Date: Thu, 21 Nov 2024 16:53:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=A5=87=E6=80=AA=E7=9A=84=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E5=BC=95=E7=94=A8=20=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E7=9A=84package?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Script/NesEmulator/NesControllerMapper.cs | 2 - .../Assets/VirtualNes.Core/ApuEX/APU_N106.cs | 9 +- .../Assets/VirtualNes.Core/MMU.cs | 3 +- .../VirtualNes.Core/Mapper/Mapper173.cs | 39 +++--- .../Assets/VirtualNes.Core/NES.cs | 7 +- .../Assets/VirtualNes.Core/PAD.cs | 4 +- .../Assets/VirtualNes.Core/PPU.cs | 5 +- .../Assets/VirtualNes.Core/State/CTRSTAT.cs | 5 +- AxibugEmuOnline.Client/Packages/manifest.json | 15 +-- .../Packages/packages-lock.json | 126 +----------------- 10 files changed, 30 insertions(+), 185 deletions(-) diff --git a/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesControllerMapper.cs b/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesControllerMapper.cs index e6adeee..867ae99 100644 --- a/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesControllerMapper.cs +++ b/AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesControllerMapper.cs @@ -87,8 +87,6 @@ namespace AxibugEmuOnline.Client public Mapper START = new Mapper(EnumButtonType.START); public Mapper MIC = new Mapper(EnumButtonType.MIC); - - public EnumButtonType GetButtons() { EnumButtonType res = 0; diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_N106.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_N106.cs index f9ea4e6..735fbe8 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_N106.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_N106.cs @@ -1,9 +1,4 @@ -using Codice.CM.Client.Differences; -using System; -using RECTANGLE = VirtualNes.Core.APU_VRC6.RECTANGLE; -using SAWTOOTH = VirtualNes.Core.APU_VRC6.SAWTOOTH; - -namespace VirtualNes.Core +namespace VirtualNes.Core { public class APU_N106 : APU_INTERFACE { @@ -144,7 +139,7 @@ namespace VirtualNes.Core int temp = channel_use * (8 - ch.databuf) * 4 * 45; if (temp == 0) return 0; - return (int)(256.0 * (double)cpu_clock * 12.0 * ch.freq / ((double)0x40000 * temp)); + return (int)(256.0 * cpu_clock * 12.0 * ch.freq / ((double)0x40000 * temp)); } return 0; diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/MMU.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/MMU.cs index ee95c16..1f50ab7 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/MMU.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/MMU.cs @@ -1,5 +1,4 @@ -using Codice.CM.Client.Differences; -using VirtualNes.Core; +using VirtualNes.Core; namespace VirtualNes { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper173.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper173.cs index fb1fd60..06024e6 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper173.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper173.cs @@ -1,7 +1,6 @@ ////////////////////////////////////////////////////////////////////////// // Mapper173 Subor // ////////////////////////////////////////////////////////////////////////// -using Codice.CM.Client.Differences; using VirtualNes.Core.Debug; using static VirtualNes.MMU; using BYTE = System.Byte; @@ -57,11 +56,11 @@ namespace VirtualNes.Core //D0: // break; - case 0x4204: //FDC主状态寄存器(STATUS) - // + case 0x4204: //FDC主状态寄存器(STATUS) + // break; - case 0x4205: //FDC数据寄存器(DATA)(读???) - // + case 0x4205: //FDC数据寄存器(DATA)(读???) + // break; } } @@ -92,7 +91,7 @@ namespace VirtualNes.Core irq_repeat = (byte)(data & 0x01); irq_enable = (byte)(data & 0x02); irq_occur = 0; - if (irq_enable!= null) + if (irq_enable != null) { irq_counter = irq_latch; } @@ -109,7 +108,7 @@ namespace VirtualNes.Core case 0x4035: reg[7] = data; - irq_latch = (irq_latch & 0x00FF) | ((ushort)data << 8); + irq_latch = (irq_latch & 0x00FF) | (data << 8); break; case 0x4040: SetPROM_4K_Bank(0x8000, data & 0x7F); @@ -136,8 +135,8 @@ namespace VirtualNes.Core SetPROM_4K_Bank(0xf000, data & 0x7F); break; - case 0x4205: //FDC数据寄存器(DATA)(写???) - // + case 0x4205: //FDC数据寄存器(DATA)(写???) + // break; } } @@ -163,21 +162,21 @@ namespace VirtualNes.Core public override void HSync(int scanline) - { - // if( (scanline >= 0 && scanline <= 239) ) { - // if( nes.ppu.IsDispON() ) { - // if( irq_enable ) { - // irq_enable = 0; - /// nes.cpu.SetIRQ( IRQ_MAPPER ); - // } - // } - // } - } + { + // if( (scanline >= 0 && scanline <= 239) ) { + // if( nes.ppu.IsDispON() ) { + // if( irq_enable ) { + // irq_enable = 0; + /// nes.cpu.SetIRQ( IRQ_MAPPER ); + // } + // } + // } + } public override void Clock(int cycles) { - if (irq_enable!= 0) + if (irq_enable != 0) { irq_counter -= cycles; if (irq_counter <= 0) diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/NES.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/NES.cs index 7303287..152d037 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/NES.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/NES.cs @@ -1,12 +1,7 @@ -using Codice.CM.Client.Differences; using System; using System.Collections.Generic; using System.IO; -using System.Runtime.ConstrainedExecution; -using System.Runtime.InteropServices.ComTypes; -using System.Security.Cryptography; using System.Text; -using UnityEngine; using VirtualNes.Core.Debug; namespace VirtualNes.Core @@ -1228,7 +1223,7 @@ namespace VirtualNes.Core return; } - if ((m_TapeCycles -= (double)cycles) > 0) + if ((m_TapeCycles -= cycles) > 0) return; m_TapeCycles += (nescfg.CpuClock / 32000.0); diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PAD.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PAD.cs index 0c4acd7..2b2e5b4 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PAD.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PAD.cs @@ -1,6 +1,4 @@ -using Codice.CM.Client.Differences; -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace VirtualNes.Core { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PPU.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PPU.cs index c26f10c..e995475 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PPU.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/PPU.cs @@ -1,8 +1,5 @@ -using Codice.CM.Client.Differences; -using System; -using System.Runtime.CompilerServices; +using System; using System.Runtime.InteropServices; -using UnityEngine.UIElements; namespace VirtualNes.Core { diff --git a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/CTRSTAT.cs b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/CTRSTAT.cs index 2718c07..0f9e29d 100644 --- a/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/CTRSTAT.cs +++ b/AxibugEmuOnline.Client/Assets/VirtualNes.Core/State/CTRSTAT.cs @@ -1,7 +1,4 @@ -using Codice.CM.Client.Differences; -using System; - -namespace VirtualNes.Core +namespace VirtualNes.Core { public struct CTRSTAT : IStateBufferObject { diff --git a/AxibugEmuOnline.Client/Packages/manifest.json b/AxibugEmuOnline.Client/Packages/manifest.json index 0ab1aef..d8da09a 100644 --- a/AxibugEmuOnline.Client/Packages/manifest.json +++ b/AxibugEmuOnline.Client/Packages/manifest.json @@ -1,21 +1,8 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.tilemap": "1.0.0", - "com.unity.ads": "3.7.5", - "com.unity.analytics": "3.6.12", - "com.unity.collab-proxy": "1.15.15", - "com.unity.editorcoroutines": "1.0.0", - "com.unity.ide.rider": "3.0.13", - "com.unity.ide.visualstudio": "2.0.14", - "com.unity.ide.vscode": "1.2.5", - "com.unity.purchasing": "4.1.3", - "com.unity.test-framework": "1.1.31", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ugui": "1.0.0", - "com.unity.visualscripting": "1.7.6", - "com.unity.xr.legacyinputhelpers": "2.1.9", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/AxibugEmuOnline.Client/Packages/packages-lock.json b/AxibugEmuOnline.Client/Packages/packages-lock.json index 1eb5656..d327dd7 100644 --- a/AxibugEmuOnline.Client/Packages/packages-lock.json +++ b/AxibugEmuOnline.Client/Packages/packages-lock.json @@ -6,64 +6,15 @@ "source": "builtin", "dependencies": {} }, - "com.unity.2d.tilemap": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, - "com.unity.ads": { - "version": "3.7.5", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, - "com.unity.analytics": { - "version": "3.6.12", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, - "com.unity.collab-proxy": { - "version": "1.15.15", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, - "url": "https://packages.unity.cn" - }, - "com.unity.editorcoroutines": { - "version": "1.0.0", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.cn" - }, "com.unity.ext.nunit": { "version": "1.0.6", - "depth": 1, + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.cn" }, - "com.unity.ide.rider": { - "version": "3.0.13", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ext.nunit": "1.0.6" - }, - "url": "https://packages.unity.cn" - }, "com.unity.ide.visualstudio": { - "version": "2.0.14", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -71,39 +22,9 @@ }, "url": "https://packages.unity.cn" }, - "com.unity.ide.vscode": { - "version": "1.2.5", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.cn" - }, - "com.unity.purchasing": { - "version": "4.1.3", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.androidjni": "1.0.0", - "com.unity.services.core": "1.0.1" - }, - "url": "https://packages.unity.cn" - }, - "com.unity.services.core": { - "version": "1.0.1", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, "com.unity.test-framework": { "version": "1.1.31", - "depth": 0, + "depth": 1, "source": "registry", "dependencies": { "com.unity.ext.nunit": "1.0.6", @@ -112,27 +33,6 @@ }, "url": "https://packages.unity.cn" }, - "com.unity.textmeshpro": { - "version": "3.0.6", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, - "com.unity.timeline": { - "version": "1.6.4", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.modules.director": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, "com.unity.ugui": { "version": "1.0.0", "depth": 0, @@ -142,26 +42,6 @@ "com.unity.modules.imgui": "1.0.0" } }, - "com.unity.visualscripting": { - "version": "1.7.6", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, - "com.unity.xr.legacyinputhelpers": { - "version": "2.1.9", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.xr": "1.0.0" - }, - "url": "https://packages.unity.cn" - }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, From 912ad6b04511d0b5e0f71ddd8cb896c7e8839274 Mon Sep 17 00:00:00 2001 From: "ALIENJACK\\alien" Date: Thu, 21 Nov 2024 17:03:06 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=9C=AA=E8=AE=BE=E7=BD=AE=E6=97=B6,?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=BB=98=E8=AE=A4=E9=A2=9C=E8=89=B2=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=94=99=E8=AF=AF=20rename=20BgSetting=5FCol?= =?UTF-8?q?or.cs->UI=5FBgSettingItem=5FColor.cs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Script/Manager/AppSettings/BgColorSettings.cs | 2 +- .../{BgSetting_Color.cs => UI_BgSettingItem_Color.cs} | 5 ++++- ...gSetting_Color.cs.meta => UI_BgSettingItem_Color.cs.meta} | 0 3 files changed, 5 insertions(+), 2 deletions(-) rename AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/{BgSetting_Color.cs => UI_BgSettingItem_Color.cs} (93%) rename AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/{BgSetting_Color.cs.meta => UI_BgSettingItem_Color.cs.meta} (100%) diff --git a/AxibugEmuOnline.Client/Assets/Script/Manager/AppSettings/BgColorSettings.cs b/AxibugEmuOnline.Client/Assets/Script/Manager/AppSettings/BgColorSettings.cs index 4055080..49b8a3f 100644 --- a/AxibugEmuOnline.Client/Assets/Script/Manager/AppSettings/BgColorSettings.cs +++ b/AxibugEmuOnline.Client/Assets/Script/Manager/AppSettings/BgColorSettings.cs @@ -19,7 +19,7 @@ namespace AxibugEmuOnline.Client var color1 = PlayerPrefs.GetString($"{nameof(BgColorSettings)}.{nameof(CurrentColor)}.{nameof(CurrentColor.color1)}", null); var color2 = PlayerPrefs.GetString($"{nameof(BgColorSettings)}.{nameof(CurrentColor)}.{nameof(CurrentColor.color2)}", null); var name = PlayerPrefs.GetString($"{nameof(BgColorSettings)}.{nameof(CurrentColor)}.{nameof(CurrentColor.Name)}", null); - if (color1 == null || color2 == null || name == null) + if (string.IsNullOrWhiteSpace(color1) || string.IsNullOrWhiteSpace(color2) || string.IsNullOrWhiteSpace(name)) return DEFAULT; else return new XMBColor(name, color1, color2); diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/BgSetting_Color.cs b/AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/UI_BgSettingItem_Color.cs similarity index 93% rename from AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/BgSetting_Color.cs rename to AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/UI_BgSettingItem_Color.cs index 2943e65..52c8bbd 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/BgSetting_Color.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/UI_BgSettingItem_Color.cs @@ -8,7 +8,10 @@ using UnityEngine; namespace AxibugEmuOnline.Client { - public class BgSetting_Color : MenuItem, IVirtualItem + /// + /// ɫUI + /// + public class UI_BgSettingItem_Color : MenuItem, IVirtualItem { public int Index { get; set; } public BgColorSettings Datacontext { get; private set; } diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/BgSetting_Color.cs.meta b/AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/UI_BgSettingItem_Color.cs.meta similarity index 100% rename from AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/BgSetting_Color.cs.meta rename to AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/UI_BgSettingItem_Color.cs.meta From 88ba7c189c6962efc18424682ebc3660ff995e37 Mon Sep 17 00:00:00 2001 From: "ALIENJACK\\alien" Date: Thu, 21 Nov 2024 17:08:44 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0preserve?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AxibugEmuOnline.Client/Assets/Script/App.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AxibugEmuOnline.Client/Assets/Script/App.cs b/AxibugEmuOnline.Client/Assets/Script/App.cs index 6ec7b73..3f7d6ee 100644 --- a/AxibugEmuOnline.Client/Assets/Script/App.cs +++ b/AxibugEmuOnline.Client/Assets/Script/App.cs @@ -5,6 +5,7 @@ using System.IO; using System.Threading.Tasks; using UnityEngine; using UnityEngine.Networking; +using UnityEngine.Scripting; using static AxibugEmuOnline.Client.HttpAPI; using static AxibugEmuOnline.Client.Manager.LogManager; @@ -38,6 +39,7 @@ namespace AxibugEmuOnline.Client.ClientCore public static string PersistentDataPath => Application.persistentDataPath; #endif + [Preserve] [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)] static void Init() { From 38a825f49e21b84d76538400248d8e209f7e6bf4 Mon Sep 17 00:00:00 2001 From: "ALIENJACK\\alien" Date: Thu, 21 Nov 2024 17:18:51 +0800 Subject: [PATCH 4/5] 123 --- AxibugEmuOnline.Client/Assets/Script/UI/XMBBgChanger.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/XMBBgChanger.cs b/AxibugEmuOnline.Client/Assets/Script/UI/XMBBgChanger.cs index 414e2ba..0ba54bf 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/XMBBgChanger.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/XMBBgChanger.cs @@ -1,9 +1,6 @@ using AxibugEmuOnline.Client.ClientCore; -using System.Collections; -using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -using static UnityEditor.Graphs.Styles; namespace AxibugEmuOnline.Client { From d907913bfc85aa4e2a6876148b387ad15c66e674 Mon Sep 17 00:00:00 2001 From: "ALIENJACK\\alien" Date: Thu, 21 Nov 2024 17:40:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=B8=80=E4=B8=AAIniter?= =?UTF-8?q?=20monobehaviour,=E7=94=A8=E6=9D=A5=E6=8F=90=E5=89=8D=E5=8A=A0?= =?UTF-8?q?=E8=BD=BDapp.init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Scene/AxibugEmuOnline.Client.unity | 37 +++++++++++++++++++ .../Assets/Script/Initer.cs | 13 +++++++ .../Assets/Script/Initer.cs.meta | 11 ++++++ .../Assets/Script/UI/LaunchUI.cs | 1 - .../Assets/Script/UI/XMBOptionBgChanger.cs | 1 - 5 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 AxibugEmuOnline.Client/Assets/Script/Initer.cs create mode 100644 AxibugEmuOnline.Client/Assets/Script/Initer.cs.meta diff --git a/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity b/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity index 3cd801f..58b4ad5 100644 --- a/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity +++ b/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity @@ -2613,6 +2613,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 1671938443312096518, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1671938443312096518, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1671938443312096518, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1671938443312096518, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1671938443312096518, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1671938443312096518, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1689466622691537257, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -13326,6 +13350,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1335662459} + - component: {fileID: 1335662460} m_Layer: 0 m_Name: IMPORTENT m_TagString: Untagged @@ -13351,6 +13376,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1335662460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1335662458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 980f937ad27ad8540afeb8b7f100997e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1427887268 GameObject: m_ObjectHideFlags: 0 diff --git a/AxibugEmuOnline.Client/Assets/Script/Initer.cs b/AxibugEmuOnline.Client/Assets/Script/Initer.cs new file mode 100644 index 0000000..0189d9d --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Script/Initer.cs @@ -0,0 +1,13 @@ +using AxibugEmuOnline.Client.ClientCore; +using UnityEngine; + +namespace AxibugEmuOnline.Client +{ + public class Initer : MonoBehaviour + { + private void Awake() + { + App.Init(); + } + } +} diff --git a/AxibugEmuOnline.Client/Assets/Script/Initer.cs.meta b/AxibugEmuOnline.Client/Assets/Script/Initer.cs.meta new file mode 100644 index 0000000..7b894b6 --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Script/Initer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 980f937ad27ad8540afeb8b7f100997e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: -1100 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/LaunchUI.cs b/AxibugEmuOnline.Client/Assets/Script/UI/LaunchUI.cs index c191e3b..2b30174 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/LaunchUI.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/LaunchUI.cs @@ -29,7 +29,6 @@ namespace AxibugEmuOnline.Client private void Awake() { - App.Init(); Instance = this; m_mainLayoutPosition = MainMenuRoot.anchoredPosition; MainMenu.ListenControlAction = true; diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/XMBOptionBgChanger.cs b/AxibugEmuOnline.Client/Assets/Script/UI/XMBOptionBgChanger.cs index 0273d45..1557d85 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/XMBOptionBgChanger.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/XMBOptionBgChanger.cs @@ -1,7 +1,6 @@ using AxibugEmuOnline.Client.ClientCore; using Coffee.UIExtensions; using UnityEngine; -using UnityEngine.UI; namespace AxibugEmuOnline.Client {