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

master #66

Merged
sin365 merged 2 commits from Alienjack/AxibugEmuOnline:master into master 2024-12-19 00:47:16 +08:00
Conversation 0 Commits 2 Files Changed 2 +37 -7
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 07bb092839 - Show all commits

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

@ -16100,6 +16100,30 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 283482645670010668, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 283482645670010668, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 283482645670010668, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 283482645670010668, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 283482645670010668, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 283482645670010668, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 321727879374672331, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -16178,7 +16202,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 736530578155193984, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: -89.58333
objectReference: {fileID: 0}
- target: {fileID: 935090267056593628, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
propertyPath: m_AnchorMax.y
@ -16770,7 +16794,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8801936766261209235, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: -79.58333
objectReference: {fileID: 0}
- target: {fileID: 9167054165049020263, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
propertyPath: m_LocalPosition.x

10
AxibugEmuOnline.Client/Assets/Script/AppMain/NesEmulator/NesEmulator_Screen.mat
View File

@ -2,20 +2,24 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NesEmulator_Screen
m_Shader: {fileID: 4800000, guid: b351396ff606116478d7f4412abe4e2e, type: 3}
m_ShaderKeywords:
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -59,6 +63,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
@ -87,3 +92,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

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

@ -93,7 +93,7 @@ namespace AxibugEmuOnline.Client
Eventer.Instance.RegisterEvent(EEvent.OnLoginSucceed, OnLoggedIn);
Eventer.Instance.RegisterEvent<int>(EEvent.OnRoomWaitStepChange, OnServerStepUpdate);
Eventer.Instance.RegisterEvent(EEvent.OnMineJoinRoom, OnRoomJoin);
Eventer.Instance.RegisterEvent(EEvent.OnMineRoomCreated, OnRoomCreated);
gameObject.SetActiveEx(true);
@ -108,7 +108,7 @@ namespace AxibugEmuOnline.Client
}
}
private void OnRoomJoin()
private void OnRoomCreated()
{
m_delayCreateRoom = false;
}
@ -152,7 +152,7 @@ namespace AxibugEmuOnline.Client
{
Eventer.Instance.UnregisterEvent<int>(EEvent.OnRoomWaitStepChange, OnServerStepUpdate);
Eventer.Instance.UnregisterEvent(EEvent.OnLoginSucceed, OnLoggedIn);
Eventer.Instance.UnregisterEvent(EEvent.OnMineJoinRoom, OnRoomJoin);
Eventer.Instance.UnregisterEvent(EEvent.OnMineRoomCreated, OnRoomCreated);
App.roomMgr.SendLeavnRoom();
App.emu.StopGame();
}