IEmuCore接口变更,StartGame会返回初始化失败的情况

AxibugEmuOnline.Client/Assets/Script/AppMain/IEmuCore.cs

@@ -13,7 +13,7 @@ namespace AxibugEmuOnline.Client
         void Pause();
         void Resume();
         void SetupScheme();
-        void StartGame(RomFile romFile);
+        MsgBool StartGame(RomFile romFile);
         void DoReset();
         IControllerSetuper GetControllerSetuper();
 

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppEmu.cs

@@ -56,7 +56,9 @@ namespace AxibugEmuOnline.Client.Manager
                     break;
             }
 
-            m_emuCore.StartGame(romFile);
+            var result = m_emuCore.StartGame(romFile);
+            if (result)
+            {
                 LaunchUI.Instance.HideMainMenu();
                 InGameUI.Instance.Show(romFile, m_emuCore);
 
@@ -70,6 +72,12 @@ namespace AxibugEmuOnline.Client.Manager
 
                 Eventer.Instance.RegisterEvent(EEvent.OnRoomSlotDataChanged, OnSlotDataChanged);
             }
+            else
+            {
+                StopGame();
+                OverlayManager.PopTip(result);
+            }
+        }
 
         private void OnSlotDataChanged()
         {

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/RomLib/RomFile.cs

@@ -96,11 +96,12 @@ namespace AxibugEmuOnline.Client
             if (Path.GetExtension(LocalFilePath).ToLower() == ".zip")
             {
                 var zip = new ZipInputStream(new MemoryStream(bytes));
-                var entry = zip.GetNextEntry() as ZipEntry;
+                while (true)
-
-				while (entry != null)
                 {
-					if (!entry.Name.ToLower().EndsWith(".nes")) continue;
+                    var currentEntry = zip.GetNextEntry();
+                    if (currentEntry == null) break;
+
+                    if (!currentEntry.Name.ToLower().EndsWith(".nes")) continue;
 
                     var buffer = new byte[1024];
                     MemoryStream output = new MemoryStream();

AxibugEmuOnline.Client/Assets/Script/AppMain/NesEmulator/NesEmulator.cs

@@ -63,7 +63,7 @@ namespace AxibugEmuOnline.Client
         /// <summary>
         /// 指定ROM开始游戏
         /// </summary>
-        public void StartGame(RomFile rom)
+        public MsgBool StartGame(RomFile rom)
         {
             StopGame();
 
@@ -76,11 +76,13 @@ namespace AxibugEmuOnline.Client
             try
             {
                 NesCore = new NES(rom.FileName);
+                return true;
             }
             catch (Exception ex)
             {
                 NesCore = null;
                 App.log.Error(ex.ToString());
+                return ex.Message;
             }
         }
 

AxibugEmuOnline.Client/Assets/VirtualNes.Core/MMU.cs

@@ -207,7 +207,7 @@ namespace VirtualNes
         {
             for (byte i = 0; i < 8; i++)
             {
-                SetCRAM_1K_Bank(i, bank * 8 + 1);
+                SetCRAM_1K_Bank(i, bank * 8 + i);
             }
         }
 

AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper023.cs

@@ -40,7 +40,7 @@ namespace VirtualNes.Core
             irq_latch = 0;
             irq_clock = 0;
 
-            reg[9] = 1;
+            //reg[9] = 1;
 
             SetPROM_32K_Bank(0, 1, PROM_8K_SIZE - 2, PROM_8K_SIZE - 1);
             SetVROM_8K_Bank(0);