Compare commits

...

2 Commits

11 changed files with 65 additions and 14 deletions

View File

@ -738,6 +738,7 @@ MonoBehaviour:
m_downloadProgress: {fileID: 1484915906009859069}
m_downloadingFlag: {fileID: 1252956242765037133}
m_romReadyFlag: {fileID: 6316945668089981796}
DownloadComplete: {fileID: 8449502431356192113}
--- !u!114 &5700455559359757662
MonoBehaviour:
m_ObjectHideFlags: 0
@ -888,6 +889,7 @@ GameObject:
- component: {fileID: 8105925540140519754}
- component: {fileID: 1377401926964550360}
- component: {fileID: 67125096702760250}
- component: {fileID: 8449502431356192113}
m_Layer: 5
m_Name: PreviewImg
m_TagString: Untagged
@ -955,6 +957,39 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &8449502431356192113
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4643603390456494410}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f19b7e2285c104f6ca47d583f3e5444f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 300
m_EffectMaterial: {fileID: 2100000, guid: 9dc7e810a87b444ab96919f3215c2fe5, type: 2}
m_EffectFactor: 0
m_Width: 0.25
m_Rotation: -41
m_Softness: 1
m_Brightness: 1
m_Gloss: 1
m_EffectArea: 0
m_Player:
play: 0
initialPlayDelay: 0
duration: 0.5
loop: 0
loopDelay: 1
updateMode: 0
m_Play: 0
m_Loop: 0
m_Duration: 1
m_LoopDelay: 1
m_UpdateMode: 0
--- !u!1 &5340761592919397836
GameObject:
m_ObjectHideFlags: 0

View File

@ -1,5 +1,4 @@
using AxibugEmuOnline.Client.ClientCore;
using System.Text;
using UnityEngine;
namespace AxibugEmuOnline.Client
@ -28,7 +27,7 @@ namespace AxibugEmuOnline.Client
private void Awake()
{
#if UNITY_EDITOR
App.Init(bTestSkipWebApiToConServer, mTestSrvIP, bUseLocalWebApi,mLocalWebApi);
App.Init(bTestSkipWebApiToConServer, mTestSrvIP, bUseLocalWebApi, mLocalWebApi);
dev_UUID = SystemInfo.deviceUniqueIdentifier;
if (bEditorUUID)
{

View File

@ -498,7 +498,7 @@ namespace AxibugEmuOnline.Client.Manager
/// <param name="LoadStateNeedTimeUs">加载即时存档所需平均时间(微秒)</param>
/// <param name="VideoFrameShowNeedTimeUs">视频一帧所需时间(微秒)</param>
/// <param name="AudioFramePlayNeedTimeUs">音频处理一帧所需时间(微秒)</param>
public void SendRoomPlayerReady(float PushFrameNeedTimeUs,float LoadStateNeedTimeUs,float VideoFrameShowNeedTimeUs,float AudioFramePlayNeedTimeUs)
public void SendRoomPlayerReady(float PushFrameNeedTimeUs, float LoadStateNeedTimeUs, float VideoFrameShowNeedTimeUs, float AudioFramePlayNeedTimeUs)
{
App.log.Debug("上报准备完毕");
_Protobuf_Room_Player_Ready.PushFrameNeedTimeUs = PushFrameNeedTimeUs;

View File

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

View File

@ -98,7 +98,7 @@ namespace AxibugEmuOnline.Client
void RecvUpLoadGameSav(byte[] reqData)
{
Protobuf_Mine_UpLoadGameSav_RESP msg = ProtoBufHelper.DeSerizlize<Protobuf_Mine_UpLoadGameSav_RESP>(reqData);
Eventer.Instance.PostEvent(EEvent.OnNetUploaded, msg.RomID,msg.SavDataIdx, msg.UploadSevInfo);
Eventer.Instance.PostEvent(EEvent.OnNetUploaded, msg.RomID, msg.SavDataIdx, msg.UploadSevInfo);
}
/// <summary>

View File

@ -36,7 +36,7 @@ namespace AxibugEmuOnline.Client
Debug.Log($"快照加载:{Helper.FileMD5Hash(App.roomMgr.RawData)}");
m_inGameUI.Core.LoadStateFromBytes(App.roomMgr.RawData);
//TODO ready时上报性能指标
App.roomMgr.SendRoomPlayerReady(0,0,0,0);
App.roomMgr.SendRoomPlayerReady(0, 0, 0, 0);
break;
case 2:
m_step = -1;

View File

@ -30,11 +30,11 @@ namespace AxibugEmuOnline.Client
{
m_currentCom = com_floatEdit;
}
else if(valueMenu.ValueType == typeof(int))
else if (valueMenu.ValueType == typeof(int))
{
m_currentCom = com_intEdit;
}
else if(valueMenu.ValueType == typeof(bool))
else if (valueMenu.ValueType == typeof(bool))
{
m_currentCom = com_boolEdit;
}

View File

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

View File

@ -3,7 +3,7 @@ using AxibugEmuOnline.Client.Event;
using AxibugEmuOnline.Client.Manager;
using AxibugEmuOnline.Client.UI;
using AxibugProtobuf;
using Sony.Vita.Dialog;
using Coffee.UIExtensions;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
@ -17,6 +17,8 @@ namespace AxibugEmuOnline.Client
[SerializeField] Slider m_downloadProgress;
[SerializeField] GameObject m_downloadingFlag;
[SerializeField] GameObject m_romReadyFlag;
[SerializeField]
UIShiny DownloadComplete;
private RomFile m_romFile;
@ -30,6 +32,25 @@ namespace AxibugEmuOnline.Client
Eventer.Instance.RegisterEvent<int>(EEvent.OnRoomListSingleUpdate, OnRoomSignelUpdate);
}
protected override void OnEnable()
{
Eventer.Instance.RegisterEvent<int>(EEvent.OnRomFileDownloaded, OnRomDownloaded);
}
protected override void OnDisable()
{
Eventer.Instance.UnregisterEvent<int>(EEvent.OnRomFileDownloaded, OnRomDownloaded);
}
private void OnRomDownloaded(int romID)
{
if (m_romFile == null) return;
m_romFile.CheckLocalFileState();
if (m_romFile.RomReady)
DownloadComplete.Play();
}
private void OnRoomSignelUpdate(int roomID)
{
if (this.RoomID != roomID) return;

View File

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