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

Reviewed-on: sin365/AxibugEmuOnline#73

AxibugEmuOnline.Client/Assets/Resources/IMPORTENT.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e6f56a07c0ec38946a0257a1e0b8926d
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/ScreenScaler_Template.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 98ac562d730eabc42b9a3b12c715d114
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/ScalerModeItemTemplate.prefab

@@ -1,857 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &29419265480821815
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8126322204359135913}
-  - component: {fileID: 2718916271043989317}
-  - component: {fileID: 3380485461544738227}
-  - component: {fileID: 5273325483422179993}
-  m_Layer: 5
-  m_Name: Descript
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8126322204359135913
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 29419265480821815}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8789823129857705082}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 33}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &2718916271043989317
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 29419265480821815}
-  m_CullTransparentMesh: 1
---- !u!114 &3380485461544738227
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 29419265480821815}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3}
-    m_FontSize: 20
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 300
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 1
-    m_LineSpacing: 1
-  m_Text: DESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTIONDESCRIBTION
---- !u!114 &5273325483422179993
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 29419265480821815}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.3137255}
-  m_EffectDistance: {x: 3, y: -3}
-  m_UseGraphicAlpha: 1
---- !u!1 &734025543935719296
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1323634865265500141}
-  - component: {fileID: 5792146190930927166}
-  - component: {fileID: 2619187604372594158}
-  - component: {fileID: 1779247868001543556}
-  - component: {fileID: 4496630961732192070}
-  - component: {fileID: 2059277597780235898}
-  m_Layer: 5
-  m_Name: shadowIcon
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1323634865265500141
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 734025543935719296}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 2}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8754483333502849411}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!222 &5792146190930927166
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 734025543935719296}
-  m_CullTransparentMesh: 1
---- !u!114 &2619187604372594158
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 734025543935719296}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.4577373, b: 0, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 8706af46c93329b4da3c86c0b13b886e, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 0
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &1779247868001543556
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 734025543935719296}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f8b2ed11d675446c5a49da1ea296d490, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Version: 300
-  m_EffectMaterial: {fileID: 21305736874167728, guid: aee96bc531e6eba468ec405e536f515f, type: 2}
-  m_EffectFactor: 0
-  m_ColorFactor: 0
-  m_BlurFactor: 0
-  m_EffectMode: 0
-  m_ColorMode: 1
-  m_BlurMode: 3
-  m_AdvancedBlur: 1
-  m_ShadowBlur: 1
-  m_ShadowStyle: 0
-  m_ShadowColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
-  m_EffectColor: {r: 1, g: 1, b: 1, a: 1}
-  m_AdditionalShadows: []
---- !u!114 &4496630961732192070
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 734025543935719296}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0848bff101191904ead4bb831f7084db, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_BlurFactor: 1
-  m_Style: 3
-  m_AdditionalShadows: []
-  m_EffectColor: {r: 1, g: 1, b: 1, a: 0}
-  m_EffectDistance: {x: 8, y: 8}
-  m_UseGraphicAlpha: 0
---- !u!95 &2059277597780235898
-Animator:
-  serializedVersion: 7
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 734025543935719296}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 0b3ccf7414d2ead43be0cd33b6e1b53c, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
---- !u!1 &1776357407830023228
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6087025893861054323}
-  - component: {fileID: 7036072602178187444}
-  - component: {fileID: 6771349210554360888}
-  m_Layer: 5
-  m_Name: Icon
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6087025893861054323
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1776357407830023228}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 2}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8754483333502849411}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -200, y: 0}
-  m_SizeDelta: {x: -396, y: 4}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7036072602178187444
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1776357407830023228}
-  m_CullTransparentMesh: 1
---- !u!114 &6771349210554360888
-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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 8706af46c93329b4da3c86c0b13b886e, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 0
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!1 &3189920797946144379
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1998281097548910301}
-  - component: {fileID: 5700455559359757662}
-  - component: {fileID: 5193921249193468402}
-  m_Layer: 5
-  m_Name: ScalerModeItemTemplate
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1998281097548910301
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3189920797946144379}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8754483333502849411}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  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: 500, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &5700455559359757662
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3189920797946144379}
-  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: 200
-  m_PreferredHeight: 230
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
---- !u!114 &5193921249193468402
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3189920797946144379}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 54c899f8fe0572f43ae3305039ea5e5c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  Icon: {fileID: 6771349210554360888}
-  Txt: {fileID: 991446423622995247}
-  SubTitle: {fileID: 6534898873012636952}
-  spline: {fileID: 4812759387377418448}
-  Descript: {fileID: 3380485461544738227}
-  Root: {fileID: 8754483333502849411}
-  ShadowIcon: {fileID: 2619187604372594158}
-  InfoNode: {fileID: 6788248266412682264}
-  SubMenuItemGroup: {fileID: 0}
-  SelectScale: 1
-  UnSelectScale: 0.85
---- !u!1 &3993825260653792697
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8789823129857705082}
-  - component: {fileID: 3252398029444565139}
-  - component: {fileID: 6788248266412682264}
-  - component: {fileID: 8081109478688381999}
-  - component: {fileID: 6660646139021869069}
-  m_Layer: 5
-  m_Name: InfoNode
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8789823129857705082
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3993825260653792697}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6095356919362338847}
-  - {fileID: 6797116381500671839}
-  - {fileID: 6673031368290035463}
-  - {fileID: 8126322204359135913}
-  m_Father: {fileID: 8754483333502849411}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 100, y: 0}
-  m_SizeDelta: {x: 600, y: 0}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!114 &3252398029444565139
-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: 59f8146938fff824cb5fd77236b75775, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 20
-    m_Right: 0
-    m_Top: 13
-    m_Bottom: 0
-  m_ChildAlignment: 0
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 1
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
---- !u!225 &6788248266412682264
-CanvasGroup:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3993825260653792697}
-  m_Enabled: 1
-  m_Alpha: 1
-  m_Interactable: 1
-  m_BlocksRaycasts: 1
-  m_IgnoreParentGroups: 0
---- !u!222 &8081109478688381999
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3993825260653792697}
-  m_CullTransparentMesh: 1
---- !u!114 &6660646139021869069
-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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!1 &5340761592919397836
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6095356919362338847}
-  - component: {fileID: 7651669947470814669}
-  - component: {fileID: 991446423622995247}
-  - component: {fileID: 3090209070838977737}
-  m_Layer: 5
-  m_Name: Name
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6095356919362338847
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5340761592919397836}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8986746042327041630}
-  m_Father: {fileID: 8789823129857705082}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 33}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &7651669947470814669
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5340761592919397836}
-  m_CullTransparentMesh: 1
---- !u!114 &991446423622995247
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5340761592919397836}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3}
-    m_FontSize: 30
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 300
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 1
-    m_VerticalOverflow: 1
-    m_LineSpacing: 1
-  m_Text: NAME
---- !u!114 &3090209070838977737
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5340761592919397836}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.3137255}
-  m_EffectDistance: {x: 3, y: -3}
-  m_UseGraphicAlpha: 1
---- !u!1 &5468696000904882177
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8986746042327041630}
-  - component: {fileID: 952406696262539679}
-  - component: {fileID: 6534898873012636952}
-  - component: {fileID: 1394085300960264805}
-  m_Layer: 5
-  m_Name: subTitle
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8986746042327041630
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5468696000904882177}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6095356919362338847}
-  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: 0, y: 0}
-  m_SizeDelta: {x: 580, y: 33}
-  m_Pivot: {x: 1, y: 0.5}
---- !u!222 &952406696262539679
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5468696000904882177}
-  m_CullTransparentMesh: 1
---- !u!114 &6534898873012636952
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5468696000904882177}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3}
-    m_FontSize: 25
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 300
-    m_Alignment: 5
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 1
-    m_VerticalOverflow: 1
-    m_LineSpacing: 1
-  m_Text: 4324234
---- !u!114 &1394085300960264805
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5468696000904882177}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.3137255}
-  m_EffectDistance: {x: 3, y: -3}
-  m_UseGraphicAlpha: 1
---- !u!1 &6688216270065609628
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6797116381500671839}
-  - component: {fileID: 5682159953164052307}
-  - component: {fileID: 4812759387377418448}
-  m_Layer: 5
-  m_Name: spline
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6797116381500671839
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6688216270065609628}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8789823129857705082}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 4}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5682159953164052307
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6688216270065609628}
-  m_CullTransparentMesh: 1
---- !u!114 &4812759387377418448
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6688216270065609628}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!1 &8290338740711049006
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8754483333502849411}
-  m_Layer: 5
-  m_Name: Root
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8754483333502849411
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8290338740711049006}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1323634865265500141}
-  - {fileID: 6087025893861054323}
-  - {fileID: 8789823129857705082}
-  m_Father: {fileID: 1998281097548910301}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &9036340599819825964
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6673031368290035463}
-  m_Layer: 5
-  m_Name: space
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6673031368290035463
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9036340599819825964}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8789823129857705082}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 10}
-  m_Pivot: {x: 0.5, y: 0.5}

AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/ScalerModeItemTemplate.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0145ebc4525da574c906e2a40ad8ab61
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

AxibugEmuOnline.Client/Assets/Script/AppMain/App.cs

@@ -1,4 +1,4 @@
-using AxibugEmuOnline.Client.Manager;
+using AxibugEmuOnline.Client.Manager;
 using AxibugEmuOnline.Client.Network;
 using System.Collections;
 using System.IO;
@@ -27,6 +27,7 @@ namespace AxibugEmuOnline.Client.ClientCore
         public static CacheManager CacheMgr;
         public static AppRoom roomMgr;
         public static AppSettings settings;
+        public static FilterManager filter;
         public static AppShare share;
         static bool bTest;
         static string mTestSrvIP;
@@ -53,7 +54,7 @@ namespace AxibugEmuOnline.Client.ClientCore
                 PSP2Init();
             }
 
-            settings = new AppSettings(initer);
+            settings = new AppSettings();
 
             log = new LogManager();
             LogManager.OnLog += OnNoSugarNetLog;
@@ -68,6 +69,7 @@ namespace AxibugEmuOnline.Client.ClientCore
             CacheMgr = new CacheManager();
             roomMgr = new AppRoom();
             share = new AppShare();
+            filter = new FilterManager(initer.m_filterPreview, initer.m_xmbBg);
             bTest = isTest;
             mTestSrvIP = testSrvIP;
             var go = new GameObject("[AppAxibugEmuOnline]");

AxibugEmuOnline.Client/Assets/Script/AppMain/Filter/FilterManager.cs

@@ -6,6 +6,7 @@ using System.Reflection;
 using UnityEngine;
 using UnityEngine.UI;
 using static AxibugEmuOnline.Client.FilterEffect;
+using static AxibugEmuOnline.Client.FilterManager;
 
 namespace AxibugEmuOnline.Client
 {

AxibugEmuOnline.Client/Assets/Script/AppMain/Filter/UIFilterPreviewer.cs

@@ -16,6 +16,6 @@ public class UIFilterPreviewer : MonoBehaviour
 
     private void Update()
     {
-        App.settings.Filter.ExecuteFilterRender(m_src, m_rawImg);
+        App.filter.ExecuteFilterRender(m_src, m_rawImg);
     }
 }

AxibugEmuOnline.Client/Assets/Script/AppMain/GlobalRef.cs

@@ -1,7 +0,0 @@
-using UnityEngine;
-
-public class GlobalRef : MonoBehaviour
-{
-    public CanvasGroup FilterPreview;
-    public CanvasGroup XMBBg;
-}

AxibugEmuOnline.Client/Assets/Script/AppMain/GlobalRef.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 0e727704ce154534caf90c91ed3085ef

AxibugEmuOnline.Client/Assets/Script/AppMain/IEmuCore.cs

@@ -19,7 +19,6 @@ namespace AxibugEmuOnline.Client
 
         EnumPlatform Platform { get; }
         uint Frame { get; }
-        Vector2Int GetRawResolution();
     }
 
     public static class IEnumCoreTool

AxibugEmuOnline.Client/Assets/Script/AppMain/Initer.cs

@@ -1,20 +1,14 @@
-using AxibugEmuOnline.Client.ClientCore;
+using AxibugEmuOnline.Client.ClientCore;
 using UnityEngine;
 
 namespace AxibugEmuOnline.Client
 {
     public class Initer : MonoBehaviour
     {
-        public CanvasGroup FilterPreview => m_refs.FilterPreview;
+        public CanvasGroup m_filterPreview;
-        public CanvasGroup XMBBg => m_refs.XMBBg;
+        public CanvasGroup m_xmbBg;
-
         public static string dev_UUID;
 
-        [SerializeField]
-        GameObject IMPORTENT;
-
-        GlobalRef m_refs;
-
 #if UNITY_EDITOR
         public bool bTest = false;
         public string mTestSrvIP = "192.168.0.47";
@@ -22,15 +16,12 @@ namespace AxibugEmuOnline.Client
 
         private void Awake()
         {
-            m_refs = Instantiate(IMPORTENT, transform).GetComponent<GlobalRef>();
-            
 #if UNITY_EDITOR
             App.Init(this, bTest, mTestSrvIP);
 #else
             App.Init(this);
 #endif
             dev_UUID = SystemInfo.deviceUniqueIdentifier;
-
         }
     }
 }

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppEmu.cs

@@ -1,6 +1,7 @@
 using AxibugEmuOnline.Client.ClientCore;
 using AxibugEmuOnline.Client.Event;
 using UnityEngine;
+using VirtualNes.Core;
 
 namespace AxibugEmuOnline.Client.Manager
 {

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/AppSettings.cs

@@ -1,18 +1,8 @@
-using static AxibugEmuOnline.Client.FilterManager;
+namespace AxibugEmuOnline.Client
-
-namespace AxibugEmuOnline.Client
 {
     public class AppSettings
     {
         /// <summary> 背景颜色设定 </summary>
-        public BgColorSettings BgColor { get; private set; }
+        public BgColorSettings BgColor { get; set; } = new BgColorSettings();
-        /// <summary> 滤镜设置 </summary>
-        public FilterManager Filter { get; private set; }
-
-        public AppSettings(Initer initer)
-        {
-            BgColor = new BgColorSettings();
-            Filter = new FilterManager(initer.FilterPreview, initer.XMBBg);
-        }
     }
 }

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

@@ -217,10 +217,5 @@ namespace AxibugEmuOnline.Client
         {
             return ControllerMapper;
         }
-
-        public Vector2Int GetRawResolution()
-        {
-            return new Vector2Int(256, 240);
-        }
     }
 }

AxibugEmuOnline.Client/Assets/Script/AppMain/NesEmulator/VideoProvider.cs

@@ -79,7 +79,7 @@ namespace AxibugEmuOnline.Client
 
         public void ApplyFilterEffect()
         {
-            App.settings.Filter.ExecuteFilterRender(rt_gpu, Image);
+            App.filter.ExecuteFilterRender(rt_gpu, Image);
         }
 
         private unsafe void PrepareUI(uint* screenData)

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/GlobalFilterListMenuItem.cs

@@ -9,15 +9,15 @@ namespace AxibugEmuOnline.Client
     {
         public override bool OnEnterItem()
         {
-            App.settings.Filter.EnableFilterPreview();
+            App.filter.EnableFilterPreview();
 
             return base.OnEnterItem();
         }
 
         public override bool OnExitItem()
         {
-            App.settings.Filter.ShutDownFilterPreview();
+            App.filter.ShutDownFilterPreview();
-            App.settings.Filter.ShutDownFilter();
+            App.filter.ShutDownFilter();
 
             return base.OnExitItem();
         }
@@ -26,7 +26,7 @@ namespace AxibugEmuOnline.Client
         {
             List<object> list = new List<object>();
             list.Add(null);
-            list.AddRange(App.settings.Filter.Filters.Select(f => (object)f));
+            list.AddRange(App.filter.Filters.Select(f => (object)f));
             datas.Invoke(list);
         }
     }

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/ScreenScalerListMenuItem.cs

@@ -1,41 +0,0 @@
-using AxibugEmuOnline.Client.ClientCore;
-using System;
-using System.Collections.Generic;
-
-namespace AxibugEmuOnline.Client
-{
-    public class ScreenScalerListMenuItem : VirtualSubMenuItem
-    {
-        /// <summary> 缩放模式 </summary>
-        public enum EnumScalerMode
-        {
-            /// <summary> 全屏 </summary>
-            FullScreen,
-            /// <summary> 适应 </summary>
-            Fix,
-            /// <summary> 原始 </summary>
-            Raw
-        };
-
-        public override bool OnEnterItem()
-        {
-            App.settings.Filter.EnableFilterPreview();
-
-            return base.OnEnterItem();
-        }
-
-        public override bool OnExitItem()
-        {
-            App.settings.Filter.ShutDownFilterPreview();
-
-            return base.OnExitItem();
-        }
-
-        protected override void GetVirtualListDatas(Action<object> datas)
-        {
-            List<object> list = new List<object>();
-            foreach (var enumValue in Enum.GetValues(typeof(EnumScalerMode))) list.Add(enumValue);
-            datas.Invoke(list);
-        }
-    }
-}

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/ScreenScalerListMenuItem.cs.meta

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

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/UI_FilterItem.cs

@@ -9,7 +9,7 @@ using static AxibugEmuOnline.Client.FilterManager;
 namespace AxibugEmuOnline.Client
 {
 	/// <summary>
-	/// 滤镜预览UI
+	/// 背景颜色设置UI
 	/// </summary>
 	public class UI_FilterItem : MenuItem, IVirtualItem
 	{
@@ -37,11 +37,11 @@ namespace AxibugEmuOnline.Client
 
 			if (m_select)
 			{
-				App.settings.Filter.EnableFilterPreview();
+				App.filter.EnableFilterPreview();
-				if (App.settings.Filter != null)
+				if (App.filter != null)
-					App.settings.Filter.EnableFilter(Datacontext);
+					App.filter.EnableFilter(Datacontext);
 				else
-					App.settings.Filter.ShutDownFilter();
+					App.filter.ShutDownFilter();
 			}
 		}
 
@@ -57,9 +57,9 @@ namespace AxibugEmuOnline.Client
 
 				OverlayManager.PopSideBar(opts, onClose: () =>
 				{
-					App.settings.Filter.EnableFilterPreview();
+					App.filter.EnableFilterPreview();
 					Datacontext.ResetPreset();
-					App.settings.Filter.EnableFilter(Datacontext);
+					App.filter.EnableFilter(Datacontext);
 				});
 			}
 			return false;
@@ -78,7 +78,7 @@ namespace AxibugEmuOnline.Client
 			public override void OnFocus()
 			{
 				m_filter.ResetPreset();
-				App.settings.Filter.EnableFilter(m_filter);
+				App.filter.EnableFilter(m_filter);
 			}
 
 			public override void OnExcute(OptionUI optionUI, ref bool cancelHide)
@@ -135,7 +135,7 @@ namespace AxibugEmuOnline.Client
 			public override void OnFocus()
 			{
 				m_filter.ApplyPreset(m_preset);
-				App.settings.Filter.EnableFilter(m_filter);
+				App.filter.EnableFilter(m_filter);
 			}
 
 			protected override List<OptionMenu> GetOptionMenus()

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/UI_ScalerModeItem.cs

@@ -1,49 +0,0 @@
-using AxibugEmuOnline.Client.UI;
-
-namespace AxibugEmuOnline.Client
-{
-    /// <summary>
-    /// 画面比例模式选项UI
-    /// </summary>
-    public class UI_ScalerModeItem : MenuItem, IVirtualItem
-    {
-        public int Index { get; set; }
-        public ScreenScalerListMenuItem.EnumScalerMode Datacontext { get; private set; }
-
-        public void SetData(object data)
-        {
-            Datacontext = (ScreenScalerListMenuItem.EnumScalerMode)data;
-
-            UpdateView();
-        }
-
-        private void UpdateView()
-        {
-            
-            switch (Datacontext)
-            {
-                case ScreenScalerListMenuItem.EnumScalerMode.FullScreen:
-                    SetBaseInfo("全屏", "模拟器输出画面将拉伸到全屏", null);
-                    break;
-                case ScreenScalerListMenuItem.EnumScalerMode.Raw:
-                    SetBaseInfo("原始尺寸", "将保持模拟器输出画面的原始分辨率", null);
-                    break;
-                case ScreenScalerListMenuItem.EnumScalerMode.Fix:
-                    SetBaseInfo("适应", "在保持原始画面比例的情况下适配到全屏", null);
-                    break;
-            }
-        }
-
-        public void SetDependencyProperty(object data)
-        {
-            SetSelectState(data is ThirdMenuRoot && ((ThirdMenuRoot)data).SelectIndex == Index);
-        }
-
-        public void Release() { }
-
-        public override bool OnEnterItem()
-        {
-            return false;
-        }
-    }
-}

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/UI_ScalerModeItem.cs.meta

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

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/InGameUI/InGameUI.cs

@@ -1,7 +1,8 @@
-using AxibugEmuOnline.Client.ClientCore;
+using System.Collections.Generic;
+using AxibugEmuOnline.Client.ClientCore;
 using AxibugEmuOnline.Client.Event;
 using AxibugProtobuf;
-using System.Collections.Generic;
+using VirtualNes.Core;
 
 namespace AxibugEmuOnline.Client
 {
@@ -98,14 +99,14 @@ namespace AxibugEmuOnline.Client
 
             gameObject.SetActiveEx(true);
 
-            var filterSetting = App.settings.Filter.GetFilterSetting(currentRom);
+            var filterSetting = App.filter.GetFilterSetting(currentRom);
             if (filterSetting.filter != null)
             {
                 var filter = filterSetting.filter;
                 var preset = filterSetting.preset ?? filter.DefaultPreset;
 
                 filter.ApplyPreset(preset);
-                App.settings.Filter.EnableFilter(filter);
+                App.filter.EnableFilter(filter);
             }
         }
 
@@ -141,7 +142,7 @@ namespace AxibugEmuOnline.Client
             CommandDispatcher.Instance.UnRegistController(this);
             gameObject.SetActiveEx(false);
 
-            App.settings.Filter.ShutDownFilter();
+            App.filter.ShutDownFilter();
         }
 
         protected override void OnCmdOptionMenu()

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/InGameUI/InGameUI_FilterSetting.cs

@@ -18,7 +18,7 @@ namespace AxibugEmuOnline.Client
         {
             List<OptionMenu> menus = new List<OptionMenu>();
             menus.Add(new FilterNone(m_gameUI.RomFile));
-            menus.AddRange(App.settings.Filter.Filters.Select(f => new FilterMenu(m_gameUI.RomFile, f) as OptionMenu));
+            menus.AddRange(App.filter.Filters.Select(f => new FilterMenu(m_gameUI.RomFile, f) as OptionMenu));
             return menus;
         }
 
@@ -33,9 +33,9 @@ namespace AxibugEmuOnline.Client
 
             public override void OnExcute(OptionUI optionUI, ref bool cancelHide)
             {
-                App.settings.Filter.ShutDownFilter();
+                App.filter.ShutDownFilter();
 
-                App.settings.Filter.SetupFilter(m_rom, null, null);
+                App.filter.SetupFilter(m_rom, null, null);
             }
         }
 
@@ -73,9 +73,9 @@ namespace AxibugEmuOnline.Client
             public override void OnExcute(OptionUI optionUI, ref bool cancelHide)
             {
                 m_filter.ApplyPreset(m_preset);
-                App.settings.Filter.EnableFilter(m_filter);
+                App.filter.EnableFilter(m_filter);
 
-                App.settings.Filter.SetupFilter(m_rom, m_filter, m_preset);
+                App.filter.SetupFilter(m_rom, m_filter, m_preset);
             }
         }
     }

AxibugEmuOnline.Client/Assets/VirtualNes.Core/Supporter/ControllerState.cs

@@ -51,15 +51,25 @@ namespace VirtualNes.Core
 
         public override int GetHashCode()
         {
-            int hash = 17;
+            //return CombineHashCode(raw0, raw1, raw2, raw3, valid);
-            hash = hash * 31 + raw0.GetHashCode();
+            return HashCode.Combine(raw0, raw1, raw2, raw3, valid);
-            hash = hash * 31 + raw1.GetHashCode();
-            hash = hash * 31 + raw2.GetHashCode();
-            hash = hash * 31 + raw3.GetHashCode();
-            hash = hash * 31 + valid.GetHashCode();
-            return hash;
         }
 
+        /// <summary>
+        /// .NetStandard2.0编译备用函数
+        /// </summary>
+        /// <param name="raw0"></param>
+        /// <param name="raw1"></param>
+        /// <param name="raw2"></param>
+        /// <param name="raw3"></param>
+        /// <param name="valid"></param>
+        /// <returns></returns>
+        static int CombineHashCode(uint raw0, uint raw1, uint raw2, uint raw3, bool valid)
+        {
+            uint validUInt = valid ? 1u : 0u;
+            uint combinedHash = (raw0 * 31 + raw1) * 31 + raw2 * 31 + raw3 * 31 + validUInt;
+            return (int)combinedHash;
+        }
         public static bool operator ==(ControllerState left, ControllerState right)
         {
             return