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

Reviewed-on: #38

AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/Game_NES_Template.prefab

@@ -233,6 +233,7 @@ GameObject:
   - component: {fileID: 6087025893861054323}
   - component: {fileID: 7036072602178187444}
   - component: {fileID: 6771349210554360888}
+  - component: {fileID: 3709368495556978651}
   m_Layer: 5
   m_Name: Icon
   m_TagString: Untagged
@@ -252,14 +253,15 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1323634865265500141}
+  - {fileID: 331028397738758164}
   m_Father: {fileID: 8754483333502849411}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 1}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &7036072602178187444
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -298,6 +300,26 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3709368495556978651
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1776357407830023228}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: 144
+  m_PreferredHeight: 104
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &1813396448589485488
 GameObject:
   m_ObjectHideFlags: 0
@@ -409,7 +431,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 102}
+  m_SizeDelta: {x: 144, y: 104}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &-3959751710151339114
 MonoBehaviour:
@@ -556,19 +578,19 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3811189825355447390}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2303118795734916657}
   - {fileID: 4467178468921796307}
-  m_Father: {fileID: 8754483333502849411}
+  m_Father: {fileID: 6087025893861054323}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 50, y: -165.08997}
+  m_AnchoredPosition: {x: 0.000015258789, y: 0}
-  m_SizeDelta: {x: 2338.0796, y: 1768.3333}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &3428297980621487917
 MonoBehaviour:
@@ -621,8 +643,8 @@ MonoBehaviour:
   step: 50
   splitStep: 200
   m_selectArrow: {fileID: 4467178468921796307}
-  ArrowOffset: 115
+  ArrowOffset: 60
-  WidthFix: 225
+  WidthFix: 280
   itemGroup: {fileID: 6055880809428073973}
   srollRect: {fileID: 3428297980621487917}
 --- !u!225 &3086674949377227884
@@ -647,7 +669,6 @@ GameObject:
   m_Component:
   - component: {fileID: 8789823129857705082}
   - component: {fileID: 3252398029444565139}
-  - component: {fileID: 4972426757569440742}
   - component: {fileID: 5331629140490413834}
   m_Layer: 5
   m_Name: InfoNode
@@ -672,8 +693,8 @@ RectTransform:
   m_Father: {fileID: 8754483333502849411}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
@@ -703,20 +724,6 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
---- !u!114 &4972426757569440742
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3993825260653792697}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 2
 --- !u!225 &5331629140490413834
 CanvasGroup:
   m_ObjectHideFlags: 0
@@ -895,6 +902,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8754483333502849411}
+  - component: {fileID: 3637207717728009549}
+  - component: {fileID: 557410003364511780}
   m_Layer: 5
   m_Name: Root
   m_TagString: Untagged
@@ -915,12 +924,51 @@ RectTransform:
   m_Children:
   - {fileID: 6087025893861054323}
   - {fileID: 8789823129857705082}
-  - {fileID: 331028397738758164}
   m_Father: {fileID: 1998281097548910301}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 130}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!114 &3637207717728009549
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8290338740711049006}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 3
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &557410003364511780
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8290338740711049006}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0

AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/MenuItemTemplate.prefab

@@ -301,7 +301,7 @@ MonoBehaviour:
   m_menuItemRoot: {fileID: 3226730524206505336}
   SubMenuItemTemplate: {fileID: 2502609279043838113, guid: 01f3c5497992f944eae9b9efa15a19c2, type: 3}
   alphaGroup: {fileID: 6355204462360987243}
-  m_selectItemPosition: {x: -50, y: -51}
+  m_selectItemPosition: {x: -72, y: -51}
   step: 120
   splitStep: 280
 --- !u!225 &6355204462360987243

AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplate.prefab

@@ -255,11 +255,11 @@ RectTransform:
   m_Father: {fileID: 8754483333502849411}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 144, y: 104}
-  m_Pivot: {x: 0.5, y: 1}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &7036072602178187444
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -334,7 +334,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 102}
+  m_SizeDelta: {x: 144, y: 104}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &2502609279043838113
 MonoBehaviour:
@@ -412,9 +412,9 @@ RectTransform:
   m_Father: {fileID: 8754483333502849411}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 144, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &3252398029444565139
@@ -557,6 +557,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8754483333502849411}
+  - component: {fileID: 7558693960475443325}
   m_Layer: 5
   m_Name: Root
   m_TagString: Untagged
@@ -585,3 +586,29 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7558693960475443325
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8290338740711049006}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 3
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0

AxibugEmuOnline.Client/Assets/Script/NesEmulator/CoreSupporter.cs

@@ -95,15 +95,7 @@ namespace AxibugEmuOnline.Client
         private ControllerState m_sampledState;
         public ControllerState GetControllerState()
         {
-            if (!InGameUI.Instance.IsOnline)
+            return m_sampledState;
-            {
-                return m_sampledState;
-            }
-            else
-            {
-                //todo : 从服务器获取帧输入数据
-                return default;
-            }
         }
 
         public void SampleInput()

AxibugEmuOnline.Client/Assets/Script/UI/MenuItem.cs

@@ -1,7 +1,6 @@
 using DG.Tweening;
 using DG.Tweening.Core;
 using DG.Tweening.Plugins.Options;
-using System;
 using UnityEngine;
 using UnityEngine.UI;