Merge pull request 'master' (#44) from Alienjack/AxibugEmuOnline:master into master

Reviewed-on: #44

AxibugEmuOnline.Client/Assets/Script/Event/Eventer.cs

@@ -214,7 +214,7 @@ namespace AxibugEmuOnline.Client.Event
                     }
                     catch (Exception e)
                     {
-                        App.log.Error(e.Message);
+                        App.log.Error(e.ToString());
                     }
                 }
             }

AxibugEmuOnline.Client/Assets/Script/Manager/AppRoom.cs

@@ -369,13 +369,13 @@ namespace AxibugEmuOnline.Client.Manager
             if (WaitStep != msg.WaitStep)
             {
                 WaitStep = msg.WaitStep;
-                Eventer.Instance.PostEvent(EEvent.OnRoomWaitStepChange, WaitStep);
                 if (WaitStep == 1)
                 {
                     byte[] decompressRawData = Helper.DecompressByteArray(msg.LoadStateRaw.ToByteArray());
                     App.log.Info($"收到即时存档数据 解压后;{decompressRawData.Length}");
                     RawData = decompressRawData;
                 }
+                Eventer.Instance.PostEvent(EEvent.OnRoomWaitStepChange, WaitStep);
             }
         }
 
@@ -435,7 +435,7 @@ namespace AxibugEmuOnline.Client.Manager
         /// <param name="roomMiniInfo"></param>
         /// <param name="freeSlots"></param>
         /// <returns></returns>
-        public static bool GetFreeSlot(this Protobuf_Room_MiniInfo roomMiniInfo,out int[] freeSlots)
+        public static bool GetFreeSlot(this Protobuf_Room_MiniInfo roomMiniInfo, out int[] freeSlots)
         {
             List<int> temp = new List<int>();
             if (roomMiniInfo.Player1UID > 0) temp.Add(0);

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

@@ -47,6 +47,8 @@ namespace AxibugEmuOnline.Client
             return romFile;
         }
 
+
+
         /// <summary> 清除所有下载的Rom文件 </summary>
         public void ClearRomFile()
         {
@@ -119,5 +121,10 @@ namespace AxibugEmuOnline.Client
         {
             return Helper.FileMD5Hash(data);
         }
+
+        public void AddRomFile(RomFile rom)
+        {
+            nesRomFileNameMapper[rom.FileName] = rom;
+        }
     }
 }

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

@@ -31,6 +31,8 @@ namespace AxibugEmuOnline.Client
             Supporter.Setup(new CoreSupporter());
             Debuger.Setup(new CoreDebuger());
 
+            App.nesRomLib.AddRomFile(rom);
+
             try
             {
                 NesCore = new NES(rom.FileName);

AxibugEmuOnline.Client/Assets/Script/Network/NetMsg.cs

@@ -86,7 +86,7 @@ namespace AxibugEmuOnline.Client.Network
                     }
                     catch (Exception e)
                     {
-                        App.log.Error(e.Message);
+                        App.log.Error(e.ToString());
                     }
                 }
             }

AxibugEmuOnline.Client/Assets/Script/UI/InGameUI/StepPerformer.cs

@@ -1,6 +1,4 @@
 using AxibugEmuOnline.Client.ClientCore;
-using System;
-using VirtualNes.Core;
 
 namespace AxibugEmuOnline.Client
 {

AxibugEmuOnline.Client/Assets/Script/UI/RoomListMenuItem.cs

@@ -10,7 +10,7 @@ namespace AxibugEmuOnline.Client
 
         protected override void Awake()
         {
-            Eventer.Instance.RegisterEvent<int>(EEvent.OnRoomListAllUpdate, OnRoomListUpdateAll);
+            Eventer.Instance.RegisterEvent(EEvent.OnRoomListAllUpdate, OnRoomListUpdateAll);
             Eventer.Instance.RegisterEvent<int>(EEvent.OnRoomListSingleClose, OnRoomClosed);
             Eventer.Instance.RegisterEvent<int>(EEvent.OnRoomListSingleAdd, OnRoomSingleAdd);
             base.Awake();
@@ -19,7 +19,7 @@ namespace AxibugEmuOnline.Client
 
         protected override void OnDestroy()
         {
-            Eventer.Instance.UnregisterEvent<int>(EEvent.OnRoomListAllUpdate, OnRoomListUpdateAll);
+            Eventer.Instance.UnregisterEvent(EEvent.OnRoomListAllUpdate, OnRoomListUpdateAll);
             Eventer.Instance.UnregisterEvent<int>(EEvent.OnRoomListSingleUpdate, OnRoomSingleAdd);
             Eventer.Instance.UnregisterEvent<int>(EEvent.OnRoomListSingleClose, OnRoomClosed);
         }
@@ -46,7 +46,7 @@ namespace AxibugEmuOnline.Client
             }
         }
 
-        private void OnRoomListUpdateAll(int obj)
+        private void OnRoomListUpdateAll()
         {
             if (m_entering)
             {

AxibugEmuOnline.Client/Assets/Script/UI/XMBBackGround.shader

@@ -2,7 +2,6 @@
 {
     Properties
     {
-        _MainTex ("Sprite Texture", 2D) = "white" {}
         _Color ("Tint", Color) = (1,1,1,1)
 
         _StencilComp ("Stencil Comparison", Float) = 8
@@ -75,12 +74,9 @@
                 UNITY_VERTEX_OUTPUT_STEREO
             };
 
-            sampler2D _MainTex;
             fixed4 _Color;
             fixed4 _TextureSampleAdd;
-            float4 _ClipRect;
+            float4 _ClipRect;        
-            float4 _MainTex_ST;           
-            float4 _MainTex_TexelSize;           
 
             float wave(float x, float frequency, float speed, float midHeight, float maxHeight)
             {
@@ -105,7 +101,7 @@
                 OUT.worldPosition = v.vertex;
                 OUT.vertex = UnityObjectToClipPos(OUT.worldPosition);
 
-                OUT.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
+                OUT.texcoord =v.texcoord;
 
                 OUT.color = v.color * _Color;
                 return OUT;

AxibugEmuOnline.Client/Assets/Script/Utility.cs

@@ -53,7 +53,7 @@ namespace AxibugEmuOnline.Client
                         RomFile romFile = new RomFile(EnumPlatform.NES, 0, 0);
                         romFile.SetWebData(romWebData);
                         s_RomFileCahcesInRoomInfo[roomInfo.GameRomID] = romFile;
-
+                        
                         callback.Invoke(roomInfo,romFile);
                     }));
                     break;