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

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

Browse Source 
Reviewed-on: sin365/AxibugEmuOnline#84
This commit is contained in:
sin365 2025-01-07 14:26:16 +08:00
commit ba93b5747b
35 changed files with 1723 additions and 1747 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AxibugEmuOnline.Client/Assets/Script/AppMain/App.cs
View File

@ -6,7 +6,6 @@ using System.Collections;
using System.IO;
using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.Networking;
using static AxibugEmuOnline.Client.HttpAPI;
using static AxibugEmuOnline.Client.Manager.LogManager;
@ -47,7 +46,7 @@ namespace AxibugEmuOnline.Client.ClientCore
#else
public static string PersistentDataPath => Application.persistentDataPath;
#endif
public static void Init( bool isTest = false, string testSrvIP = "")
public static void Init(bool isTest = false, string testSrvIP = "")
{
log = new LogManager(OnLogOut);

2
AxibugEmuOnline.Client/Assets/Script/AppMain/AxiHttp/AxiHttp.cs
View File

@ -1,5 +1,5 @@
using System;
using System.Collections.Generic;
using System;
using System.Diagnostics;
using System.IO;
using System.IO.Compression;

2
AxibugEmuOnline.Client/Assets/Script/AppMain/AxiHttp/AxiHttpProxy.cs
View File

@ -1,4 +1,4 @@
using UnityEngine;
using UnityEngine;
using static AxiHttp;
public static class AxiHttpProxy

2
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppRoom.cs
View File

@ -432,7 +432,7 @@ namespace AxibugEmuOnline.Client.Manager
/// 发送修改玩家槽位,全量
/// </summary>
/// <param name="dictSlotIdx2LocalJoyIdx">玩家占用房间GamePlaySlot和LocalJoyIdx字典</param>
public void SendChangePlaySlotIdxWithJoyIdx(Dictionary<uint, ValueTuple<uint,GamePadType>> dictSlotIdx2LocalJoyIdx)
public void SendChangePlaySlotIdxWithJoyIdx(Dictionary<uint, ValueTuple<uint, GamePadType>> dictSlotIdx2LocalJoyIdx)
{
if (!InRoom)
return;

3
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/1990-esque/Filter1990_esque.cs
View File

@ -1,6 +1,5 @@
using AxibugEmuOnline.Client;
using AxibugEmuOnline.Client;
using UnityEngine;
using UnityEngine.Rendering;
public class Filter1990_esque : FilterEffect
{

1
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/FilterChainEffect.cs
View File

@ -1,6 +1,5 @@
using Assets.Script.AppMain.Filter;
using AxibugEmuOnline.Client;
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Experimental.Rendering;

1
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/FilterParamerter.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Collections;
using UnityEngine;
namespace Assets.Script.AppMain.Filter

3
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/CacheManager.cs
View File

@ -1,10 +1,9 @@
using AxibugEmuOnline.Client.ClientCore;
using AxibugEmuOnline.Client.ClientCore;
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using UnityEngine;
using UnityEngine.Networking;
namespace AxibugEmuOnline.Client
{

8
AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/HttpAPI.cs
View File

@ -1,9 +1,7 @@
using AxibugEmuOnline.Client.ClientCore;
using AxibugProtobuf;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Text;
using UnityEngine;
namespace AxibugEmuOnline.Client
@ -18,14 +16,14 @@ namespace AxibugEmuOnline.Client
public void GetNesRomList(Action<int, Resp_GameList> callback, AxibugProtobuf.RomPlatformType platform, int page, int pageSize = 10)
{
App.StartCoroutine(GetRomListFlow(platform,page, pageSize, callback));
App.StartCoroutine(GetRomListFlow(platform, page, pageSize, callback));
}
public void SearchNesRomList(Action<int, Resp_GameList> callback, AxibugProtobuf.RomPlatformType platform, string searchKey, int page, int pageSize = 10)
{
App.StartCoroutine(SearchNesRomListFlow(platform,searchKey, page, pageSize, callback));
App.StartCoroutine(SearchNesRomListFlow(platform, searchKey, page, pageSize, callback));
}
private IEnumerator SearchNesRomListFlow(AxibugProtobuf.RomPlatformType platform,string searchKey, int page, int pageSize, Action<int, Resp_GameList> callback)
private IEnumerator SearchNesRomListFlow(AxibugProtobuf.RomPlatformType platform, string searchKey, int page, int pageSize, Action<int, Resp_GameList> callback)
{
if (!string.IsNullOrEmpty(searchKey))
{

4
AxibugEmuOnline.Client/Assets/Script/AppMain/MsgBool.cs
View File

@ -1,5 +1,5 @@
/// <summary>
/// String和Bool的缝合怪
/// <summary>
/// String和Bool的缝合怪
/// </summary>
public struct MsgBool
{

5
AxibugEmuOnline.Client/Assets/Script/AppMain/NesEmulator/NesControllerMapper.cs
View File

@ -1,5 +1,4 @@
using AxibugEmuOnline.Client.ClientCore;
using AxibugEmuOnline.Client.Common;
using AxibugEmuOnline.Client.Common;
using AxibugEmuOnline.Client.Event;
using System.Collections.Generic;
using System.Linq;
@ -91,7 +90,7 @@ namespace AxibugEmuOnline.Client
Controller targetController;
switch (conIndex)
{
case 0: targetController = Controller0;break;
case 0: targetController = Controller0; break;
case 1: targetController = Controller1; break;
case 2: targetController = Controller2; break;
case 3: targetController = Controller3; break;

6
AxibugEmuOnline.Client/Assets/Script/AppMain/NesEmulator/NesEmulator.cs
View File

@ -1,10 +1,10 @@
using System;
using AxibugEmuOnline.Client.ClientCore;
using AxibugProtobuf;
using System;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Xml.Linq;
using AxibugEmuOnline.Client.ClientCore;
using AxibugProtobuf;
using UnityEditor;
using UnityEngine;
using VirtualNes.Core;

4
AxibugEmuOnline.Client/Assets/Script/AppMain/NesEmulator/PaletteDefine.cs
View File

@ -1,6 +1,4 @@
using VirtualNes.Core;
namespace AxibugEmuOnline.Client
namespace AxibugEmuOnline.Client
{
public static class PaletteDefine
{

4
AxibugEmuOnline.Client/Assets/Script/AppMain/Network/NetMsg.cs
View File

@ -66,7 +66,7 @@ namespace AxibugEmuOnline.Client.Network
{
lock (lockQueueObj)
{
queueNetMsg.Enqueue(new ValueTuple<int,int,byte[]>(cmd, ERRCODE, arg));
queueNetMsg.Enqueue(new ValueTuple<int, int, byte[]>(cmd, ERRCODE, arg));
}
}
@ -88,7 +88,7 @@ namespace AxibugEmuOnline.Client.Network
ErrorCode err = ((ErrorCode)ERRCODE);
if (err != ErrorCode.ErrorOk)
{
OverlayManager.PopTip("错误:"+err.ToString());
OverlayManager.PopTip("错误:" + err.ToString());
}
List<Delegate> eventList = GetNetEventDicList(cmd);

1
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/BackgroundListMenuItem.cs
View File

@ -1,5 +1,4 @@
using AxibugEmuOnline.Client.ClientCore;
using System;
using System.Collections.Generic;
namespace AxibugEmuOnline.Client

1
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/GlobalFilterListMenuItem.cs
View File

@ -1,5 +1,4 @@
using AxibugEmuOnline.Client.ClientCore;
using System;
using System.Collections.Generic;
using System.Linq;

1
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/InGameUI/InGameUI_Scaler.cs
View File

@ -1,7 +1,6 @@
using AxibugEmuOnline.Client.ClientCore;
using System;
using System.Collections.Generic;
using UnityEngine;
using static AxibugEmuOnline.Client.ScreenScaler;
namespace AxibugEmuOnline.Client

2
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/GameObjectPool.cs
View File

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using UnityEngine;
public static class GameObjectPool

4
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI_ValueEditItem.cs
View File

@ -1,4 +1,4 @@
using AxibugEmuOnline.Client.ClientCore;
using AxibugEmuOnline.Client.ClientCore;
using UnityEngine;
namespace AxibugEmuOnline.Client
@ -30,7 +30,7 @@ namespace AxibugEmuOnline.Client
}
else
{
App.log.Warning($"尚未支持的数据类型:{valueMenu.ValueType}");
App.log.Warning($"尚未支持的数据类型:{valueMenu.ValueType}");
return;
}

3
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI_ValueEditItem_FloatEdit.cs
View File

@ -1,5 +1,4 @@
using System;
using UnityEngine;
using UnityEngine;
using UnityEngine.UI;
namespace AxibugEmuOnline.Client

3
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OverlayUI/OverlayManager.cs
View File

@ -1,5 +1,4 @@
using AxibugEmuOnline.Client.ClientCore;
using System;
using System;
using System.Collections.Generic;
using UnityEngine;

4
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OverlayUI/PopTipsItem.cs
View File

@ -1,4 +1,4 @@
using DG.Tweening;
using DG.Tweening;
using UnityEngine;
using UnityEngine.UI;
@ -22,7 +22,7 @@ namespace AxibugEmuOnline.Client
m_msgText.text = msg;
Canvas.ForceUpdateCanvases();
var targetPos = new Vector2(-RectTransform.rect.width - 20 , RectTransform.anchoredPosition.y);
var targetPos = new Vector2(-RectTransform.rect.width - 20, RectTransform.anchoredPosition.y);
DOTween.To(
() => RectTransform.anchoredPosition,
(value) => RectTransform.anchoredPosition = value,

4
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OverlayUI/PopTipsUI.cs
View File

@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Collections.Generic;
using UnityEngine;
namespace AxibugEmuOnline.Client

1
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/RoomUI/RoomListMenuItem.cs
View File

@ -1,6 +1,5 @@
using AxibugEmuOnline.Client.ClientCore;
using AxibugEmuOnline.Client.Event;
using System;
namespace AxibugEmuOnline.Client
{

8
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/SubMenuItemGroup.cs
View File

@ -1,4 +1,4 @@
using AxibugEmuOnline.Client.UI;
using AxibugEmuOnline.Client.UI;
using DG.Tweening;
using DG.Tweening.Core;
using DG.Tweening.Plugins.Options;
@ -185,8 +185,8 @@ namespace AxibugEmuOnline.Client
{
#if UNITY_EDITOR
//========================套娃宏========================
#if UNITY_2019_1_OR_NEWER //新版Unity，因UNITY2018.2用不了这玩意儿，编辑器也罢
//========================套娃宏========================
#if UNITY_2019_1_OR_NEWER //新版Unity，因UNITY2018.2用不了这玩意儿，编辑器也罢
if (Application.isPlaying)
{
@ -205,7 +205,7 @@ namespace AxibugEmuOnline.Client
item.transform.localPosition = Vector3.zero;
return item;
#endif
//========================套娃宏 End========================
//========================套娃宏 End========================

2
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/UITool.cs
View File

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;

2
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/VirtualSubMenuItem.cs
View File

@ -2,7 +2,6 @@
using DG.Tweening;
using DG.Tweening.Core;
using DG.Tweening.Plugins.Options;
using System;
using System.Collections;
using UnityEngine;
@ -13,7 +12,6 @@ namespace AxibugEmuOnline.Client
[SerializeField]
protected CanvasGroup RomGroupRoot;
private TweenerCore<float, float, FloatOptions> m_showTween;
protected override void Awake()

2
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/XMBTopGroupUI/ControllerInfo.cs
View File

@ -2,10 +2,8 @@
using AxibugEmuOnline.Client.ClientCore;
using AxibugEmuOnline.Client.Event;
using DG.Tweening;
using System;
using UnityEngine;
using UnityEngine.UI;
using VirtualNes.Core;
public class ControllerInfo : MonoBehaviour
{

2
AxibugEmuOnline.Client/Assets/Script/AppMain/UI/XMBTopGroupUI/ControllerInfoPanel.cs
View File

@ -3,10 +3,8 @@ using AxibugEmuOnline.Client.ClientCore;
using AxibugEmuOnline.Client.Event;
using AxibugEmuOnline.Client.Manager;
using AxibugProtobuf;
using System;
using System.Collections.Generic;
using UnityEngine;
using VirtualNes.Core;
public class ControllerInfoPanel : MonoBehaviour
{