Alienjack/AxibugEmuOnline
1
0
Fork 0
forked from sin365/AxibugEmuOnline
Code Pull Requests Activity

Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline

Browse Source
This commit is contained in:
sin365 2024-11-08 13:53:18 +08:00
commit 04d7bd51ee
9 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AxibugEmuOnline.Client/Assets/Script/Event/Eventer.cs
View File

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

7
AxibugEmuOnline.Client/Assets/Script/Manager/RomLib/RomLib.cs
View File

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

2
AxibugEmuOnline.Client/Assets/Script/NesEmulator/NesEmulator.cs
View File

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

2
AxibugEmuOnline.Client/Assets/Script/Network/NetMsg.cs
View File

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

2
AxibugEmuOnline.Client/Assets/Script/UI/InGameUI/StepPerformer.cs
View File

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

6
AxibugEmuOnline.Client/Assets/Script/UI/RoomListMenuItem.cs
View File

@ -10,7 +10,7 @@ namespace AxibugEmuOnline.Client
protected override void Awake() 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.OnRoomListSingleClose, OnRoomClosed);
Eventer.Instance.RegisterEvent<int>(EEvent.OnRoomListSingleAdd, OnRoomSingleAdd); Eventer.Instance.RegisterEvent<int>(EEvent.OnRoomListSingleAdd, OnRoomSingleAdd);
base.Awake(); base.Awake();
@ -19,7 +19,7 @@ namespace AxibugEmuOnline.Client
protected override void OnDestroy() 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.OnRoomListSingleUpdate, OnRoomSingleAdd);
Eventer.Instance.UnregisterEvent<int>(EEvent.OnRoomListSingleClose, OnRoomClosed); 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) if (m_entering)
{ {

6
AxibugEmuOnline.Client/Assets/Script/UI/XMBBackGround.shader
View File

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