forked from sin365/AxibugEmuOnline
Merge pull request 'master' (#97) from Alienjack/AxibugEmuOnline:master into master
Reviewed-on: sin365/AxibugEmuOnline#97
This commit is contained in:
commit
306199dba8
@ -1215,6 +1215,14 @@ PrefabInstance:
|
|||||||
propertyPath: m_AnchoredPosition.y
|
propertyPath: m_AnchoredPosition.y
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6671307062690349520, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6671307062690349520, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6838719776118089301, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
|
- target: {fileID: 6838719776118089301, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 1
|
value: 1
|
||||||
|
|||||||
@ -648,6 +648,81 @@ MonoBehaviour:
|
|||||||
m_FlexibleWidth: 1
|
m_FlexibleWidth: 1
|
||||||
m_FlexibleHeight: -1
|
m_FlexibleHeight: -1
|
||||||
m_LayoutPriority: 1
|
m_LayoutPriority: 1
|
||||||
|
--- !u!1 &1601163034082482360
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2303902335643923373}
|
||||||
|
- component: {fileID: 7825136160635457043}
|
||||||
|
- component: {fileID: 2505159117998551519}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Conflict
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &2303902335643923373
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1601163034082482360}
|
||||||
|
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: 905458728127029103}
|
||||||
|
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: 50, y: 50}
|
||||||
|
m_Pivot: {x: 0, y: 0}
|
||||||
|
--- !u!222 &7825136160635457043
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1601163034082482360}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &2505159117998551519
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1601163034082482360}
|
||||||
|
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: 0
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 994c93ed03dadee49974aebf3cb5365d, type: 3}
|
||||||
|
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 &1731066637017514641
|
--- !u!1 &1731066637017514641
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -869,6 +944,45 @@ MonoBehaviour:
|
|||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
m_PixelsPerUnitMultiplier: 1
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!1 &2040328582144336713
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 905458728127029103}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: StateNode
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &905458728127029103
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2040328582144336713}
|
||||||
|
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: 3539783812791358836}
|
||||||
|
- {fileID: 6030618878828304669}
|
||||||
|
- {fileID: 2303902335643923373}
|
||||||
|
- {fileID: 8677023902282266940}
|
||||||
|
m_Father: {fileID: 5970282275929291192}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 5, y: 5}
|
||||||
|
m_SizeDelta: {x: -10, y: -10}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1 &2471254561136382013
|
--- !u!1 &2471254561136382013
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1023,6 +1137,81 @@ MonoBehaviour:
|
|||||||
m_Icon: {fileID: 394891843266770919}
|
m_Icon: {fileID: 394891843266770919}
|
||||||
ExpandFlag: {fileID: 1501213187178026014}
|
ExpandFlag: {fileID: 1501213187178026014}
|
||||||
ApplyFlag: {fileID: 3335801350916860509}
|
ApplyFlag: {fileID: 3335801350916860509}
|
||||||
|
--- !u!1 &2637678715180681658
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 8677023902282266940}
|
||||||
|
- component: {fileID: 6387250980529666459}
|
||||||
|
- component: {fileID: 6242848023853370498}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Synced
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &8677023902282266940
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2637678715180681658}
|
||||||
|
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: 905458728127029103}
|
||||||
|
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: 50, y: 50}
|
||||||
|
m_Pivot: {x: 0, y: 0}
|
||||||
|
--- !u!222 &6387250980529666459
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2637678715180681658}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &6242848023853370498
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2637678715180681658}
|
||||||
|
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: 0
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 28db37d78cad20f4397804dfa4572829, type: 3}
|
||||||
|
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 &2660711182228429640
|
--- !u!1 &2660711182228429640
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1188,10 +1377,10 @@ RectTransform:
|
|||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1100500336380202360}
|
m_Father: {fileID: 1100500336380202360}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 170, y: -333}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 300, y: 26}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7910447946506517051
|
--- !u!222 &7910447946506517051
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -1253,6 +1442,97 @@ MonoBehaviour:
|
|||||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||||
m_EffectDistance: {x: 1.5, y: -1.5}
|
m_EffectDistance: {x: 1.5, y: -1.5}
|
||||||
m_UseGraphicAlpha: 1
|
m_UseGraphicAlpha: 1
|
||||||
|
--- !u!1 &4078965612622303339
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6030618878828304669}
|
||||||
|
- component: {fileID: 6018890508858230420}
|
||||||
|
- component: {fileID: 1865219663044263670}
|
||||||
|
- component: {fileID: 6562970432720184454}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Syncing
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &6030618878828304669
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4078965612622303339}
|
||||||
|
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: 905458728127029103}
|
||||||
|
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: 50, y: 50}
|
||||||
|
m_Pivot: {x: 0, y: 0}
|
||||||
|
--- !u!222 &6018890508858230420
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4078965612622303339}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &1865219663044263670
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4078965612622303339}
|
||||||
|
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: 0
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 21300000, guid: c5a9535bb63e1f14f9a1528566864ab2, type: 3}
|
||||||
|
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!114 &6562970432720184454
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4078965612622303339}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 8707b921aaba60d45b4041e96f3542dd, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_duration: 2
|
||||||
|
m_ease: 1
|
||||||
|
m_reverseRotation: 1
|
||||||
--- !u!1 &4124172888520656882
|
--- !u!1 &4124172888520656882
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1384,12 +1664,13 @@ RectTransform:
|
|||||||
- {fileID: 7389645496847632176}
|
- {fileID: 7389645496847632176}
|
||||||
- {fileID: 173892651193427531}
|
- {fileID: 173892651193427531}
|
||||||
- {fileID: 8150810211498757695}
|
- {fileID: 8150810211498757695}
|
||||||
|
- {fileID: 905458728127029103}
|
||||||
m_Father: {fileID: 1100500336380202360}
|
m_Father: {fileID: 1100500336380202360}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 170, y: -160}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 300, y: 300}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &2558056583130529771
|
--- !u!114 &2558056583130529771
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -1522,8 +1803,8 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_IgnoreLayout: 1
|
m_IgnoreLayout: 1
|
||||||
m_MinWidth: 300
|
m_MinWidth: -1
|
||||||
m_MinHeight: -1
|
m_MinHeight: 1080
|
||||||
m_PreferredWidth: -1
|
m_PreferredWidth: -1
|
||||||
m_PreferredHeight: -1
|
m_PreferredHeight: -1
|
||||||
m_FlexibleWidth: -1
|
m_FlexibleWidth: -1
|
||||||
@ -2743,6 +3024,81 @@ MonoBehaviour:
|
|||||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||||
m_EffectDistance: {x: 1.5, y: -1.5}
|
m_EffectDistance: {x: 1.5, y: -1.5}
|
||||||
m_UseGraphicAlpha: 1
|
m_UseGraphicAlpha: 1
|
||||||
|
--- !u!1 &6998836277133601669
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3539783812791358836}
|
||||||
|
- component: {fileID: 6969397185295608833}
|
||||||
|
- component: {fileID: 5170828039250978253}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Disconnect
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &3539783812791358836
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6998836277133601669}
|
||||||
|
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: 905458728127029103}
|
||||||
|
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: 50, y: 50}
|
||||||
|
m_Pivot: {x: 0, y: 0}
|
||||||
|
--- !u!222 &6969397185295608833
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6998836277133601669}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &5170828039250978253
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6998836277133601669}
|
||||||
|
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: 0
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 630c435b903e3dc4e80038c0a531162d, type: 3}
|
||||||
|
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 &7099541800602849681
|
--- !u!1 &7099541800602849681
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -2760,7 +3116,7 @@ GameObject:
|
|||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &1100500336380202360
|
--- !u!224 &1100500336380202360
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -2778,10 +3134,10 @@ RectTransform:
|
|||||||
- {fileID: 6878964193873653430}
|
- {fileID: 6878964193873653430}
|
||||||
m_Father: {fileID: 4478785627166277610}
|
m_Father: {fileID: 4478785627166277610}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 165, y: -443}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 330, y: 356}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &20405450890320071
|
--- !u!114 &20405450890320071
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -2803,7 +3159,7 @@ MonoBehaviour:
|
|||||||
m_ChildAlignment: 0
|
m_ChildAlignment: 0
|
||||||
m_Spacing: 10
|
m_Spacing: 10
|
||||||
m_ChildForceExpandWidth: 1
|
m_ChildForceExpandWidth: 1
|
||||||
m_ChildForceExpandHeight: 1
|
m_ChildForceExpandHeight: 0
|
||||||
m_ChildControlWidth: 1
|
m_ChildControlWidth: 1
|
||||||
m_ChildControlHeight: 1
|
m_ChildControlHeight: 1
|
||||||
m_ChildScaleWidth: 0
|
m_ChildScaleWidth: 0
|
||||||
@ -2826,6 +3182,10 @@ MonoBehaviour:
|
|||||||
UI_ScreenShot: {fileID: 1024458178917207864}
|
UI_ScreenShot: {fileID: 1024458178917207864}
|
||||||
UI_Empty: {fileID: 8350228378118296958}
|
UI_Empty: {fileID: 8350228378118296958}
|
||||||
UI_SavTime: {fileID: 13043593624240728}
|
UI_SavTime: {fileID: 13043593624240728}
|
||||||
|
UI_Disconnect: {fileID: 6998836277133601669}
|
||||||
|
UI_Syncing: {fileID: 4078965612622303339}
|
||||||
|
UI_Conflict: {fileID: 1601163034082482360}
|
||||||
|
UI_Synced: {fileID: 2637678715180681658}
|
||||||
--- !u!1 &7141318786199574664
|
--- !u!1 &7141318786199574664
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
using AxibugEmuOnline.Client;
|
using AxibugEmuOnline.Client;
|
||||||
using AxibugEmuOnline.Client.ClientCore;
|
using AxibugEmuOnline.Client.ClientCore;
|
||||||
using AxibugProtobuf;
|
using AxibugProtobuf;
|
||||||
|
using AxiReplay;
|
||||||
using Essgee;
|
using Essgee;
|
||||||
using Essgee.Emulation;
|
using Essgee.Emulation;
|
||||||
using Essgee.Emulation.Configuration;
|
using Essgee.Emulation.Configuration;
|
||||||
@ -11,25 +12,24 @@ using Essgee.Metadata;
|
|||||||
using Essgee.Utilities;
|
using Essgee.Utilities;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Drawing;
|
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
public class UEssgee : MonoBehaviour, IEmuCore
|
public class UEssgee : EmuCore<ulong>
|
||||||
{
|
{
|
||||||
public static UEssgee instance;
|
public static UEssgee instance;
|
||||||
public static System.Diagnostics.Stopwatch sw = System.Diagnostics.Stopwatch.StartNew();
|
public static System.Diagnostics.Stopwatch sw = System.Diagnostics.Stopwatch.StartNew();
|
||||||
public static bool bInGame => instance?.emulatorHandler?.IsRunning == true ? true : false;
|
public static bool bInGame => instance?.emulatorHandler?.IsRunning == true ? true : false;
|
||||||
|
|
||||||
public RomPlatformType Platform => mPlatform;
|
public override RomPlatformType Platform => mPlatform;
|
||||||
|
|
||||||
public uint Frame => (uint)emulatorHandler.AxiEmuRunFrame;
|
public override uint Frame => (uint)emulatorHandler.AxiEmuRunFrame;
|
||||||
|
|
||||||
public Texture OutputPixel => graphicsHandler.rawBufferWarper;
|
public override Texture OutputPixel => graphicsHandler.rawBufferWarper;
|
||||||
|
|
||||||
public RawImage DrawCanvas => graphicsHandler.DrawCanvas;
|
public override RawImage DrawCanvas => graphicsHandler.DrawCanvas;
|
||||||
|
|
||||||
public static bool bLogicUpdatePause { get; private set; }
|
public static bool bLogicUpdatePause { get; private set; }
|
||||||
#region
|
#region
|
||||||
@ -71,38 +71,38 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#region EmuCore接入实现
|
#region EmuCore接入实现
|
||||||
|
|
||||||
public object GetState()
|
public override object GetState()
|
||||||
{
|
{
|
||||||
return emulatorHandler.GetStateData();
|
return emulatorHandler.GetStateData();
|
||||||
}
|
}
|
||||||
|
|
||||||
public byte[] GetStateBytes()
|
public override byte[] GetStateBytes()
|
||||||
{
|
{
|
||||||
return emulatorHandler.GetStateData();
|
return emulatorHandler.GetStateData();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void LoadState(object state)
|
public override void LoadState(object state)
|
||||||
{
|
{
|
||||||
emulatorHandler.SetStateData((byte[])state);
|
emulatorHandler.SetStateData((byte[])state);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void LoadStateFromBytes(byte[] data)
|
public override void LoadStateFromBytes(byte[] data)
|
||||||
{
|
{
|
||||||
emulatorHandler.SetStateData(data);
|
emulatorHandler.SetStateData(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Pause()
|
public override void Pause()
|
||||||
{
|
{
|
||||||
bLogicUpdatePause = false;
|
bLogicUpdatePause = false;
|
||||||
}
|
}
|
||||||
public void Resume()
|
public override void Resume()
|
||||||
{
|
{
|
||||||
bLogicUpdatePause = true;
|
bLogicUpdatePause = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public MsgBool StartGame(RomFile romFile)
|
public override MsgBool StartGame(RomFile romFile)
|
||||||
{
|
{
|
||||||
mPlatform = romFile.Platform;
|
mPlatform = romFile.Platform;
|
||||||
|
|
||||||
@ -110,7 +110,7 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
|
|
||||||
bLogicUpdatePause = true;
|
bLogicUpdatePause = true;
|
||||||
|
|
||||||
//保存当前正在进行的游戏存档
|
//保存当前正在进行的游戏存档
|
||||||
if (emulatorHandler != null && !emulatorHandler.IsRunning)
|
if (emulatorHandler != null && !emulatorHandler.IsRunning)
|
||||||
{
|
{
|
||||||
emulatorHandler.SaveCartridge();
|
emulatorHandler.SaveCartridge();
|
||||||
@ -119,48 +119,59 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
if (LoadAndRunCartridge(romFile.LocalFilePath))
|
if (LoadAndRunCartridge(romFile.LocalFilePath))
|
||||||
return true;
|
return true;
|
||||||
else
|
else
|
||||||
return "Rom加载失败";
|
return "Rom加载失败";
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose()
|
public override void Dispose()
|
||||||
{
|
{
|
||||||
if (!emulatorHandler.IsRunning)
|
if (!emulatorHandler.IsRunning)
|
||||||
{
|
{
|
||||||
emulatorHandler.SaveCartridge();
|
emulatorHandler.SaveCartridge();
|
||||||
}
|
}
|
||||||
ShutdownEmulation();
|
ShutdownEmulation();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void DoReset()
|
public override void DoReset()
|
||||||
{
|
{
|
||||||
emulatorHandler.SaveCartridge();
|
emulatorHandler.SaveCartridge();
|
||||||
emulatorHandler.Reset();
|
emulatorHandler.Reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
public IControllerSetuper GetControllerSetuper()
|
public override IControllerSetuper GetControllerSetuper()
|
||||||
{
|
{
|
||||||
return mUniKeyboard.ControllerMapper;
|
return mUniKeyboard.ControllerMapper;
|
||||||
}
|
}
|
||||||
|
protected override bool OnPushEmulatorFrame(ulong InputData)
|
||||||
public bool PushEmulatorFrame()
|
{
|
||||||
{
|
|
||||||
if (!emulatorHandler.IsRunning) return false;
|
if (!emulatorHandler.IsRunning) return false;
|
||||||
if (!bLogicUpdatePause) return false;
|
if (!bLogicUpdatePause) return false;
|
||||||
|
|
||||||
//采集本帧Input
|
mUniKeyboard.SetCurrKeyArr(InputData);
|
||||||
bool bhadNext = mUniKeyboard.SampleInput();
|
emulatorHandler.Update_Frame();
|
||||||
//如果未收到Input数据,核心帧不推进
|
|
||||||
if (!bhadNext) return false;
|
return true;
|
||||||
|
|
||||||
emulatorHandler.Update_Frame();
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AfterPushFrame()
|
protected override ulong ConvertInputDataFromNet(ReplayStep step)
|
||||||
|
{
|
||||||
|
return step.InPut;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override ulong InputDataToNet(ulong inputData)
|
||||||
|
{
|
||||||
|
return inputData;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override ulong GetLocalInput()
|
||||||
|
{
|
||||||
|
return mUniKeyboard.DoLocalPressedKeys();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void AfterPushFrame()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public void GetAudioParams(out int frequency, out int channels)
|
public override void GetAudioParams(out int frequency, out int channels)
|
||||||
{
|
{
|
||||||
frequency = soundHandler.sampleRate;
|
frequency = soundHandler.sampleRate;
|
||||||
channels = soundHandler.channle;
|
channels = soundHandler.channle;
|
||||||
@ -169,10 +180,10 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
|
|
||||||
void InitAll(IGameMetaReources metaresources, IEssgeeIOSupport uegIO, string CustonDataDir)
|
void InitAll(IGameMetaReources metaresources, IEssgeeIOSupport uegIO, string CustonDataDir)
|
||||||
{
|
{
|
||||||
//初始化配置
|
//初始化配置
|
||||||
InitAppEnvironment(CustonDataDir, uegIO);
|
InitAppEnvironment(CustonDataDir, uegIO);
|
||||||
InitEmu();
|
InitEmu();
|
||||||
//细节初始化
|
//细节初始化
|
||||||
InitializeHandlers(metaresources);
|
InitializeHandlers(metaresources);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -218,7 +229,7 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
|
|
||||||
if (AppEnvironment.EnableLogger)
|
if (AppEnvironment.EnableLogger)
|
||||||
{
|
{
|
||||||
//TODO 关闭Debug
|
//TODO 关闭Debug
|
||||||
//Logger.Flush();
|
//Logger.Flush();
|
||||||
//Logger.Close();
|
//Logger.Close();
|
||||||
}
|
}
|
||||||
@ -229,7 +240,7 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
//keysDown = new List<MotionKey>();
|
//keysDown = new List<MotionKey>();
|
||||||
}
|
}
|
||||||
|
|
||||||
#region 细节初始化
|
#region 细节初始化
|
||||||
|
|
||||||
private void InitializeHandlers(IGameMetaReources metaresources)
|
private void InitializeHandlers(IGameMetaReources metaresources)
|
||||||
{
|
{
|
||||||
@ -277,7 +288,7 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
#endregion
|
#endregion
|
||||||
void Dispose(bool disposing)
|
void Dispose(bool disposing)
|
||||||
{
|
{
|
||||||
//TODO 释放时
|
//TODO 释放时
|
||||||
//if (disposing)
|
//if (disposing)
|
||||||
//{
|
//{
|
||||||
// if (components != null) components.Dispose();
|
// if (components != null) components.Dispose();
|
||||||
@ -289,10 +300,10 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
|
|
||||||
//base.Dispose(disposing);
|
//base.Dispose(disposing);
|
||||||
}
|
}
|
||||||
#region 配置
|
#region 配置
|
||||||
private static void LoadConfiguration()
|
private static void LoadConfiguration()
|
||||||
{
|
{
|
||||||
//TODO 暂时跳过这里的配置加载
|
//TODO 暂时跳过这里的配置加载
|
||||||
//Directory.CreateDirectory(EmuStandInfo.programDataDirectory);
|
//Directory.CreateDirectory(EmuStandInfo.programDataDirectory);
|
||||||
//if (!File.Exists(EmuStandInfo.programConfigPath) || (EmuStandInfo.Configuration = EmuStandInfo.programConfigPath.DeserializeFromFile<Configuration>()) == null)
|
//if (!File.Exists(EmuStandInfo.programConfigPath) || (EmuStandInfo.Configuration = EmuStandInfo.programConfigPath.DeserializeFromFile<Configuration>()) == null)
|
||||||
//{
|
//{
|
||||||
@ -397,12 +408,12 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
}
|
}
|
||||||
public static void SaveConfiguration()
|
public static void SaveConfiguration()
|
||||||
{
|
{
|
||||||
//不用保存这个配置
|
//不用保存这个配置
|
||||||
//EmuStandInfo.Configuration.SerializeToFile(EmuStandInfo.programConfigPath);
|
//EmuStandInfo.Configuration.SerializeToFile(EmuStandInfo.programConfigPath);
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region 模拟器基本设置
|
#region 模拟器基本设置
|
||||||
|
|
||||||
public void SetEmuFpsLimit(bool bOpen)
|
public void SetEmuFpsLimit(bool bOpen)
|
||||||
{
|
{
|
||||||
@ -427,12 +438,12 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region 模拟器生命周期
|
#region 模拟器生命周期
|
||||||
|
|
||||||
|
|
||||||
private void PowerOnWithoutCartridge(Type machineType)
|
private void PowerOnWithoutCartridge(Type machineType)
|
||||||
{
|
{
|
||||||
//TODO IsRecording?? 可能需要实现
|
//TODO IsRecording?? 可能需要实现
|
||||||
//if (soundHandler.IsRecording)
|
//if (soundHandler.IsRecording)
|
||||||
// soundHandler.CancelRecording();
|
// soundHandler.CancelRecording();
|
||||||
|
|
||||||
@ -456,7 +467,7 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
|
|
||||||
var (machineType, romData) = CartridgeLoader.Load(fileName, "ROM image");
|
var (machineType, romData) = CartridgeLoader.Load(fileName, "ROM image");
|
||||||
|
|
||||||
//TODO IsRecording?? 可能需要实现
|
//TODO IsRecording?? 可能需要实现
|
||||||
//if (soundHandler.IsRecording)
|
//if (soundHandler.IsRecording)
|
||||||
// soundHandler.CancelRecording();
|
// soundHandler.CancelRecording();
|
||||||
|
|
||||||
@ -481,13 +492,13 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
//toggleLayersToolStripMenuItem.Enabled = enableChannelsToolStripMenuItem.Enabled = true;
|
//toggleLayersToolStripMenuItem.Enabled = enableChannelsToolStripMenuItem.Enabled = true;
|
||||||
|
|
||||||
|
|
||||||
//初始化不同平台的按钮
|
//初始化不同平台的按钮
|
||||||
mUniKeyboard.Init(emulatorHandler.emulator);
|
mUniKeyboard.Init(emulatorHandler.emulator);
|
||||||
|
|
||||||
emulatorHandler.Startup();
|
emulatorHandler.Startup();
|
||||||
|
|
||||||
|
|
||||||
//初始化音频
|
//初始化音频
|
||||||
soundHandler.Initialize();
|
soundHandler.Initialize();
|
||||||
|
|
||||||
//SizeAndPositionWindow();
|
//SizeAndPositionWindow();
|
||||||
@ -549,7 +560,7 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
//{
|
//{
|
||||||
if (!AppEnvironment.TemporaryDisableCustomExceptionForm)
|
if (!AppEnvironment.TemporaryDisableCustomExceptionForm)
|
||||||
{
|
{
|
||||||
//TODO debug窗口？
|
//TODO debug窗口？
|
||||||
//(_, ExceptionResult result, string prefix, string postfix) = ExceptionForm.GetExceptionInfo(ex);
|
//(_, ExceptionResult result, string prefix, string postfix) = ExceptionForm.GetExceptionInfo(ex);
|
||||||
|
|
||||||
//if (result == ExceptionResult.Continue)
|
//if (result == ExceptionResult.Continue)
|
||||||
@ -661,7 +672,7 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region 模拟器内部事件
|
#region 模拟器内部事件
|
||||||
|
|
||||||
private void EmulatorHandler_SendLogMessage(object sender, SendLogMessageEventArgs e)
|
private void EmulatorHandler_SendLogMessage(object sender, SendLogMessageEventArgs e)
|
||||||
{
|
{
|
||||||
@ -699,7 +710,7 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
|
|
||||||
private void EmulatorHandler_SizeScreen(object sender, SizeScreenEventArgs e)
|
private void EmulatorHandler_SizeScreen(object sender, SizeScreenEventArgs e)
|
||||||
{
|
{
|
||||||
//TODO 待实现 屏幕大小
|
//TODO 待实现 屏幕大小
|
||||||
|
|
||||||
//this.CheckInvokeMethod(delegate ()
|
//this.CheckInvokeMethod(delegate ()
|
||||||
//{
|
//{
|
||||||
@ -710,7 +721,7 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
|
|
||||||
private void EmulatorHandler_ChangeViewport(object sender, ChangeViewportEventArgs e)
|
private void EmulatorHandler_ChangeViewport(object sender, ChangeViewportEventArgs e)
|
||||||
{
|
{
|
||||||
//TODO 待实现
|
//TODO 待实现
|
||||||
|
|
||||||
//this.CheckInvokeMethod(delegate ()
|
//this.CheckInvokeMethod(delegate ()
|
||||||
//{
|
//{
|
||||||
@ -721,7 +732,7 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
|
|
||||||
private void EmulatorHandler_PollInput(object sender, PollInputEventArgs e)
|
private void EmulatorHandler_PollInput(object sender, PollInputEventArgs e)
|
||||||
{
|
{
|
||||||
//TODO Input实现
|
//TODO Input实现
|
||||||
|
|
||||||
//e.Keyboard = mUniKeyboard.mKeyCodeCore.GetPressedKeys();
|
//e.Keyboard = mUniKeyboard.mKeyCodeCore.GetPressedKeys();
|
||||||
e.Keyboard.AddRange(mUniKeyboard.GetPressedKeys());
|
e.Keyboard.AddRange(mUniKeyboard.GetPressedKeys());
|
||||||
@ -775,7 +786,7 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
/* Images, ex. GB Printer printouts */
|
/* Images, ex. GB Printer printouts */
|
||||||
//image.Save(filePath);
|
//image.Save(filePath);
|
||||||
|
|
||||||
//TODO 图像存储
|
//TODO 图像存储
|
||||||
}
|
}
|
||||||
else if (e.Data is byte[] raw)
|
else if (e.Data is byte[] raw)
|
||||||
{
|
{
|
||||||
@ -801,7 +812,7 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
|
|
||||||
if (emulatorHandler.IsPaused)
|
if (emulatorHandler.IsPaused)
|
||||||
{
|
{
|
||||||
//TODO 音频暂停？
|
//TODO 音频暂停？
|
||||||
//soundHandler?.ClearSampleBuffer();
|
//soundHandler?.ClearSampleBuffer();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -825,7 +836,7 @@ public class UEssgee : MonoBehaviour, IEmuCore
|
|||||||
// waveHeader.FileLength += (uint)e.MixedSamples.Length;
|
// waveHeader.FileLength += (uint)e.MixedSamples.Length;
|
||||||
//}
|
//}
|
||||||
|
|
||||||
//TODO 音频处理
|
//TODO 音频处理
|
||||||
//soundHandler.SubmitSamples(e.MixedSamples, e.ChannelSamples, e.MixedSamples.Length);
|
//soundHandler.SubmitSamples(e.MixedSamples, e.ChannelSamples, e.MixedSamples.Length);
|
||||||
soundHandler.SubmitSamples(e.MixedSamples, e.ChannelSamples, e.MixedSamplesLength);
|
soundHandler.SubmitSamples(e.MixedSamples, e.ChannelSamples, e.MixedSamplesLength);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -315,45 +315,7 @@ public class UEGKeyboard : MonoBehaviour
|
|||||||
//mUniKeyboard.btnABC.Key = new long[] { (long)MotionKey.P1_BTN_1, (long)MotionKey.P1_BTN_2, (long)MotionKey.P1_BTN_3 };
|
//mUniKeyboard.btnABC.Key = new long[] { (long)MotionKey.P1_BTN_1, (long)MotionKey.P1_BTN_2, (long)MotionKey.P1_BTN_3 };
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool SampleInput()
|
public void SetCurrKeyArr(ulong inputData)
|
||||||
{
|
|
||||||
//Net模式
|
|
||||||
if (InGameUI.Instance.IsNetPlay)
|
|
||||||
{
|
|
||||||
bool bHadNetData = false;
|
|
||||||
int targetFrame; ReplayStep replayData; int frameDiff; bool inputDiff;
|
|
||||||
if (App.roomMgr.netReplay.TryGetNextFrame((int)UEssgee.instance.Frame, out replayData, out frameDiff, out inputDiff))
|
|
||||||
{
|
|
||||||
if (inputDiff)
|
|
||||||
{
|
|
||||||
App.log.Debug($"{DateTime.Now.ToString("hh:mm:ss.fff")} TryGetNextFrame remoteFrame->{App.roomMgr.netReplay.mRemoteFrameIdx} diff->{frameDiff} " +
|
|
||||||
$"frame=>{replayData.FrameStartID} InPut=>{replayData.InPut}");
|
|
||||||
}
|
|
||||||
CurrRemoteInpuAllData = replayData.InPut;
|
|
||||||
SetCurrKeyArr(CurrRemoteInpuAllData);
|
|
||||||
bHadNetData = true;
|
|
||||||
}
|
|
||||||
else//无输入
|
|
||||||
{
|
|
||||||
CurrRemoteInpuAllData = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
//发送本地操作
|
|
||||||
App.roomMgr.SendRoomSingelPlayerInput(UEssgee.instance.Frame,
|
|
||||||
DoLocalPressedKeys());
|
|
||||||
|
|
||||||
return bHadNetData;
|
|
||||||
}
|
|
||||||
//单机模式
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ulong inputData = DoLocalPressedKeys();
|
|
||||||
SetCurrKeyArr(inputData);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetCurrKeyArr(ulong inputData)
|
|
||||||
{
|
{
|
||||||
temp.Clear();
|
temp.Clear();
|
||||||
for (int i = 0; i < CheckList.Length; i++)
|
for (int i = 0; i < CheckList.Length; i++)
|
||||||
@ -368,7 +330,7 @@ public class UEGKeyboard : MonoBehaviour
|
|||||||
mCurrKey = temp.ToArray();
|
mCurrKey = temp.ToArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
ulong DoLocalPressedKeys()
|
public ulong DoLocalPressedKeys()
|
||||||
{
|
{
|
||||||
//tempInputAllData = 0;
|
//tempInputAllData = 0;
|
||||||
//for (int i = 0; i < CheckList.Length; i++)
|
//for (int i = 0; i < CheckList.Length; i++)
|
||||||
|
|||||||
@ -9,7 +9,7 @@ using System.Text;
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
public class UMAME : MonoBehaviour, IEmuCore
|
public class UMAME : EmuCore<ulong>
|
||||||
{
|
{
|
||||||
public static UMAME instance { get; private set; }
|
public static UMAME instance { get; private set; }
|
||||||
public MAMEEmu emu { get; private set; }
|
public MAMEEmu emu { get; private set; }
|
||||||
@ -38,9 +38,9 @@ public class UMAME : MonoBehaviour, IEmuCore
|
|||||||
public string EmuDataPath { get { return App.PersistentDataPath(Platform); } }
|
public string EmuDataPath { get { return App.PersistentDataPath(Platform); } }
|
||||||
public string RomPath => EmuDataPath + "/RemoteRoms/";
|
public string RomPath => EmuDataPath + "/RemoteRoms/";
|
||||||
public string SavePath => EmuDataPath + "/sav/";
|
public string SavePath => EmuDataPath + "/sav/";
|
||||||
public RomPlatformType Platform { get { return mPlatform; } }
|
public override RomPlatformType Platform { get { return mPlatform; } }
|
||||||
RomPlatformType mPlatform = RomPlatformType.Cps1;
|
RomPlatformType mPlatform = RomPlatformType.Cps1;
|
||||||
public uint Frame => (uint)emu.currEmuFrame;
|
public override uint Frame => (uint)emu.currEmuFrame;
|
||||||
void Awake()
|
void Awake()
|
||||||
{
|
{
|
||||||
instance = this;
|
instance = this;
|
||||||
@ -67,61 +67,61 @@ public class UMAME : MonoBehaviour, IEmuCore
|
|||||||
StopGame();
|
StopGame();
|
||||||
}
|
}
|
||||||
#region 实现接口
|
#region 实现接口
|
||||||
public object GetState()
|
public override object GetState()
|
||||||
{
|
{
|
||||||
return SaveState();
|
return SaveState();
|
||||||
}
|
}
|
||||||
public byte[] GetStateBytes()
|
public override byte[] GetStateBytes()
|
||||||
{
|
{
|
||||||
return SaveState();
|
return SaveState();
|
||||||
}
|
}
|
||||||
public void LoadState(object state)
|
public override void LoadState(object state)
|
||||||
{
|
{
|
||||||
LoadState((byte[])state);
|
LoadState((byte[])state);
|
||||||
}
|
}
|
||||||
public void LoadStateFromBytes(byte[] data)
|
public override void LoadStateFromBytes(byte[] data)
|
||||||
{
|
{
|
||||||
LoadState(data);
|
LoadState(data);
|
||||||
}
|
}
|
||||||
public void Pause()
|
public override void Pause()
|
||||||
{
|
{
|
||||||
bLogicUpdatePause = false;
|
bLogicUpdatePause = false;
|
||||||
}
|
}
|
||||||
public void Resume()
|
public override void Resume()
|
||||||
{
|
{
|
||||||
bLogicUpdatePause = true;
|
bLogicUpdatePause = true;
|
||||||
}
|
}
|
||||||
public MsgBool StartGame(RomFile romFile)
|
public override MsgBool StartGame(RomFile romFile)
|
||||||
{
|
{
|
||||||
mPlatform = romFile.Platform;
|
mPlatform = romFile.Platform;
|
||||||
mTimeSpan.InitStandTime();
|
mTimeSpan.InitStandTime();
|
||||||
if (LoadGame(romFile.FileName, false))
|
if (LoadGame(romFile.FileName))
|
||||||
return true;
|
return true;
|
||||||
else
|
else
|
||||||
return "Rom加载失败";
|
return "Rom加载失败";
|
||||||
}
|
}
|
||||||
public void Dispose()
|
public override void Dispose()
|
||||||
{
|
{
|
||||||
StopGame();
|
StopGame();
|
||||||
}
|
}
|
||||||
public void DoReset()
|
public override void DoReset()
|
||||||
{
|
{
|
||||||
StopGame();
|
StopGame();
|
||||||
LoadGame(mChangeRomName, false);
|
LoadGame(mChangeRomName);
|
||||||
}
|
}
|
||||||
public IControllerSetuper GetControllerSetuper()
|
public override IControllerSetuper GetControllerSetuper()
|
||||||
{
|
{
|
||||||
return mUniKeyboard.ControllerMapper;
|
return mUniKeyboard.ControllerMapper;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void GetAudioParams(out int frequency, out int channels)
|
public override void GetAudioParams(out int frequency, out int channels)
|
||||||
{
|
{
|
||||||
mUniSoundPlayer.GetAudioParams(out frequency, out channels);
|
mUniSoundPlayer.GetAudioParams(out frequency, out channels);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
bool LoadGame(string loadRom, bool bReplay = false)
|
bool LoadGame(string loadRom)
|
||||||
{
|
{
|
||||||
emu.ResetRomRoot(RomPath);
|
emu.ResetRomRoot(RomPath);
|
||||||
//Application.targetFrameRate = 60;
|
//Application.targetFrameRate = 60;
|
||||||
@ -133,12 +133,6 @@ public class UMAME : MonoBehaviour, IEmuCore
|
|||||||
//读取成功
|
//读取成功
|
||||||
if (emu.bRom)
|
if (emu.bRom)
|
||||||
{
|
{
|
||||||
if (bReplay)
|
|
||||||
{
|
|
||||||
string Path = SavePath + Machine.sName + ".rp";
|
|
||||||
mReplayReader = new ReplayReader(Path);
|
|
||||||
mUniKeyboard.SetRePlay(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
//读取ROM之后获得宽高初始化画面
|
//读取ROM之后获得宽高初始化画面
|
||||||
int _width; int _height; IntPtr _framePtr;
|
int _width; int _height; IntPtr _framePtr;
|
||||||
@ -159,23 +153,33 @@ public class UMAME : MonoBehaviour, IEmuCore
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
protected override bool OnPushEmulatorFrame(ulong InputData)
|
||||||
public bool PushEmulatorFrame()
|
|
||||||
{
|
{
|
||||||
if (!bInGame) return false;
|
if (!bInGame) return false;
|
||||||
if (!bLogicUpdatePause) return false;
|
if (!bLogicUpdatePause) return false;
|
||||||
|
|
||||||
//采集本帧Input
|
mUniKeyboard.SyncInput(InputData);
|
||||||
bool bhadNext = mUniKeyboard.SampleInput();
|
emu.UpdateFrame();
|
||||||
//如果未收到Input数据,核心帧不推进
|
|
||||||
if (!bhadNext) return false;
|
return true;
|
||||||
//放行下一帧
|
|
||||||
//emu.UnlockNextFreme();
|
|
||||||
//推帧
|
|
||||||
emu.UpdateFrame();
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
public void AfterPushFrame()
|
|
||||||
|
protected override ulong ConvertInputDataFromNet(ReplayStep step)
|
||||||
|
{
|
||||||
|
return step.InPut;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override ulong InputDataToNet(ulong inputData)
|
||||||
|
{
|
||||||
|
return inputData;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override ulong GetLocalInput()
|
||||||
|
{
|
||||||
|
return mUniKeyboard.DoLocalPressedKeys();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void AfterPushFrame()
|
||||||
{
|
{
|
||||||
mFPS.text = ($"fpsv {mUniVideoPlayer.videoFPS.ToString("F2")} fpsa {mUniSoundPlayer.audioFPS.ToString("F2")} ,Idx:{App.roomMgr.netReplay?.mCurrClientFrameIdx},RIdx:{App.roomMgr.netReplay?.mRemoteFrameIdx},RForward:{App.roomMgr.netReplay?.mRemoteForwardCount} ,RD:{App.roomMgr.netReplay?.mRemoteForwardCount} ,D:{App.roomMgr.netReplay?.mDiffFrameCount} ,Q:{App.roomMgr.netReplay?.mNetReplayQueue.Count}");
|
mFPS.text = ($"fpsv {mUniVideoPlayer.videoFPS.ToString("F2")} fpsa {mUniSoundPlayer.audioFPS.ToString("F2")} ,Idx:{App.roomMgr.netReplay?.mCurrClientFrameIdx},RIdx:{App.roomMgr.netReplay?.mRemoteFrameIdx},RForward:{App.roomMgr.netReplay?.mRemoteForwardCount} ,RD:{App.roomMgr.netReplay?.mRemoteForwardCount} ,D:{App.roomMgr.netReplay?.mDiffFrameCount} ,Q:{App.roomMgr.netReplay?.mNetReplayQueue.Count}");
|
||||||
}
|
}
|
||||||
@ -227,9 +231,9 @@ public class UMAME : MonoBehaviour, IEmuCore
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public Texture OutputPixel => mUniVideoPlayer.rawBufferWarper;
|
public override Texture OutputPixel => mUniVideoPlayer.rawBufferWarper;
|
||||||
|
|
||||||
public RawImage DrawCanvas => mUniVideoPlayer.DrawCanvas;
|
public override RawImage DrawCanvas => mUniVideoPlayer.DrawCanvas;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -12,43 +12,34 @@ using UnityEngine;
|
|||||||
public class UniKeyboard : MonoBehaviour, IKeyboard
|
public class UniKeyboard : MonoBehaviour, IKeyboard
|
||||||
{
|
{
|
||||||
public MameControllerMapper ControllerMapper { get; private set; }
|
public MameControllerMapper ControllerMapper { get; private set; }
|
||||||
bool bReplayMode;
|
|
||||||
PlayMode mPlayMode;
|
PlayMode mPlayMode;
|
||||||
ReplayMode mReplayMode;
|
|
||||||
|
|
||||||
void Awake()
|
void Awake()
|
||||||
{
|
{
|
||||||
ControllerMapper = new MameControllerMapper();
|
ControllerMapper = new MameControllerMapper();
|
||||||
Init(false);
|
Init();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ulong GetPressedKeys()
|
public ulong GetPressedKeys()
|
||||||
{
|
{
|
||||||
ulong InputData;
|
return mPlayMode.GetPressedKeys();
|
||||||
if (!bReplayMode)//游玩模式（单机或联机）
|
}
|
||||||
return mPlayMode.GetPressedKeys();
|
public void SyncInput(ulong inputData)
|
||||||
else//Replay模式
|
{
|
||||||
return mReplayMode.GetPressedKeys();
|
mPlayMode.CurrLocalInpuAllData = inputData;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool SampleInput()
|
public ulong DoLocalPressedKeys()
|
||||||
{
|
{
|
||||||
if (bReplayMode) return true;
|
return mPlayMode.DoLocalPressedKeys();
|
||||||
return mPlayMode.SampleInput();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#region
|
#region
|
||||||
|
|
||||||
public void SetRePlay(bool IsReplay)
|
|
||||||
{
|
|
||||||
bReplayMode = IsReplay;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Init(bool IsReplay)
|
public void Init()
|
||||||
{
|
{
|
||||||
bReplayMode = IsReplay;
|
|
||||||
mPlayMode = new PlayMode(this);
|
mPlayMode = new PlayMode(this);
|
||||||
mReplayMode = new ReplayMode();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IEnumerable<string> GetInputpDataToMotionKey(ulong inputdata)
|
public static IEnumerable<string> GetInputpDataToMotionKey(ulong inputdata)
|
||||||
@ -80,41 +71,7 @@ public class UniKeyboard : MonoBehaviour, IKeyboard
|
|||||||
return CurrLocalInpuAllData;
|
return CurrLocalInpuAllData;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool SampleInput()
|
public ulong DoLocalPressedKeys()
|
||||||
{
|
|
||||||
//Net模式
|
|
||||||
if (InGameUI.Instance.IsNetPlay)
|
|
||||||
{
|
|
||||||
bool bHadNetData = false;
|
|
||||||
int targetFrame; ReplayStep replayData; int frameDiff; bool inputDiff;
|
|
||||||
if (App.roomMgr.netReplay.TryGetNextFrame((int)UMAME.instance.Frame, out replayData, out frameDiff, out inputDiff))
|
|
||||||
{
|
|
||||||
if (inputDiff)
|
|
||||||
{
|
|
||||||
App.log.Debug($"{DateTime.Now.ToString("hh:mm:ss.fff")} TryGetNextFrame remoteFrame->{App.roomMgr.netReplay.mRemoteFrameIdx} diff->{frameDiff} " +
|
|
||||||
$"frame=>{replayData.FrameStartID} InPut=>{replayData.InPut}");
|
|
||||||
}
|
|
||||||
CurrRemoteInpuAllData = replayData.InPut;
|
|
||||||
|
|
||||||
bHadNetData = true;
|
|
||||||
}
|
|
||||||
else//无输入
|
|
||||||
{
|
|
||||||
CurrRemoteInpuAllData = 0;
|
|
||||||
}
|
|
||||||
//发送本地操作
|
|
||||||
App.roomMgr.SendRoomSingelPlayerInput(UMAME.instance.Frame, DoLocalPressedKeys());
|
|
||||||
return bHadNetData;
|
|
||||||
}
|
|
||||||
//单人模式
|
|
||||||
else
|
|
||||||
{
|
|
||||||
DoLocalPressedKeys();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ulong DoLocalPressedKeys()
|
|
||||||
{
|
{
|
||||||
ulong tempLocalInputAllData = 0;
|
ulong tempLocalInputAllData = 0;
|
||||||
tempLocalInputAllData |= mUniKeyboard.ControllerMapper.Controller0.GetSingleAllInput();
|
tempLocalInputAllData |= mUniKeyboard.ControllerMapper.Controller0.GetSingleAllInput();
|
||||||
|
|||||||
@ -10,11 +10,6 @@ namespace AxibugEmuOnline.Client
|
|||||||
{
|
{
|
||||||
public class CoreSupporter : ISupporterImpl
|
public class CoreSupporter : ISupporterImpl
|
||||||
{
|
{
|
||||||
private NesControllerMapper m_controllerMapper;
|
|
||||||
public CoreSupporter(NesControllerMapper conMapper)
|
|
||||||
{
|
|
||||||
m_controllerMapper = conMapper;
|
|
||||||
}
|
|
||||||
|
|
||||||
public System.IO.Stream OpenRom(string fname)
|
public System.IO.Stream OpenRom(string fname)
|
||||||
{
|
{
|
||||||
@ -95,51 +90,9 @@ namespace AxibugEmuOnline.Client
|
|||||||
{
|
{
|
||||||
var db = Resources.Load<RomDB>("NES/ROMDB");
|
var db = Resources.Load<RomDB>("NES/ROMDB");
|
||||||
return db.GetMapperNo(rom.GetPROM_CRC(), out mapperNo);
|
return db.GetMapperNo(rom.GetPROM_CRC(), out mapperNo);
|
||||||
}
|
}
|
||||||
|
|
||||||
private ControllerState m_sampledState;
|
|
||||||
public ControllerState GetControllerState()
|
|
||||||
{
|
|
||||||
return m_sampledState;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint LastTestInput = 0;
|
|
||||||
public void SampleInput(uint frameIndex)
|
|
||||||
{
|
|
||||||
if (InGameUI.Instance.IsNetPlay)
|
|
||||||
{
|
|
||||||
int targetFrame; ReplayStep replayData; int frameDiff; bool inputDiff;
|
|
||||||
if (App.roomMgr.netReplay.TryGetNextFrame((int)frameIndex, out replayData, out frameDiff, out inputDiff))
|
|
||||||
{
|
|
||||||
if (inputDiff)
|
|
||||||
{
|
|
||||||
App.log.Debug($"{DateTime.Now.ToString("hh:mm:ss.fff")} TryGetNextFrame remoteFrame->{App.roomMgr.netReplay.mRemoteFrameIdx} diff->{frameDiff} " +
|
|
||||||
$"frame=>{replayData.FrameStartID} InPut=>{replayData.InPut}");
|
|
||||||
}
|
|
||||||
|
|
||||||
m_sampledState = FromNet(replayData);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_sampledState = default(ControllerState);
|
|
||||||
}
|
|
||||||
|
|
||||||
var localState = m_controllerMapper.CreateState();
|
|
||||||
var rawData = ToNet(localState);
|
|
||||||
if (LastTestInput != rawData)
|
|
||||||
{
|
|
||||||
LastTestInput = rawData;
|
|
||||||
App.log.Debug($"{DateTime.Now.ToString("hh:mm:ss.fff")} Input F:{App.roomMgr.netReplay.mCurrClientFrameIdx} | I:{rawData}");
|
|
||||||
}
|
|
||||||
App.roomMgr.SendRoomSingelPlayerInput(frameIndex, rawData);
|
|
||||||
}
|
|
||||||
//单机模式
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_sampledState = m_controllerMapper.CreateState();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public ControllerState FromNet(AxiReplay.ReplayStep step)
|
public ControllerState FromNet(AxiReplay.ReplayStep step)
|
||||||
{
|
{
|
||||||
var temp = new ServerInputSnapShot();
|
var temp = new ServerInputSnapShot();
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
using AxibugEmuOnline.Client.ClientCore;
|
using AxibugEmuOnline.Client.ClientCore;
|
||||||
using AxibugProtobuf;
|
using AxibugProtobuf;
|
||||||
|
using AxiReplay;
|
||||||
using System;
|
using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
@ -11,7 +12,7 @@ using VirtualNes.Core.Debug;
|
|||||||
|
|
||||||
namespace AxibugEmuOnline.Client
|
namespace AxibugEmuOnline.Client
|
||||||
{
|
{
|
||||||
public class NesEmulator : MonoBehaviour, IEmuCore
|
public class NesEmulator : EmuCore<ControllerState>
|
||||||
{
|
{
|
||||||
public VideoProvider VideoProvider;
|
public VideoProvider VideoProvider;
|
||||||
public AudioProvider AudioProvider;
|
public AudioProvider AudioProvider;
|
||||||
@ -35,16 +36,16 @@ namespace AxibugEmuOnline.Client
|
|||||||
AudioProvider.NesEmu = this;
|
AudioProvider.NesEmu = this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public RomPlatformType Platform => RomPlatformType.Nes;
|
public override RomPlatformType Platform => RomPlatformType.Nes;
|
||||||
private CoreSupporter m_coreSupporter;
|
private CoreSupporter m_coreSupporter;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 指定ROM开始游戏
|
/// 指定ROM开始游戏
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public MsgBool StartGame(RomFile rom)
|
public override MsgBool StartGame(RomFile rom)
|
||||||
{
|
{
|
||||||
StopGame();
|
StopGame();
|
||||||
|
|
||||||
m_coreSupporter = new CoreSupporter(ControllerMapper);
|
m_coreSupporter = new CoreSupporter();
|
||||||
Supporter.Setup(m_coreSupporter);
|
Supporter.Setup(m_coreSupporter);
|
||||||
Debuger.Setup(new CoreDebuger());
|
Debuger.Setup(new CoreDebuger());
|
||||||
|
|
||||||
@ -63,28 +64,28 @@ namespace AxibugEmuOnline.Client
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Pause()
|
public override void Pause()
|
||||||
{
|
{
|
||||||
IsPause = true;
|
IsPause = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Resume()
|
public override void Resume()
|
||||||
{
|
{
|
||||||
IsPause = false;
|
IsPause = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void DoReset()
|
public override void DoReset()
|
||||||
{
|
{
|
||||||
NesCore.Reset();
|
NesCore.Reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void LoadState(object state)
|
public override void LoadState(object state)
|
||||||
{
|
{
|
||||||
NesCore.LoadState((State)state);
|
NesCore.LoadState((State)state);
|
||||||
}
|
}
|
||||||
|
|
||||||
public object GetState()
|
public override object GetState()
|
||||||
{
|
{
|
||||||
return NesCore.GetState();
|
return NesCore.GetState();
|
||||||
}
|
}
|
||||||
@ -93,7 +94,7 @@ namespace AxibugEmuOnline.Client
|
|||||||
/// 获取即时存档
|
/// 获取即时存档
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public byte[] GetStateBytes()
|
public override byte[] GetStateBytes()
|
||||||
{
|
{
|
||||||
return NesCore.GetState().ToBytes();
|
return NesCore.GetState().ToBytes();
|
||||||
}
|
}
|
||||||
@ -104,14 +105,14 @@ namespace AxibugEmuOnline.Client
|
|||||||
/// <param
|
/// <param
|
||||||
/// name="data">
|
/// name="data">
|
||||||
/// </param>
|
/// </param>
|
||||||
public void LoadStateFromBytes(byte[] data)
|
public override void LoadStateFromBytes(byte[] data)
|
||||||
{
|
{
|
||||||
var st = new State();
|
var st = new State();
|
||||||
st.FromByte(data);
|
st.FromByte(data);
|
||||||
NesCore.LoadState(st);
|
NesCore.LoadState(st);
|
||||||
}
|
}
|
||||||
|
|
||||||
public uint Frame => NesCore.FrameCount;
|
public override uint Frame => NesCore.FrameCount;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 停止游戏
|
/// 停止游戏
|
||||||
@ -122,49 +123,54 @@ namespace AxibugEmuOnline.Client
|
|||||||
NesCore = null;
|
NesCore = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if UNITY_EDITOR
|
|
||||||
private ControllerState m_lastState;
|
|
||||||
#endif
|
|
||||||
//推进帧
|
//推进帧
|
||||||
public bool PushEmulatorFrame()
|
protected override bool OnPushEmulatorFrame(ControllerState inputData)
|
||||||
{
|
{
|
||||||
if (NesCore == null || IsPause) return false;
|
if (NesCore == null || IsPause) return false;
|
||||||
|
|
||||||
m_coreSupporter.SampleInput(NesCore.FrameCount);
|
NesCore.pad.Sync(inputData);
|
||||||
var controlState = m_coreSupporter.GetControllerState();
|
|
||||||
|
|
||||||
//如果未收到Input数据,核心帧不推进
|
|
||||||
if (!controlState.valid) return false;
|
|
||||||
|
|
||||||
#if UNITY_EDITOR
|
|
||||||
if (controlState != m_lastState) App.log.Info($"[LOCALDEBUG]{NesCore.FrameCount}-->{controlState}");
|
|
||||||
m_lastState = controlState;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
NesCore.pad.Sync(controlState);
|
|
||||||
NesCore.EmulateFrame(true);
|
NesCore.EmulateFrame(true);
|
||||||
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override ControllerState ConvertInputDataFromNet(ReplayStep step)
|
||||||
|
{
|
||||||
|
return m_coreSupporter.FromNet(step);
|
||||||
|
}
|
||||||
|
protected override ulong InputDataToNet(ControllerState inputData)
|
||||||
|
{
|
||||||
|
return m_coreSupporter.ToNet(inputData);
|
||||||
|
}
|
||||||
|
|
||||||
public unsafe void AfterPushFrame()
|
protected override ControllerState GetLocalInput()
|
||||||
|
{
|
||||||
|
return ControllerMapper.CreateState();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public override unsafe void AfterPushFrame()
|
||||||
{
|
{
|
||||||
var screenBuffer = NesCore.ppu.GetScreenPtr();
|
var screenBuffer = NesCore.ppu.GetScreenPtr();
|
||||||
VideoProvider.SetDrawData(screenBuffer);
|
VideoProvider.SetDrawData(screenBuffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IControllerSetuper GetControllerSetuper()
|
public override IControllerSetuper GetControllerSetuper()
|
||||||
{
|
{
|
||||||
return ControllerMapper;
|
return ControllerMapper;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose()
|
public override void Dispose()
|
||||||
{
|
{
|
||||||
StopGame();
|
StopGame();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override Texture OutputPixel => VideoProvider.OutputPixel;
|
||||||
|
public override RawImage DrawCanvas => VideoProvider.Drawer;
|
||||||
|
public override void GetAudioParams(out int frequency, out int channels)
|
||||||
|
{
|
||||||
|
AudioProvider.GetAudioParams(out frequency, out channels);
|
||||||
|
}
|
||||||
|
|
||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -196,13 +202,5 @@ namespace AxibugEmuOnline.Client
|
|||||||
UnityEditor.AssetDatabase.SaveAssets();
|
UnityEditor.AssetDatabase.SaveAssets();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
public Texture OutputPixel => VideoProvider.OutputPixel;
|
|
||||||
public RawImage DrawCanvas => VideoProvider.Drawer;
|
|
||||||
public void GetAudioParams(out int frequency, out int channels)
|
|
||||||
{
|
|
||||||
AudioProvider.GetAudioParams(out frequency, out channels);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,6 +1,7 @@
|
|||||||
using AxibugEmuOnline.Client;
|
using AxibugEmuOnline.Client;
|
||||||
using AxibugEmuOnline.Client.ClientCore;
|
using AxibugEmuOnline.Client.ClientCore;
|
||||||
using AxibugProtobuf;
|
using AxibugProtobuf;
|
||||||
|
using AxiReplay;
|
||||||
using StoicGoose.Common.Utilities;
|
using StoicGoose.Common.Utilities;
|
||||||
using StoicGoose.Core.Machines;
|
using StoicGoose.Core.Machines;
|
||||||
using System;
|
using System;
|
||||||
@ -11,7 +12,7 @@ using UnityEngine;
|
|||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
using CartridgeMetadata = StoicGoose.Core.Cartridges.Metadata;
|
using CartridgeMetadata = StoicGoose.Core.Cartridges.Metadata;
|
||||||
|
|
||||||
public class UStoicGoose : MonoBehaviour, IEmuCore
|
public class UStoicGoose : EmuCore<ulong>
|
||||||
{
|
{
|
||||||
public static UStoicGoose instance;
|
public static UStoicGoose instance;
|
||||||
public static System.Diagnostics.Stopwatch sw = System.Diagnostics.Stopwatch.StartNew();
|
public static System.Diagnostics.Stopwatch sw = System.Diagnostics.Stopwatch.StartNew();
|
||||||
@ -49,44 +50,44 @@ public class UStoicGoose : MonoBehaviour, IEmuCore
|
|||||||
public string CurrRomName { get; private set; }
|
public string CurrRomName { get; private set; }
|
||||||
|
|
||||||
#region 实现IEmuCore
|
#region 实现IEmuCore
|
||||||
public RomPlatformType Platform => mPlatform;
|
public override RomPlatformType Platform => mPlatform;
|
||||||
|
|
||||||
public uint Frame => (uint)emulatorHandler.AxiEmuRunFrame;
|
public override uint Frame => (uint)emulatorHandler.AxiEmuRunFrame;
|
||||||
|
|
||||||
public Texture OutputPixel => graphicsHandler.rawBufferWarper;
|
public override Texture OutputPixel => graphicsHandler.rawBufferWarper;
|
||||||
|
|
||||||
public RawImage DrawCanvas => graphicsHandler.DrawCanvas;
|
public override RawImage DrawCanvas => graphicsHandler.DrawCanvas;
|
||||||
public object GetState()
|
public override object GetState()
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
public byte[] GetStateBytes()
|
public override byte[] GetStateBytes()
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void LoadState(object state)
|
public override void LoadState(object state)
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void LoadStateFromBytes(byte[] data)
|
public override void LoadStateFromBytes(byte[] data)
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Pause()
|
public override void Pause()
|
||||||
{
|
{
|
||||||
PauseEmulation();
|
PauseEmulation();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Resume()
|
public override void Resume()
|
||||||
{
|
{
|
||||||
UnpauseEmulation();
|
UnpauseEmulation();
|
||||||
}
|
}
|
||||||
|
|
||||||
public MsgBool StartGame(RomFile romFile)
|
public override MsgBool StartGame(RomFile romFile)
|
||||||
{
|
{
|
||||||
mPlatform = romFile.Platform;
|
mPlatform = romFile.Platform;
|
||||||
|
|
||||||
@ -105,7 +106,7 @@ public class UStoicGoose : MonoBehaviour, IEmuCore
|
|||||||
return "Rom加载失败";
|
return "Rom加载失败";
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose()
|
public override void Dispose()
|
||||||
{
|
{
|
||||||
//保存当前正在进行的游戏存档
|
//保存当前正在进行的游戏存档
|
||||||
if (emulatorHandler != null && !emulatorHandler.IsRunning)
|
if (emulatorHandler != null && !emulatorHandler.IsRunning)
|
||||||
@ -115,27 +116,41 @@ public class UStoicGoose : MonoBehaviour, IEmuCore
|
|||||||
EmuClose();
|
EmuClose();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void DoReset()
|
public override void DoReset()
|
||||||
{
|
{
|
||||||
ResetEmulation();
|
ResetEmulation();
|
||||||
}
|
}
|
||||||
|
|
||||||
public IControllerSetuper GetControllerSetuper()
|
public override IControllerSetuper GetControllerSetuper()
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
protected override bool OnPushEmulatorFrame(ulong InputData)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override ulong ConvertInputDataFromNet(ReplayStep step)
|
||||||
|
{
|
||||||
|
return step.InPut;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override ulong InputDataToNet(ulong inputData)
|
||||||
|
{
|
||||||
|
return inputData;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override ulong GetLocalInput()
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void AfterPushFrame()
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool PushEmulatorFrame()
|
public override void GetAudioParams(out int frequency, out int channels)
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void AfterPushFrame()
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void GetAudioParams(out int frequency, out int channels)
|
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,55 +1,119 @@
|
|||||||
using AxibugProtobuf;
|
#pragma warning disable CS0618 // 类型或成员已过时
|
||||||
|
|
||||||
|
using AxibugEmuOnline.Client.ClientCore;
|
||||||
|
using AxibugProtobuf;
|
||||||
|
using AxiReplay;
|
||||||
|
using System;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
namespace AxibugEmuOnline.Client
|
namespace AxibugEmuOnline.Client
|
||||||
{
|
{
|
||||||
public interface IEmuCore
|
/// <summary>
|
||||||
|
/// use <see cref="EmuCore{INPUTDATA}"/> instead
|
||||||
|
/// </summary>
|
||||||
|
[Obsolete("不可直接继承,需要继承EmuCore类型")]
|
||||||
|
public abstract class IEmuCore : MonoBehaviour
|
||||||
{
|
{
|
||||||
GameObject gameObject { get; }
|
|
||||||
|
|
||||||
/// <summary> 获得模拟器核心中的状态快照对象 </summary>
|
/// <summary> 获得模拟器核心中的状态快照对象 </summary>
|
||||||
object GetState();
|
public abstract object GetState();
|
||||||
/// <summary> 获得模拟器核心中的状态快照字节数据 </summary>
|
/// <summary> 获得模拟器核心中的状态快照字节数据 </summary>
|
||||||
byte[] GetStateBytes();
|
public abstract byte[] GetStateBytes();
|
||||||
/// <summary> 加载状态快照 </summary>
|
/// <summary> 加载状态快照 </summary>
|
||||||
/// <param name="state">该对象应该来自核心的<see cref="GetState"/>方法的返回值,或是从<see cref="GetStateBytes"/>返回的byte数组构建</param>
|
/// <param name="state">该对象应该来自核心的<see cref="GetState"/>方法的返回值,或是从<see cref="GetStateBytes"/>返回的byte数组构建</param>
|
||||||
void LoadState(object state);
|
public abstract void LoadState(object state);
|
||||||
/// <summary> 加载状态快照 </summary>
|
/// <summary> 加载状态快照 </summary>
|
||||||
/// <param name="data">该对象应该来自核心的<see cref="GetStateBytes"/>返回的byte数组</param>
|
/// <param name="data">该对象应该来自核心的<see cref="GetStateBytes"/>返回的byte数组</param>
|
||||||
void LoadStateFromBytes(byte[] data);
|
public abstract void LoadStateFromBytes(byte[] data);
|
||||||
/// <summary> 暂停核心推帧 </summary>
|
/// <summary> 暂停核心推帧 </summary>
|
||||||
void Pause();
|
public abstract void Pause();
|
||||||
/// <summary> 恢复核心推帧(从Pause状态恢复) </summary>
|
/// <summary> 恢复核心推帧(从Pause状态恢复) </summary>
|
||||||
void Resume();
|
public abstract void Resume();
|
||||||
/// <summary> 启动模拟器逻辑 </summary>
|
/// <summary> 启动模拟器逻辑 </summary>
|
||||||
MsgBool StartGame(RomFile romFile);
|
public abstract MsgBool StartGame(RomFile romFile);
|
||||||
/// <summary> 释放模拟器核心 </summary>
|
/// <summary> 释放模拟器核心 </summary>
|
||||||
void Dispose();
|
public abstract void Dispose();
|
||||||
/// <summary> 重置核心,通常由模拟器核心提供的功能 </summary>
|
/// <summary> 重置核心,通常由模拟器核心提供的功能 </summary>
|
||||||
void DoReset();
|
public abstract void DoReset();
|
||||||
/// <summary> 获得模拟器核心的控制器设置器 </summary>
|
/// <summary> 获得模拟器核心的控制器设置器 </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
IControllerSetuper GetControllerSetuper();
|
public abstract IControllerSetuper GetControllerSetuper();
|
||||||
/// <summary> 核心所属平台 </summary>
|
/// <summary> 核心所属平台 </summary>
|
||||||
RomPlatformType Platform { get; }
|
public abstract RomPlatformType Platform { get; }
|
||||||
/// <summary> 获取当前模拟器帧序号,在加载快照和Reset后,应当重置为0 </summary>
|
/// <summary> 获取当前模拟器帧序号,在加载快照和Reset后,应当重置为0 </summary>
|
||||||
uint Frame { get; }
|
public abstract uint Frame { get; }
|
||||||
/// <summary> 模拟器核心推帧 </summary>
|
|
||||||
bool PushEmulatorFrame();
|
|
||||||
/// <summary> 模拟器核心推帧结束 </summary>
|
|
||||||
void AfterPushFrame();
|
|
||||||
public void GetAudioParams(out int frequency, out int channels);
|
|
||||||
Texture OutputPixel { get; }
|
|
||||||
RawImage DrawCanvas { get; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class IEnumCoreTool
|
public abstract bool PushEmulatorFrame();
|
||||||
|
/// <summary> 模拟器核心推帧结束 </summary>
|
||||||
|
public abstract void AfterPushFrame();
|
||||||
|
public abstract void GetAudioParams(out int frequency, out int channels);
|
||||||
|
public abstract Texture OutputPixel { get; }
|
||||||
|
public abstract RawImage DrawCanvas { get; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public abstract class EmuCore<INPUTDATA> : IEmuCore
|
||||||
{
|
{
|
||||||
public static bool IsNull(this IEmuCore core)
|
public sealed override bool PushEmulatorFrame()
|
||||||
{
|
{
|
||||||
if (core == null) return true;
|
if (SampleInputData(out var inputData))
|
||||||
return core.Equals(null);
|
{
|
||||||
}
|
return OnPushEmulatorFrame(inputData);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
ulong m_lastTestInput;
|
||||||
|
protected bool SampleInputData(out INPUTDATA inputData)
|
||||||
|
{
|
||||||
|
bool result = false;
|
||||||
|
inputData = default(INPUTDATA);
|
||||||
|
|
||||||
|
if (InGameUI.Instance.IsNetPlay)
|
||||||
|
{
|
||||||
|
ReplayStep replayData;
|
||||||
|
int frameDiff;
|
||||||
|
bool inputDiff;
|
||||||
|
|
||||||
|
if (App.roomMgr.netReplay.TryGetNextFrame((int)Frame, out replayData, out frameDiff, out inputDiff))
|
||||||
|
{
|
||||||
|
if (inputDiff)
|
||||||
|
{
|
||||||
|
App.log.Debug($"{DateTime.Now.ToString("hh:mm:ss.fff")} TryGetNextFrame remoteFrame->{App.roomMgr.netReplay.mRemoteFrameIdx} diff->{frameDiff} " +
|
||||||
|
$"frame=>{replayData.FrameStartID} InPut=>{replayData.InPut}");
|
||||||
|
}
|
||||||
|
|
||||||
|
inputData = ConvertInputDataFromNet(replayData);
|
||||||
|
result = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
result = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var localState = GetLocalInput();
|
||||||
|
var rawData = InputDataToNet(localState);
|
||||||
|
if (m_lastTestInput != rawData)
|
||||||
|
{
|
||||||
|
m_lastTestInput = rawData;
|
||||||
|
App.log.Debug($"{DateTime.Now.ToString("hh:mm:ss.fff")} Input F:{App.roomMgr.netReplay.mCurrClientFrameIdx} | I:{rawData}");
|
||||||
|
}
|
||||||
|
App.roomMgr.SendRoomSingelPlayerInput(Frame, rawData);
|
||||||
|
}
|
||||||
|
else//单机模式
|
||||||
|
{
|
||||||
|
inputData = GetLocalInput();
|
||||||
|
result = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract INPUTDATA GetLocalInput();
|
||||||
|
protected abstract INPUTDATA ConvertInputDataFromNet(ReplayStep step);
|
||||||
|
protected abstract ulong InputDataToNet(INPUTDATA inputData);
|
||||||
|
/// <summary> 模拟器核心推帧 </summary>
|
||||||
|
protected abstract bool OnPushEmulatorFrame(INPUTDATA InputData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#pragma warning restore CS0618 // 类型或成员已过时
|
||||||
|
|||||||
@ -29,7 +29,7 @@ namespace AxibugEmuOnline.Client.Manager
|
|||||||
private void OnSelfJoinRoom()
|
private void OnSelfJoinRoom()
|
||||||
{
|
{
|
||||||
//如果当前正在游戏中,就先结束游戏
|
//如果当前正在游戏中,就先结束游戏
|
||||||
if (!m_emuCore.IsNull()) StopGame();
|
if (m_emuCore != null) StopGame();
|
||||||
|
|
||||||
var roomInfo = App.roomMgr.mineRoomMiniInfo;
|
var roomInfo = App.roomMgr.mineRoomMiniInfo;
|
||||||
roomInfo.FetchRomFileInRoomInfo((_, romFile) =>
|
roomInfo.FetchRomFileInRoomInfo((_, romFile) =>
|
||||||
@ -48,7 +48,7 @@ namespace AxibugEmuOnline.Client.Manager
|
|||||||
|
|
||||||
public void BeginGame(RomFile romFile)
|
public void BeginGame(RomFile romFile)
|
||||||
{
|
{
|
||||||
if (!m_emuCore.IsNull()) return;
|
if (m_emuCore != null) return;
|
||||||
|
|
||||||
switch (romFile.Platform)
|
switch (romFile.Platform)
|
||||||
{
|
{
|
||||||
@ -120,7 +120,7 @@ namespace AxibugEmuOnline.Client.Manager
|
|||||||
|
|
||||||
public void StopGame()
|
public void StopGame()
|
||||||
{
|
{
|
||||||
if (m_emuCore.IsNull()) return;
|
if (m_emuCore == null) return;
|
||||||
m_emuCore.Dispose();
|
m_emuCore.Dispose();
|
||||||
GameObject.Destroy(m_emuCore.gameObject);
|
GameObject.Destroy(m_emuCore.gameObject);
|
||||||
m_emuCore = null;
|
m_emuCore = null;
|
||||||
@ -133,7 +133,7 @@ namespace AxibugEmuOnline.Client.Manager
|
|||||||
|
|
||||||
public void ResetGame()
|
public void ResetGame()
|
||||||
{
|
{
|
||||||
if (m_emuCore.IsNull()) return;
|
if (m_emuCore == null) return;
|
||||||
|
|
||||||
m_emuCore.DoReset();
|
m_emuCore.DoReset();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b5c1ebe19e88e8840b17582b45643281
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -0,0 +1,161 @@
|
|||||||
|
using Assets.Script.AppMain.Filter;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace AxibugEmuOnline.Client.Filters
|
||||||
|
{
|
||||||
|
[Strip(RuntimePlatform.PSP2)]
|
||||||
|
public class RLPRO_CRT : FilterEffect
|
||||||
|
{
|
||||||
|
public override string Name => nameof(RLPRO_CRT);
|
||||||
|
protected override string ShaderName => null;
|
||||||
|
|
||||||
|
#region BleedPass_Param
|
||||||
|
public FilterParameter<EnumBleedMode> BleedMode = EnumBleedMode.NTSCOld3Phase;
|
||||||
|
[Range(0, 15)]
|
||||||
|
public FloatParameter BleedAmount = 1f;
|
||||||
|
#endregion
|
||||||
|
#region CRTAperture_Param
|
||||||
|
[Range(0, 5)]
|
||||||
|
public FloatParameter GlowHalation = 0.1f;
|
||||||
|
[Range(0, 2)]
|
||||||
|
public FloatParameter GlowDifusion = 0.05f;
|
||||||
|
[Range(0, 2)]
|
||||||
|
public FloatParameter MaskColors = 2.0f;
|
||||||
|
[Range(0, 1)]
|
||||||
|
public FloatParameter MaskStrength = 0.3f;
|
||||||
|
[Range(0, 5)]
|
||||||
|
public FloatParameter GammaInput = 2.4f;
|
||||||
|
[Range(0, 5)]
|
||||||
|
public FloatParameter GammaOutput = 2.4f;
|
||||||
|
[Range(0, 2.5f)]
|
||||||
|
public FloatParameter Brightness = 1.5f;
|
||||||
|
#endregion
|
||||||
|
#region TV_Effect_Param
|
||||||
|
public FilterParameter<EnumWrapMode> WrapMode = EnumWrapMode.SimpleWrap;
|
||||||
|
[Range(0f, 2f)]
|
||||||
|
public FloatParameter maskDark = 0.5f;
|
||||||
|
[Range(0f, 2f)]
|
||||||
|
public FloatParameter maskLight = 1.5f;
|
||||||
|
[Range(-8f, -16f)]
|
||||||
|
public FloatParameter hardScan = -8.0f;
|
||||||
|
[Range(-3f, 1f)]
|
||||||
|
public FloatParameter hardPix = -3.0f;
|
||||||
|
public Vector2Parameter warp = new Vector2(0.03125f, 0.04166f);
|
||||||
|
[Range(1f, 16f)]
|
||||||
|
public FloatParameter resScale = 4f;
|
||||||
|
[Range(0.5f, 5f)]
|
||||||
|
public FloatParameter scale = 1f;
|
||||||
|
[Range(0f, 1f)]
|
||||||
|
public FloatParameter fade = 1f;
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
Material m_bleedMat;
|
||||||
|
Material m_crtApertureMat;
|
||||||
|
Material m_tvEffectMat;
|
||||||
|
|
||||||
|
protected override void OnInit(Material renderMat)
|
||||||
|
{
|
||||||
|
m_bleedMat = new Material(Shader.Find("Filter/RLPro_Bleed"));
|
||||||
|
m_crtApertureMat = new Material(Shader.Find("Filter/RLPro_CRT_Aperture"));
|
||||||
|
m_tvEffectMat = new Material(Shader.Find("Filter/RLPro_TV_Effect"));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void OnRenderer(Material renderMat, Texture src, RenderTexture result)
|
||||||
|
{
|
||||||
|
var rt1 = BleedPass(src);
|
||||||
|
var rt2 = CRT_AperturePass(rt1);
|
||||||
|
var rt3 = TV_Effect_Pass(rt2);
|
||||||
|
|
||||||
|
Graphics.Blit(rt3, result);
|
||||||
|
|
||||||
|
RenderTexture.ReleaseTemporary(rt1);
|
||||||
|
RenderTexture.ReleaseTemporary(rt2);
|
||||||
|
RenderTexture.ReleaseTemporary(rt3);
|
||||||
|
}
|
||||||
|
|
||||||
|
private RenderTexture BleedPass(Texture src)
|
||||||
|
{
|
||||||
|
var rt = RenderTexture.GetTemporary(src.width, src.height);
|
||||||
|
|
||||||
|
m_bleedMat.DisableKeyword("_NTSCOld3Phase");
|
||||||
|
m_bleedMat.DisableKeyword("_NTSC3Phase");
|
||||||
|
m_bleedMat.DisableKeyword("_NTSC2Phase");
|
||||||
|
|
||||||
|
switch (BleedMode.GetValue())
|
||||||
|
{
|
||||||
|
case EnumBleedMode.NTSCOld3Phase:
|
||||||
|
m_bleedMat.EnableKeyword("_NTSCOld3Phase");
|
||||||
|
break;
|
||||||
|
case EnumBleedMode.NTSC3Phase:
|
||||||
|
m_bleedMat.EnableKeyword("_NTSC3Phase");
|
||||||
|
break;
|
||||||
|
case EnumBleedMode.NTSC2Phase:
|
||||||
|
m_bleedMat.EnableKeyword("_NTSC2Phase");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
m_bleedMat.SetFloat("bleedAmount", BleedAmount.GetValue());
|
||||||
|
|
||||||
|
Graphics.Blit(src, rt, m_bleedMat);
|
||||||
|
|
||||||
|
return rt;
|
||||||
|
}
|
||||||
|
private RenderTexture CRT_AperturePass(Texture src)
|
||||||
|
{
|
||||||
|
var rt = RenderTexture.GetTemporary(src.width, src.height);
|
||||||
|
|
||||||
|
m_crtApertureMat.SetFloat("GLOW_HALATION", GlowHalation.GetValue());
|
||||||
|
m_crtApertureMat.SetFloat("GLOW_DIFFUSION", GlowDifusion.GetValue());
|
||||||
|
m_crtApertureMat.SetFloat("MASK_COLORS", MaskColors.GetValue());
|
||||||
|
m_crtApertureMat.SetFloat("MASK_STRENGTH", MaskStrength.GetValue());
|
||||||
|
m_crtApertureMat.SetFloat("GAMMA_INPUT", GammaInput.GetValue());
|
||||||
|
m_crtApertureMat.SetFloat("GAMMA_OUTPUT", GammaOutput.GetValue());
|
||||||
|
m_crtApertureMat.SetFloat("BRIGHTNESS", Brightness.GetValue());
|
||||||
|
|
||||||
|
Graphics.Blit(src, rt, m_crtApertureMat);
|
||||||
|
|
||||||
|
return rt;
|
||||||
|
}
|
||||||
|
private RenderTexture TV_Effect_Pass(Texture src)
|
||||||
|
{
|
||||||
|
var rt = RenderTexture.GetTemporary(src.width, src.height);
|
||||||
|
|
||||||
|
m_tvEffectMat.DisableKeyword("_SimpleWrap");
|
||||||
|
m_tvEffectMat.DisableKeyword("_CubicDistortion");
|
||||||
|
|
||||||
|
switch (WrapMode.GetValue())
|
||||||
|
{
|
||||||
|
case EnumWrapMode.SimpleWrap:
|
||||||
|
m_tvEffectMat.EnableKeyword("_SimpleWrap"); break;
|
||||||
|
case EnumWrapMode.CubicDistortion:
|
||||||
|
m_tvEffectMat.EnableKeyword("_CubicDistortion"); break;
|
||||||
|
}
|
||||||
|
|
||||||
|
m_tvEffectMat.SetFloat("maskDark", maskDark.GetValue());
|
||||||
|
m_tvEffectMat.SetFloat("maskLight", maskLight.GetValue());
|
||||||
|
m_tvEffectMat.SetFloat("hardScan", hardScan.GetValue());
|
||||||
|
m_tvEffectMat.SetFloat("hardPix", hardPix.GetValue());
|
||||||
|
m_tvEffectMat.SetVector("warp", warp.GetValue());
|
||||||
|
m_tvEffectMat.SetFloat("resScale", resScale.GetValue());
|
||||||
|
m_tvEffectMat.SetFloat("scale", scale.GetValue());
|
||||||
|
m_tvEffectMat.SetFloat("fade", fade.GetValue());
|
||||||
|
|
||||||
|
Graphics.Blit(src, rt, m_tvEffectMat);
|
||||||
|
|
||||||
|
return rt;
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum EnumBleedMode
|
||||||
|
{
|
||||||
|
NTSCOld3Phase,
|
||||||
|
NTSC3Phase,
|
||||||
|
NTSC2Phase,
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum EnumWrapMode
|
||||||
|
{
|
||||||
|
SimpleWrap,
|
||||||
|
CubicDistortion
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fcc83c5bfa946f748811247794560a56
|
||||||
@ -0,0 +1,175 @@
|
|||||||
|
Shader "Filter/RLPro_Bleed"
|
||||||
|
{
|
||||||
|
Properties
|
||||||
|
{
|
||||||
|
_MainTex ("Base (RGB)", 2D) = "white" {}
|
||||||
|
}
|
||||||
|
SubShader
|
||||||
|
{
|
||||||
|
Pass
|
||||||
|
{
|
||||||
|
CGPROGRAM
|
||||||
|
|
||||||
|
#pragma shader_feature_local _NTSCOld3Phase _NTSC3Phase _NTSC2Phase
|
||||||
|
#pragma vertex vert_img
|
||||||
|
#pragma fragment frag
|
||||||
|
#include "UnityCG.cginc"
|
||||||
|
|
||||||
|
sampler2D _MainTex;
|
||||||
|
float4 _MainTex_TexelSize;
|
||||||
|
float2 _iResolution;
|
||||||
|
|
||||||
|
float bleedAmount = 1.0;
|
||||||
|
int bleedLength = 21;
|
||||||
|
|
||||||
|
struct v2f
|
||||||
|
{
|
||||||
|
float4 pos : POSITION;
|
||||||
|
float2 uv : TEXCOORD0;
|
||||||
|
};
|
||||||
|
|
||||||
|
half3 rgb2yiq(half3 c)
|
||||||
|
{
|
||||||
|
return half3(
|
||||||
|
(0.2989 * c.x + 0.5959 * c.y + 0.2115 * c.z),
|
||||||
|
(0.5870 * c.x - 0.2744 * c.y - 0.5229 * c.z),
|
||||||
|
(0.1140 * c.x - 0.3216 * c.y + 0.3114 * c.z)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
half3 yiq2rgb(half3 c)
|
||||||
|
{
|
||||||
|
return half3(
|
||||||
|
(1.0 * c.x + 1.0 * c.y + 1.0 * c.z),
|
||||||
|
(0.956 * c.x - 0.2720 * c.y - 1.1060 * c.z),
|
||||||
|
(0.6210 * c.x - 0.6474 * c.y + 1.7046 * c.z)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
half3 t2d(float2 p)
|
||||||
|
{
|
||||||
|
half3 col = tex2D(_MainTex, p).rgb;
|
||||||
|
|
||||||
|
return rgb2yiq(col);
|
||||||
|
}
|
||||||
|
|
||||||
|
#define fixCoord (p - float2( 0.5 * ONE_X, 0.0))
|
||||||
|
#define fetch_offset(offset, one_x) t2d(fixCoord + float2( (offset) * (ONE_X), 0.0));
|
||||||
|
#define get_t2d(offset, one_x) tex2D(_MainTex, p + (offset)*(one_x)).rgb;
|
||||||
|
|
||||||
|
float4 FragNTSCOld3Phase(v2f i) : COLOR
|
||||||
|
{
|
||||||
|
float2 uv = i.uv;
|
||||||
|
float2 p = uv;
|
||||||
|
float ONE_X = 1.0 / _ScreenParams.x;
|
||||||
|
|
||||||
|
ONE_X *= bleedAmount;
|
||||||
|
bleedLength = 25;
|
||||||
|
float maxTexLength = 50.0;
|
||||||
|
float luma_filter[25]; luma_filter[0] = -0.000071070; luma_filter[1] = -0.000032816; luma_filter[2] = 0.000128784; luma_filter[3] = 0.000134711; luma_filter[4] = -0.000226705; luma_filter[5] = -0.000777988; luma_filter[6] = -0.000997809; luma_filter[7] = -0.000522802; luma_filter[8] = 0.000344691; luma_filter[9] = 0.000768930; luma_filter[10] = 0.000275591; luma_filter[11] = -0.000373434; luma_filter[12] = 0.000522796; luma_filter[13] = 0.003813817; luma_filter[14] = 0.007502825; luma_filter[15] = 0.006786001; luma_filter[16] = -0.002636726; luma_filter[17] = -0.019461182; luma_filter[18] = -0.033792479; luma_filter[19] = -0.029921972; luma_filter[20] = 0.005032552; luma_filter[21] = 0.071226466; luma_filter[22] = 0.151755921; luma_filter[23] = 0.218166470; luma_filter[24] = 0.243902439;
|
||||||
|
float chroma_filter[24 + 1]; chroma_filter[0] = 0.001845562; chroma_filter[1] = 0.002381606; chroma_filter[2] = 0.003040177; chroma_filter[3] = 0.003838976; chroma_filter[4] = 0.004795341; chroma_filter[5] = 0.005925312; chroma_filter[6] = 0.007242534; chroma_filter[7] = 0.008757043; chroma_filter[8] = 0.010473987; chroma_filter[9] = 0.012392365; chroma_filter[10] = 0.014503872; chroma_filter[11] = 0.016791957; chroma_filter[12] = 0.019231195; chroma_filter[13] = 0.021787070; chroma_filter[14] = 0.024416251; chroma_filter[15] = 0.027067414; chroma_filter[16] = 0.029682613; chroma_filter[17] = 0.032199202; chroma_filter[18] = 0.034552198; chroma_filter[19] = 0.036677005; chroma_filter[20] = 0.038512317; chroma_filter[21] = 0.040003044; chroma_filter[22] = 0.041103048; chroma_filter[23] = 0.041777517; chroma_filter[24] = 0.042004791;
|
||||||
|
half3 signal = half3(0.0,0.0,0.0);
|
||||||
|
half3 norm = half3(0.0,0.0,0.0);
|
||||||
|
half3 adj = half3(0.0,0.0,0.0);
|
||||||
|
int taps = bleedLength - 4;
|
||||||
|
for (int ii = 0; ii < taps % 1023; ii++)
|
||||||
|
{
|
||||||
|
float offset = float(ii);
|
||||||
|
half3 sums = fetch_offset(offset - float(taps), ONE_X) + fetch_offset(float(taps) - offset, ONE_X);
|
||||||
|
adj = half3(luma_filter[ii + 3], chroma_filter[ii], chroma_filter[ii]);
|
||||||
|
signal += sums * adj;
|
||||||
|
norm += adj;
|
||||||
|
}
|
||||||
|
adj = half3(luma_filter[taps], chroma_filter[taps], chroma_filter[taps]);
|
||||||
|
half4 col23 = tex2D(_MainTex, fixCoord);
|
||||||
|
signal += rgb2yiq(col23.rgb) * adj;
|
||||||
|
norm += adj;
|
||||||
|
signal = signal / norm;
|
||||||
|
float3 rgb = yiq2rgb(signal);
|
||||||
|
|
||||||
|
float alpha = col23.a + (rgb.r + rgb.g + rgb.b) / 3;
|
||||||
|
return half4(rgb, alpha);
|
||||||
|
}
|
||||||
|
|
||||||
|
float4 FragNTSC3Phase(v2f i) : COLOR
|
||||||
|
{
|
||||||
|
float2 uv = i.uv;
|
||||||
|
float2 p = uv;
|
||||||
|
float ONE_X = 1.0 / _iResolution.x;
|
||||||
|
|
||||||
|
ONE_X *= bleedAmount;
|
||||||
|
bleedLength = 25;
|
||||||
|
float maxTexLength = 50.0;
|
||||||
|
float luma_filter[25]; luma_filter[0] = -0.000012020; luma_filter[1] = -0.000022146; luma_filter[2] = -0.000013155; luma_filter[3] = -0.000012020; luma_filter[4] = -0.000049979; luma_filter[5] = -0.000113940; luma_filter[6] = -0.000122150; luma_filter[7] = -0.000005612; luma_filter[8] = 0.000170516; luma_filter[9] = 0.000237199; luma_filter[10] = 0.000169640; luma_filter[11] = 0.000285688; luma_filter[12] = 0.000984574; luma_filter[13] = 0.002018683; luma_filter[14] = 0.002002275; luma_filter[15] = -0.000909882; luma_filter[16] = -0.007049081; luma_filter[17] = -0.013222860; luma_filter[18] = -0.012606931; luma_filter[19] = 0.002460860; luma_filter[20] = 0.035868225; luma_filter[21] = 0.084016453; luma_filter[22] = 0.135563500; luma_filter[23] = 0.175261268; luma_filter[24] = 0.190176552;
|
||||||
|
float chroma_filter[25]; chroma_filter[0] = -0.000118847; chroma_filter[1] = -0.000271306; chroma_filter[2] = -0.000502642; chroma_filter[3] = -0.000930833; chroma_filter[4] = -0.001451013; chroma_filter[5] = -0.002064744; chroma_filter[6] = -0.002700432; chroma_filter[7] = -0.003241276; chroma_filter[8] = -0.003524948; chroma_filter[9] = -0.003350284; chroma_filter[10] = -0.002491729; chroma_filter[11] = -0.000721149; chroma_filter[12] = 0.002164659; chroma_filter[13] = 0.006313635; chroma_filter[14] = 0.011789103; chroma_filter[15] = 0.018545660; chroma_filter[16] = 0.026414396; chroma_filter[17] = 0.035100710; chroma_filter[18] = 0.044196567; chroma_filter[19] = 0.053207202; chroma_filter[20] = 0.061590275; chroma_filter[21] = 0.068803602; chroma_filter[22] = 0.074356193; chroma_filter[23] = 0.077856564; chroma_filter[24] = 0.079052396;
|
||||||
|
half3 signal = half3(0.0,0.0,0.0);
|
||||||
|
half3 norm = half3(0.0,0.0,0.0);
|
||||||
|
half3 adj = half3(0.0,0.0,0.0);
|
||||||
|
int taps = bleedLength - 4;
|
||||||
|
for (int ii = 0; ii < taps % 1023; ii++)
|
||||||
|
{
|
||||||
|
float offset = float(ii);
|
||||||
|
half3 sums = fetch_offset(offset - float(taps), ONE_X) + fetch_offset(float(taps) - offset, ONE_X);
|
||||||
|
adj = half3(luma_filter[ii + 3], chroma_filter[ii], chroma_filter[ii]);
|
||||||
|
signal += sums * adj;
|
||||||
|
norm += adj;
|
||||||
|
}
|
||||||
|
adj = half3(luma_filter[taps], chroma_filter[taps], chroma_filter[taps]);
|
||||||
|
half4 col23 = tex2D(_MainTex, fixCoord);
|
||||||
|
signal += rgb2yiq(col23.rgb) * adj;
|
||||||
|
norm += adj;
|
||||||
|
signal = signal / norm;
|
||||||
|
float3 rgb = yiq2rgb(signal);
|
||||||
|
|
||||||
|
float alpha = col23.a + (rgb.r + rgb.g + rgb.b) / 3;
|
||||||
|
return half4(rgb, alpha);
|
||||||
|
}
|
||||||
|
|
||||||
|
float4 FragNTSC2Phase(v2f i) : COLOR
|
||||||
|
{
|
||||||
|
float2 uv = i.uv;
|
||||||
|
float2 p = uv;
|
||||||
|
float ONE_X = 1.0 / _ScreenParams.x;
|
||||||
|
|
||||||
|
ONE_X *= bleedAmount;
|
||||||
|
bleedLength = 33;
|
||||||
|
float maxTexLength = 50.0;
|
||||||
|
float luma_filter[33]; luma_filter[0] = -0.000174844; luma_filter[1] = -0.000205844; luma_filter[2] = -0.000149453; luma_filter[3] = -0.000051693; luma_filter[4] = 0.000000000; luma_filter[5] = -0.000066171; luma_filter[6] = -0.000245058; luma_filter[7] = -0.000432928; luma_filter[8] = -0.000472644; luma_filter[9] = -0.000252236; luma_filter[10] = 0.000198929; luma_filter[11] = 0.000687058; luma_filter[12] = 0.000944112; luma_filter[13] = 0.000803467; luma_filter[14] = 0.000363199; luma_filter[15] = 0.000013422; luma_filter[16] = 0.000253402; luma_filter[17] = 0.001339461; luma_filter[18] = 0.002932972; luma_filter[19] = 0.003983485; luma_filter[20] = 0.003026683; luma_filter[21] = -0.001102056; luma_filter[22] = -0.008373026; luma_filter[23] = -0.016897700; luma_filter[24] = -0.022914480; luma_filter[25] = -0.021642347; luma_filter[26] = -0.008863273; luma_filter[27] = 0.017271957; luma_filter[28] = 0.054921920; luma_filter[29] = 0.098342579; luma_filter[30] = 0.139044281; luma_filter[31] = 0.168055832; luma_filter[32] = 0.178571429;
|
||||||
|
float chroma_filter[33]; chroma_filter[0] = 0.001384762; chroma_filter[1] = 0.001678312; chroma_filter[2] = 0.002021715; chroma_filter[3] = 0.002420562; chroma_filter[4] = 0.002880460; chroma_filter[5] = 0.003406879; chroma_filter[6] = 0.004004985; chroma_filter[7] = 0.004679445; chroma_filter[8] = 0.005434218; chroma_filter[9] = 0.006272332; chroma_filter[10] = 0.007195654; chroma_filter[11] = 0.008204665; chroma_filter[12] = 0.009298238; chroma_filter[13] = 0.010473450; chroma_filter[14] = 0.011725413; chroma_filter[15] = 0.013047155; chroma_filter[16] = 0.014429548; chroma_filter[17] = 0.015861306; chroma_filter[18] = 0.017329037; chroma_filter[19] = 0.018817382; chroma_filter[20] = 0.020309220; chroma_filter[21] = 0.021785952; chroma_filter[22] = 0.023227857; chroma_filter[23] = 0.024614500; chroma_filter[24] = 0.025925203; chroma_filter[25] = 0.027139546; chroma_filter[26] = 0.028237893; chroma_filter[27] = 0.029201910; chroma_filter[28] = 0.030015081; chroma_filter[29] = 0.030663170; chroma_filter[30] = 0.031134640; chroma_filter[31] = 0.031420995; chroma_filter[32] = 0.031517031;
|
||||||
|
half3 signal = half3(0.0,0.0,0.0);
|
||||||
|
half3 norm = half3(0.0,0.0,0.0);
|
||||||
|
half3 adj = half3(0.0,0.0,0.0);
|
||||||
|
int taps = bleedLength - 4;
|
||||||
|
for (int ii = 0; ii < taps % 1023; ii++)
|
||||||
|
{
|
||||||
|
float offset = float(ii);
|
||||||
|
half3 sums = fetch_offset(offset - float(taps), ONE_X) + fetch_offset(float(taps) - offset, ONE_X);
|
||||||
|
adj = half3(luma_filter[ii + 3], chroma_filter[ii], chroma_filter[ii]);
|
||||||
|
signal += sums * adj;
|
||||||
|
norm += adj;
|
||||||
|
}
|
||||||
|
adj = half3(luma_filter[taps], chroma_filter[taps], chroma_filter[taps]);
|
||||||
|
half4 col23 = tex2D(_MainTex, fixCoord);
|
||||||
|
signal += rgb2yiq(col23.rgb) * adj;
|
||||||
|
norm += adj;
|
||||||
|
signal = signal / norm;
|
||||||
|
float3 rgb = yiq2rgb(signal);
|
||||||
|
|
||||||
|
float alpha = col23.a + (rgb.r + rgb.g + rgb.b) / 3;
|
||||||
|
return half4(rgb, alpha);
|
||||||
|
}
|
||||||
|
|
||||||
|
fixed4 frag (v2f i) : SV_Target
|
||||||
|
{
|
||||||
|
#if _NTSCOld3Phase
|
||||||
|
return FragNTSCOld3Phase(i);
|
||||||
|
#elif _NTSC3Phase
|
||||||
|
return FragNTSC3Phase(i);
|
||||||
|
#else
|
||||||
|
return FragNTSC2Phase(i);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
ENDCG
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d7b367e99136835468184ea471e79e02
|
||||||
|
ShaderImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
defaultTextures: []
|
||||||
|
nonModifiableTextures: []
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -0,0 +1,144 @@
|
|||||||
|
Shader "Filter/RLPro_CRT_Aperture"
|
||||||
|
{
|
||||||
|
Properties
|
||||||
|
{
|
||||||
|
_MainTex ("Base (RGB)", 2D) = "white" {}
|
||||||
|
}
|
||||||
|
SubShader
|
||||||
|
{
|
||||||
|
Pass
|
||||||
|
{
|
||||||
|
CGPROGRAM
|
||||||
|
|
||||||
|
#pragma shader_feature_local _NTSCOld3Phase _NTSC3Phase _NTSC2Phase
|
||||||
|
#pragma vertex vert_img
|
||||||
|
#pragma fragment Frag0
|
||||||
|
#include "UnityCG.cginc"
|
||||||
|
|
||||||
|
#define FIX(c) max(abs(c), 1e-5)
|
||||||
|
#define saturate(c) clamp(c, 0.0, 1.0)
|
||||||
|
#define PI 3.14159265359
|
||||||
|
|
||||||
|
sampler2D _MainTex;
|
||||||
|
float4 _MainTex_TexelSize;
|
||||||
|
float2 _iResolution;
|
||||||
|
|
||||||
|
float GLOW_HALATION = 0.1;
|
||||||
|
float GLOW_DIFFUSION = 0.05;
|
||||||
|
float MASK_COLORS = 2.0;
|
||||||
|
float MASK_STRENGTH = 0.3;
|
||||||
|
float GAMMA_INPUT = 2.4;
|
||||||
|
float GAMMA_OUTPUT = 2.4;
|
||||||
|
float BRIGHTNESS = 1.5;
|
||||||
|
|
||||||
|
struct v2f
|
||||||
|
{
|
||||||
|
float4 pos : POSITION;
|
||||||
|
float2 uv : TEXCOORD0;
|
||||||
|
};
|
||||||
|
|
||||||
|
float mod(float x, float y)
|
||||||
|
{
|
||||||
|
return x - y * floor(x / y);
|
||||||
|
}
|
||||||
|
|
||||||
|
float fract(float x)
|
||||||
|
{
|
||||||
|
return x - floor(x);
|
||||||
|
}
|
||||||
|
|
||||||
|
float2 fract(float2 x)
|
||||||
|
{
|
||||||
|
return x - floor(x);
|
||||||
|
}
|
||||||
|
|
||||||
|
float4 fract(float4 x)
|
||||||
|
{
|
||||||
|
return x - floor(x);
|
||||||
|
}
|
||||||
|
|
||||||
|
float3 TEX2D(float2 c)
|
||||||
|
{
|
||||||
|
return pow(abs(tex2D(_MainTex, c).rgb), float3(GAMMA_INPUT, GAMMA_INPUT, GAMMA_INPUT)).xyz;
|
||||||
|
}
|
||||||
|
|
||||||
|
float3x3 get_color_matrix(float2 co, float2 dx)
|
||||||
|
{
|
||||||
|
return float3x3(TEX2D(co - dx), TEX2D(co), TEX2D(co + dx));
|
||||||
|
}
|
||||||
|
|
||||||
|
float3 blur(float3x3 m, float dist, float rad)
|
||||||
|
{
|
||||||
|
float3 x = float3(dist - 1.0, dist, dist + 1.0) / rad;
|
||||||
|
float3 w = exp2(x * x * -1.0);
|
||||||
|
|
||||||
|
return (m[0] * w.x + m[1] * w.y + m[2] * w.z) / (w.x + w.y + w.z);
|
||||||
|
}
|
||||||
|
|
||||||
|
float3 filter_gaussian(float2 co, float2 tex_size)
|
||||||
|
{
|
||||||
|
float2 dx = float2(1.0 / tex_size.x, 0.0);
|
||||||
|
float2 dy = float2(0.0, 1.0 / tex_size.y);
|
||||||
|
float2 pix_co = co * tex_size;
|
||||||
|
float2 tex_co = (floor(pix_co) + 0.5) / tex_size;
|
||||||
|
float2 dist = (fract(pix_co) - 0.5) * -1.0;
|
||||||
|
float3x3 line0 = get_color_matrix(tex_co - dy, dx);
|
||||||
|
float3x3 line1 = get_color_matrix(tex_co, dx);
|
||||||
|
float3x3 line2 = get_color_matrix(tex_co + dy, dx);
|
||||||
|
float3x3 column = float3x3(blur(line0, dist.x, 0.5), blur(line1, dist.x, 0.5), blur(line2, dist.x, 0.5));
|
||||||
|
return blur(column, dist.y, 0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
float3 filter_lanczos(float2 co, float2 tex_size, float sharp)
|
||||||
|
{
|
||||||
|
tex_size.x *= sharp;
|
||||||
|
|
||||||
|
float2 dx = float2(1.0 / tex_size.x, 0.0);
|
||||||
|
float2 pix_co = co * tex_size - float2(0.5, 0.0);
|
||||||
|
float2 tex_co = (floor(pix_co) + float2(0.5, 0.001)) / tex_size;
|
||||||
|
float2 dist = fract(pix_co);
|
||||||
|
float4 coef = PI * float4(dist.x + 1.0, dist.x, dist.x - 1.0, dist.x - 2.0);
|
||||||
|
coef = FIX(coef);
|
||||||
|
coef = 2.0 * sin(coef) * sin(coef / 2.0) / (coef * coef);
|
||||||
|
coef /= dot(coef, float4(1.0, 1.0, 1.0, 1.0));
|
||||||
|
float4 col1 = float4(TEX2D(tex_co), 1.0);
|
||||||
|
float4 col2 = float4(TEX2D(tex_co + dx), 1.0);
|
||||||
|
float4x4 fkfk = mul(coef.x, float4x4(col1, col1, col2, col2));
|
||||||
|
float4x4 fkfks = mul(coef.y, float4x4(col1, col1, col2, col2));
|
||||||
|
float4x4 fkfkb = mul(coef.z, float4x4(col1, col1, col2, col2));
|
||||||
|
return float3(fkfk[0].x, fkfk[0].y, fkfk[0].z);
|
||||||
|
}
|
||||||
|
|
||||||
|
float3 mix(float3 x, float3 y, float3 a) {
|
||||||
|
return float3(x * (1 - a) + y * a);
|
||||||
|
}
|
||||||
|
|
||||||
|
float3 get_mask_weight(float x)
|
||||||
|
{
|
||||||
|
float i = mod(floor(x), MASK_COLORS);
|
||||||
|
if (i == 0.0) return mix(float3(1.0, 0.0, 1.0), float3(1.0, 0.0, 0.0), MASK_COLORS - 2.0);
|
||||||
|
else if (i == 1.0) return float3(0.0, 1.0, 0.0);
|
||||||
|
else return float3(0.0, 0.0, 1.0);
|
||||||
|
}
|
||||||
|
|
||||||
|
float4 Frag0(v2f i) : SV_Target
|
||||||
|
{
|
||||||
|
float2 pos = i.uv;
|
||||||
|
float3 col_glow = filter_gaussian(pos, _ScreenParams.xy);
|
||||||
|
float3 col_soft = filter_lanczos(pos, _ScreenParams.xy, 1);
|
||||||
|
float3 col_sharp = filter_lanczos(pos, _ScreenParams.xy, 3);
|
||||||
|
float3 col = sqrt(col_sharp * col_soft);
|
||||||
|
col_glow = saturate(col_glow - col);
|
||||||
|
col += col_glow * col_glow * GLOW_HALATION;
|
||||||
|
col = mix(col, col * get_mask_weight(pos.x) * MASK_COLORS, MASK_STRENGTH);
|
||||||
|
col += col_glow * GLOW_DIFFUSION;
|
||||||
|
col = pow(abs(col * BRIGHTNESS), float3(1.0 / GAMMA_OUTPUT, 1.0 / GAMMA_OUTPUT, 1.0 / GAMMA_OUTPUT));
|
||||||
|
half4 col1 = tex2D(_MainTex, pos);
|
||||||
|
float fade = 1;
|
||||||
|
|
||||||
|
return lerp(col1,float4(col, col1.a+(col.r+col.g+col.b)/3),fade);
|
||||||
|
}
|
||||||
|
ENDCG
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f63497435389f8548ab973da8535e1b5
|
||||||
|
ShaderImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
defaultTextures: []
|
||||||
|
nonModifiableTextures: []
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -0,0 +1,162 @@
|
|||||||
|
Shader "Filter/RLPro_TV_Effect"
|
||||||
|
{
|
||||||
|
Properties
|
||||||
|
{
|
||||||
|
_MainTex ("Base (RGB)", 2D) = "white" {}
|
||||||
|
}
|
||||||
|
SubShader
|
||||||
|
{
|
||||||
|
Pass
|
||||||
|
{
|
||||||
|
CGPROGRAM
|
||||||
|
|
||||||
|
#pragma shader_feature_local _SimpleWrap _CubicDistortion
|
||||||
|
#pragma vertex vert_img
|
||||||
|
#pragma fragment Frag
|
||||||
|
#include "UnityCG.cginc"
|
||||||
|
|
||||||
|
sampler2D _MainTex;
|
||||||
|
float4 _MainTex_TexelSize;
|
||||||
|
float2 _iResolution;
|
||||||
|
|
||||||
|
float maskDark = 0.5;
|
||||||
|
float maskLight = 1.5;
|
||||||
|
float hardScan = -8.0;
|
||||||
|
float hardPix = -3.0;
|
||||||
|
float2 warp = float2(1.0 / 32.0, 1.0 / 24.0);
|
||||||
|
float2 res;
|
||||||
|
float resScale;
|
||||||
|
float scale;
|
||||||
|
float fade;
|
||||||
|
|
||||||
|
struct v2f
|
||||||
|
{
|
||||||
|
float4 pos : POSITION;
|
||||||
|
float2 uv : TEXCOORD0;
|
||||||
|
};
|
||||||
|
|
||||||
|
float3 Fetch(float2 pos, float2 off)
|
||||||
|
{
|
||||||
|
pos = floor(pos * res + off) / res;
|
||||||
|
return tex2Dlod(_MainTex, float4(pos.xy, 0, -16.0)).rgb;
|
||||||
|
}
|
||||||
|
|
||||||
|
float2 Dist(float2 pos) { pos = pos * res; return -((pos - floor(pos)) - float2(0.5, 0.5)); }
|
||||||
|
float Gaus(float pos, float scale) { return exp2(scale * pos * pos); }
|
||||||
|
|
||||||
|
float3 Horz3(float2 pos, float off)
|
||||||
|
{
|
||||||
|
float3 b = Fetch(pos, float2(-1.0, off));
|
||||||
|
float3 c = Fetch(pos, float2(0.0, off));
|
||||||
|
float3 d = Fetch(pos, float2(1.0, off));
|
||||||
|
float dst = Dist(pos).x;
|
||||||
|
float scale = hardPix;
|
||||||
|
float wb = Gaus(dst - 1.0, scale);
|
||||||
|
float wc = Gaus(dst + 0.0, scale);
|
||||||
|
float wd = Gaus(dst + 1.0, scale);
|
||||||
|
return (b * wb + c * wc + d * wd) / (wb + wc + wd);
|
||||||
|
}
|
||||||
|
|
||||||
|
float3 Horz5(float2 pos, float off)
|
||||||
|
{
|
||||||
|
float3 a = Fetch(pos, float2(-2.0, off));
|
||||||
|
float3 b = Fetch(pos, float2(-1.0, off));
|
||||||
|
float3 c = Fetch(pos, float2(0.0, off));
|
||||||
|
float3 d = Fetch(pos, float2(1.0, off));
|
||||||
|
float3 e = Fetch(pos, float2(2.0, off));
|
||||||
|
float dst = Dist(pos).x;
|
||||||
|
float scale = hardPix;
|
||||||
|
float wa = Gaus(dst - 2.0, scale);
|
||||||
|
float wb = Gaus(dst - 1.0, scale);
|
||||||
|
float wc = Gaus(dst + 0.0, scale);
|
||||||
|
float wd = Gaus(dst + 1.0, scale);
|
||||||
|
float we = Gaus(dst + 2.0, scale);
|
||||||
|
return (a * wa + b * wb + c * wc + d * wd + e * we) / (wa + wb + wc + wd + we);
|
||||||
|
}
|
||||||
|
|
||||||
|
float Scan(float2 pos, float off)
|
||||||
|
{
|
||||||
|
float dst = Dist(pos).y;
|
||||||
|
return Gaus(dst + off, hardScan);
|
||||||
|
}
|
||||||
|
|
||||||
|
float3 Tri(float2 pos)
|
||||||
|
{
|
||||||
|
float3 a = Horz3(pos, -1.0);
|
||||||
|
float3 b = Horz5(pos, 0.0);
|
||||||
|
float3 c = Horz3(pos, 1.0);
|
||||||
|
float wa = Scan(pos, -1.0);
|
||||||
|
float wb = Scan(pos, 0.0);
|
||||||
|
float wc = Scan(pos, 1.0);
|
||||||
|
return a * wa + b * wb + c * wc;
|
||||||
|
}
|
||||||
|
|
||||||
|
float2 Warp(float2 pos)
|
||||||
|
{
|
||||||
|
float2 h = pos - float2(0.5, 0.5);
|
||||||
|
float r2 = dot(h, h);
|
||||||
|
float f = 1.0 + r2 * (warp.x + warp.y * sqrt(r2));
|
||||||
|
return f * scale * h + 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
float2 Warp1(float2 pos)
|
||||||
|
{
|
||||||
|
pos = pos * 2.0 - 1.0;
|
||||||
|
pos *= float2(1.0 + (pos.y * pos.y) * warp.x, 1.0 + (pos.x * pos.x) * warp.y);
|
||||||
|
return pos * scale + 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
float3 Mask(float2 pos)
|
||||||
|
{
|
||||||
|
pos.x += pos.y * 3.0;
|
||||||
|
float3 mask = float3(maskDark, maskDark, maskDark);
|
||||||
|
pos.x = frac(pos.x / 6.0);
|
||||||
|
if (pos.x < 0.333)mask.r = maskLight;
|
||||||
|
else if (pos.x < 0.666)mask.g = maskLight;
|
||||||
|
else mask.b = maskLight;
|
||||||
|
return mask;
|
||||||
|
}
|
||||||
|
|
||||||
|
float4 SimpleWrapFrag(v2f i)
|
||||||
|
{
|
||||||
|
float2 uv = i.uv;
|
||||||
|
|
||||||
|
float4 col = tex2D(_MainTex,uv);
|
||||||
|
res = _ScreenParams.xy / resScale;
|
||||||
|
float2 fragCoord = uv * _ScreenParams.xy;
|
||||||
|
float4 fragColor = 0;
|
||||||
|
float2 pos = Warp1(fragCoord.xy / _ScreenParams.xy);
|
||||||
|
fragColor.rgb = Tri(pos) * Mask(fragCoord);
|
||||||
|
fragColor.a = tex2D(_MainTex,pos).a;
|
||||||
|
|
||||||
|
return lerp(col,fragColor,fade);
|
||||||
|
}
|
||||||
|
|
||||||
|
float4 CubicDistortionFrag(v2f i)
|
||||||
|
{
|
||||||
|
float2 uv = i.uv;
|
||||||
|
|
||||||
|
float4 col = tex2D(_MainTex,uv);
|
||||||
|
res = _iResolution.xy / resScale;
|
||||||
|
float2 fragCoord = uv * _ScreenParams.xy;
|
||||||
|
float4 fragColor = 0;
|
||||||
|
float2 pos = Warp(fragCoord.xy / _ScreenParams.xy);
|
||||||
|
fragColor.rgb = Tri(pos) * Mask(fragCoord);
|
||||||
|
fragColor.a = tex2D(_MainTex,pos).a;
|
||||||
|
|
||||||
|
return lerp(col,fragColor,fade);
|
||||||
|
}
|
||||||
|
|
||||||
|
float4 Frag(v2f i) : SV_Target
|
||||||
|
{
|
||||||
|
#if _SimpleWrap
|
||||||
|
return SimpleWrapFrag(i);
|
||||||
|
#else
|
||||||
|
return CubicDistortionFrag(i);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
ENDCG
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bef4d98671a3c524f9bfdba0d25e5991
|
||||||
|
ShaderImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
defaultTextures: []
|
||||||
|
nonModifiableTextures: []
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -65,7 +65,7 @@ namespace AxibugEmuOnline.Client
|
|||||||
|
|
||||||
void PushCoreFrame()
|
void PushCoreFrame()
|
||||||
{
|
{
|
||||||
if (Core.IsNull()) return;
|
if (Core == null) return;
|
||||||
//fluash netMsg
|
//fluash netMsg
|
||||||
NetMsg.Instance.DequeueNesMsg();
|
NetMsg.Instance.DequeueNesMsg();
|
||||||
|
|
||||||
|
|||||||
@ -32,7 +32,7 @@ namespace AxibugEmuOnline.Client
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (m_gameUI.Core.IsNull()) return false;
|
if (m_gameUI.Core == null) return false;
|
||||||
|
|
||||||
var isSetMode = App.settings.ScreenScaler.IsSetMode(m_gameUI.Core.Platform);
|
var isSetMode = App.settings.ScreenScaler.IsSetMode(m_gameUI.Core.Platform);
|
||||||
|
|
||||||
|
|||||||
@ -49,7 +49,7 @@ namespace AxibugEmuOnline.Client
|
|||||||
|
|
||||||
private void Update()
|
private void Update()
|
||||||
{
|
{
|
||||||
if (CommandDispatcher.Instance.Mode == CommandListener.ScheduleType.Gaming && App.emu.Core.IsNull())
|
if (CommandDispatcher.Instance.Mode == CommandListener.ScheduleType.Gaming && App.emu.Core == null)
|
||||||
CommandDispatcher.Instance.Mode = CommandListener.ScheduleType.Normal;
|
CommandDispatcher.Instance.Mode = CommandListener.ScheduleType.Normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ac0b0e6e0769cf144a829fef3f6740b1
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -1,10 +1,13 @@
|
|||||||
using DG.Tweening;
|
using DG.Tweening;
|
||||||
using DG.Tweening.Core;
|
using DG.Tweening.Core;
|
||||||
using DG.Tweening.Plugins.Options;
|
using DG.Tweening.Plugins.Options;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace AxibugEmuOnline.Client
|
namespace AxibugEmuOnline.Client
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 用于指定一对CanvasGroup,做透明度切换
|
||||||
|
/// </summary>
|
||||||
public class AlphaWraper
|
public class AlphaWraper
|
||||||
{
|
{
|
||||||
private bool m_on;
|
private bool m_on;
|
||||||
@ -1,7 +1,10 @@
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace AxibugEmuOnline.Client
|
namespace AxibugEmuOnline.Client
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 自动根据canvasgroup的alpha控制blocksRaycasts的开启状态
|
||||||
|
/// </summary>
|
||||||
[RequireComponent(typeof(CanvasGroup))]
|
[RequireComponent(typeof(CanvasGroup))]
|
||||||
public class AutoRaycastCanvasGroup : MonoBehaviour
|
public class AutoRaycastCanvasGroup : MonoBehaviour
|
||||||
{
|
{
|
||||||
@ -0,0 +1,53 @@
|
|||||||
|
using DG.Tweening;
|
||||||
|
using DG.Tweening.Core;
|
||||||
|
using DG.Tweening.Plugins.Options;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace AxibugEmuOnline.Client.Tools
|
||||||
|
{
|
||||||
|
public class DotweenRotation : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField]
|
||||||
|
float m_duration = 1f;
|
||||||
|
[SerializeField]
|
||||||
|
Ease m_ease = Ease.Linear;
|
||||||
|
[SerializeField]
|
||||||
|
bool m_reverseRotation;
|
||||||
|
|
||||||
|
private TweenerCore<Quaternion, Vector3, QuaternionOptions> m_tween;
|
||||||
|
|
||||||
|
void OnEnable()
|
||||||
|
{
|
||||||
|
Restart();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Restart()
|
||||||
|
{
|
||||||
|
if (m_tween != null)
|
||||||
|
{
|
||||||
|
m_tween.Kill();
|
||||||
|
m_tween = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
transform.localRotation = Quaternion.identity;
|
||||||
|
m_tween = transform.DOLocalRotate(new Vector3(0, 0, 360f * (m_reverseRotation ? -1 : 1)), m_duration, RotateMode.LocalAxisAdd)
|
||||||
|
.SetEase(m_ease)
|
||||||
|
.SetLoops(-1);
|
||||||
|
m_tween.SetLink(gameObject);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnDisable()
|
||||||
|
{
|
||||||
|
if (m_tween != null)
|
||||||
|
{
|
||||||
|
m_tween.Kill();
|
||||||
|
m_tween = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnValidate()
|
||||||
|
{
|
||||||
|
Restart();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8707b921aaba60d45b4041e96f3542dd
|
||||||
@ -1,7 +1,10 @@
|
|||||||
namespace AxibugEmuOnline.Client.UI
|
using System;
|
||||||
{
|
|
||||||
using System;
|
|
||||||
|
|
||||||
|
namespace AxibugEmuOnline.Client.UI
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 用于周期性触发回调的工具,带有触发周期和延迟触发的参数可调
|
||||||
|
/// </summary>
|
||||||
public class PulseInvoker
|
public class PulseInvoker
|
||||||
{
|
{
|
||||||
private Action _action;
|
private Action _action;
|
||||||
@ -9,8 +12,8 @@
|
|||||||
private float _delay;
|
private float _delay;
|
||||||
private float _elapsedTime;
|
private float _elapsedTime;
|
||||||
private bool _isActive;
|
private bool _isActive;
|
||||||
private bool _isDelayed;
|
private bool _isDelayed;
|
||||||
|
|
||||||
public PulseInvoker(Action action, float delay, float interval)
|
public PulseInvoker(Action action, float delay, float interval)
|
||||||
{
|
{
|
||||||
_action = action;
|
_action = action;
|
||||||
@ -5,6 +5,9 @@ using UnityEngine;
|
|||||||
|
|
||||||
namespace AxibugEmuOnline.Client
|
namespace AxibugEmuOnline.Client
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 选择指示器,用于控制RectTransform在屏幕坐标上的高宽和位置同步,同时带有过度动画
|
||||||
|
/// </summary>
|
||||||
public class Selector : MonoBehaviour
|
public class Selector : MonoBehaviour
|
||||||
{
|
{
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
@ -90,7 +90,7 @@ public class ControllerInfo : MonoBehaviour
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (App.emu.Core.IsNull())
|
if (App.emu.Core == null)
|
||||||
{
|
{
|
||||||
SetDisconnect();
|
SetDisconnect();
|
||||||
return;
|
return;
|
||||||
|
|||||||
@ -35,7 +35,7 @@ public class ControllerInfoPanel : MonoBehaviour
|
|||||||
}
|
}
|
||||||
else //不在房间中,直接设置
|
else //不在房间中,直接设置
|
||||||
{
|
{
|
||||||
if (App.emu.Core.IsNull()) return;
|
if (App.emu.Core == null) return;
|
||||||
var setuper = App.emu.Core.GetControllerSetuper();
|
var setuper = App.emu.Core.GetControllerSetuper();
|
||||||
if (setuper == null) return;
|
if (setuper == null) return;
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@ public class XMBInfoBar : MonoBehaviour
|
|||||||
|
|
||||||
private void Update()
|
private void Update()
|
||||||
{
|
{
|
||||||
ControlSlotInfoNode.SetActiveEx(!App.emu.Core.IsNull());
|
ControlSlotInfoNode.SetActiveEx(App.emu.Core != null);
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnDisable()
|
void OnDisable()
|
||||||
@ -46,7 +46,7 @@ public class XMBInfoBar : MonoBehaviour
|
|||||||
ValueTuple<uint, float> m_lastFrameInfo;
|
ValueTuple<uint, float> m_lastFrameInfo;
|
||||||
private void RefreshFps()
|
private void RefreshFps()
|
||||||
{
|
{
|
||||||
if (App.emu.Core.IsNull())
|
if (App.emu.Core == null)
|
||||||
FPS.gameObject.SetActiveEx(false);
|
FPS.gameObject.SetActiveEx(false);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@ -23,7 +23,5 @@
|
|||||||
void SaveFile(byte[] fileData, string directPath, string fileName);
|
void SaveFile(byte[] fileData, string directPath, string fileName);
|
||||||
System.IO.Stream OpenFile(string directPath, string fileName);
|
System.IO.Stream OpenFile(string directPath, string fileName);
|
||||||
bool TryGetMapperNo(ROM rom, out int mapperNo);
|
bool TryGetMapperNo(ROM rom, out int mapperNo);
|
||||||
ControllerState GetControllerState();
|
|
||||||
void SampleInput(uint frameCount);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user