sin365/AxibugEmuOnline
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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

Browse Source 
Reviewed-on: #56
This commit is contained in:
sin365 2024-11-21 17:41:16 +08:00
commit e8953e593e
14 changed files with 91 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity
View File

@ -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

13
AxibugEmuOnline.Client/Assets/Script/Initer.cs Normal file
View File

@ -0,0 +1,13 @@
using AxibugEmuOnline.Client.ClientCore;
using UnityEngine;
namespace AxibugEmuOnline.Client
{
public class Initer : MonoBehaviour
{
private void Awake()
{
App.Init();
}
}
}

11
AxibugEmuOnline.Client/Assets/Script/Initer.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 980f937ad27ad8540afeb8b7f100997e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: -1100
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
AxibugEmuOnline.Client/Assets/Script/Manager/AppSettings/BgColorSettings.cs
View File

@ -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);

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

@ -93,8 +93,6 @@ namespace AxibugEmuOnline.Client
public Mapper START = new Mapper(EnumButtonType.START);
public Mapper MIC = new Mapper(EnumButtonType.MIC);
public EnumButtonType GetButtons()
{
EnumButtonType res = 0;

5
AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/BgSetting_Color.cs → AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/UI_BgSettingItem_Color.cs
View File

@ -8,7 +8,10 @@ using UnityEngine;
namespace AxibugEmuOnline.Client
{
public class BgSetting_Color : MenuItem, IVirtualItem
/// <summary>
/// ±³¾°ÑÕÉ«ÉèÖÃUI
/// </summary>
public class UI_BgSettingItem_Color : MenuItem, IVirtualItem
{
public int Index { get; set; }
public BgColorSettings Datacontext { get; private set; }

0
AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/BgSetting_Color.cs.meta → AxibugEmuOnline.Client/Assets/Script/UI/BgSettingsUI/UI_BgSettingItem_Color.cs.meta
View File

1
AxibugEmuOnline.Client/Assets/Script/UI/LaunchUI.cs
View File

@ -29,7 +29,6 @@ namespace AxibugEmuOnline.Client
private void Awake()
{
App.Init();
Instance = this;
m_mainLayoutPosition = MainMenuRoot.anchoredPosition;
MainMenu.ListenControlAction = true;

1
AxibugEmuOnline.Client/Assets/Script/UI/XMBOptionBgChanger.cs
View File

@ -1,7 +1,6 @@
using AxibugEmuOnline.Client.ClientCore;
using Coffee.UIExtensions;
using UnityEngine;
using UnityEngine.UI;
namespace AxibugEmuOnline.Client
{

2
AxibugEmuOnline.Client/Assets/VirtualNes.Core/ApuEX/APU_N106.cs
View File

@ -139,7 +139,7 @@
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;

24
AxibugEmuOnline.Client/Assets/VirtualNes.Core/Mapper/Mapper173.cs
View File

@ -91,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;
}
@ -108,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);
@ -163,20 +163,20 @@ 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)

2
AxibugEmuOnline.Client/Assets/VirtualNes.Core/NES.cs
View File

@ -1223,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);

15
AxibugEmuOnline.Client/Packages/manifest.json
View File

@ -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",

126
AxibugEmuOnline.Client/Packages/packages-lock.json
View File

@ -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,