XMBTopGroup.prefab从LaunchUI.prefab的嵌套结构中脱离
处理部分代码文件的编码文件 部分代码经过了rider调教
This commit is contained in:
parent
abddf3c0b5
commit
6022cafe64
@ -26,15 +26,15 @@ RectTransform:
|
||||
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: 6855144573435021451}
|
||||
m_Father: {fileID: 1639091784002085428}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 284, y: -140}
|
||||
m_SizeDelta: {x: -511, y: -140}
|
||||
m_AnchoredPosition: {x: 284, y: -184}
|
||||
m_SizeDelta: {x: -511, y: -183.99998}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!1 &406078842955547559
|
||||
GameObject:
|
||||
@ -63,10 +63,10 @@ RectTransform:
|
||||
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: 7102897325704768026}
|
||||
m_Father: {fileID: 1924338507}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -163,9 +163,9 @@ RectTransform:
|
||||
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: 1639091784002085428}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -262,12 +262,11 @@ RectTransform:
|
||||
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: 1639091783724093883}
|
||||
- {fileID: 7093465798161333352}
|
||||
- {fileID: 1924338507}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -289,7 +288,7 @@ MonoBehaviour:
|
||||
MainMenuRoot: {fileID: 1924338507}
|
||||
MainMenu: {fileID: 4533431376032812611}
|
||||
BG: {fileID: 1639091783724093860}
|
||||
m_detailLayoutPosition: {x: 55, y: -140}
|
||||
m_detailLayoutPosition_x: 55
|
||||
m_LayoutChangeSpeed: 1000
|
||||
--- !u!1 &3732356966700017678
|
||||
GameObject:
|
||||
@ -319,17 +318,17 @@ RectTransform:
|
||||
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: 2097821101133927282}
|
||||
- {fileID: 6719905869711622945}
|
||||
- {fileID: 433493635188225987}
|
||||
m_Father: {fileID: 6855144573435021451}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 760, y: 0}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &5247317738185020566
|
||||
MonoBehaviour:
|
||||
@ -376,6 +375,7 @@ PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 7102897325704768026}
|
||||
m_Modifications:
|
||||
- target: {fileID: 632697230221148209, guid: ece591129eb9bcc48bd83ec153c98018, type: 3}
|
||||
@ -491,6 +491,15 @@ PrefabInstance:
|
||||
value: 0.85
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 3226730524206505336, guid: ece591129eb9bcc48bd83ec153c98018, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 6439612240477526403}
|
||||
- targetCorrespondingSourceObject: {fileID: 3226730524206505336, guid: ece591129eb9bcc48bd83ec153c98018, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 5778921143820466333}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ece591129eb9bcc48bd83ec153c98018, type: 3}
|
||||
--- !u!224 &2097821101133927282 stripped
|
||||
RectTransform:
|
||||
@ -507,6 +516,7 @@ PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 7102897325704768026}
|
||||
m_Modifications:
|
||||
- target: {fileID: 632697230221148209, guid: ece591129eb9bcc48bd83ec153c98018, type: 3}
|
||||
@ -622,6 +632,12 @@ PrefabInstance:
|
||||
value: 0.85
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 3226730524206505336, guid: ece591129eb9bcc48bd83ec153c98018, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 9054323132593917825}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ece591129eb9bcc48bd83ec153c98018, type: 3}
|
||||
--- !u!224 &433493635188225987 stripped
|
||||
RectTransform:
|
||||
@ -633,265 +649,12 @@ RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 3226730524206505336, guid: ece591129eb9bcc48bd83ec153c98018, type: 3}
|
||||
m_PrefabInstance: {fileID: 2143509155008133406}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &2899142591024425643
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 1639091784002085428}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1735688216191931001, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 1.9341011
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1746243318642131728, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1746243318642131728, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1746243318642131728, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1746243318642131728, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1746243318642131728, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1746243318642131728, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1777012203952456443, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1777012203952456443, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1777012203952456443, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1777012203952456443, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1777012203952456443, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1777012203952456443, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2005113594707322973, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2005113594707322973, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2005113594707322973, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2005113594707322973, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2005113594707322973, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2005113594707322973, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4195056312044822544, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4195056312044822544, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4195056312044822544, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4195056312044822544, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4195056312044822544, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4195056312044822544, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4541943946029862829, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4541943946029862829, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4541943946029862829, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4541943946029862829, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4541943946029862829, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4541943946029862829, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 68.7053
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -34.35266
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5568161260996910275, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: XMBTopGroup
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7158194035478552859, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7158194035478552859, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7158194035478552859, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7158194035478552859, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7158194035478552859, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7158194035478552859, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8076460496124549573, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
propertyPath: m_ChildControlHeight
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
--- !u!224 &7093465798161333352 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 5353336693430589123, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
|
||||
m_PrefabInstance: {fileID: 2899142591024425643}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &4820341598190327646
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3053442126874591447}
|
||||
m_Modifications:
|
||||
- target: {fileID: 734025543935719296, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
@ -1004,43 +767,55 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6087025893861054323, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6087025893861054323, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6087025893861054323, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 144
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6087025893861054323, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 104
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6087025893861054323, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6087025893861054323, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 144
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6087025893861054323, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -65
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 580
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6771349210554360888, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
@ -1048,23 +823,31 @@ PrefabInstance:
|
||||
objectReference: {fileID: 21300000, guid: 0bdbd1b2830ae724dbd62e306f54d60a, type: 3}
|
||||
- target: {fileID: 8126322204359135913, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 580
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -57
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8754483333502849411, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
@ -1072,55 +855,72 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789823129857705082, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789823129857705082, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789823129857705082, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 600
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789823129857705082, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789823129857705082, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789823129857705082, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 144
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789823129857705082, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -65
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9038541706626733903, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9038541706626733903, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9038541706626733903, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 580
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9038541706626733903, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9038541706626733903, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 310
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9038541706626733903, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
value: -45
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
--- !u!224 &6439612240477526403 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 1998281097548910301, guid: dd267389f23898f45b22dbc9670a17c7, type: 3}
|
||||
m_PrefabInstance: {fileID: 4820341598190327646}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &5114599178801942012
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 7102897325704768026}
|
||||
m_Modifications:
|
||||
- target: {fileID: 632697230221148209, guid: ece591129eb9bcc48bd83ec153c98018, type: 3}
|
||||
@ -1236,6 +1036,12 @@ PrefabInstance:
|
||||
value: 0.85
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 3226730524206505336, guid: ece591129eb9bcc48bd83ec153c98018, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 5191063889612611989}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ece591129eb9bcc48bd83ec153c98018, type: 3}
|
||||
--- !u!224 &6719905869711622945 stripped
|
||||
RectTransform:
|
||||
@ -1252,6 +1058,7 @@ PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3053442126874591447}
|
||||
m_Modifications:
|
||||
- target: {fileID: 734025543935719296, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
@ -1378,6 +1185,10 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6087025893861054323, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6087025893861054323, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1398,6 +1209,14 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1418,6 +1237,14 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1446,6 +1273,10 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789823129857705082, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789823129857705082, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1466,6 +1297,10 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9038541706626733903, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9038541706626733903, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1475,12 +1310,21 @@ PrefabInstance:
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
--- !u!224 &5778921143820466333 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 1998281097548910301, guid: 3ecc1c637c161184099b69c3d7a0f354, type: 3}
|
||||
m_PrefabInstance: {fileID: 5443031414569072192}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &6030617905449693000
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 7655295325745418372}
|
||||
m_Modifications:
|
||||
- target: {fileID: 734025543935719296, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
@ -1503,6 +1347,10 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1559746939363341302, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1559746939363341302, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1627,6 +1475,10 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6087025893861054323, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6087025893861054323, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1647,6 +1499,14 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1667,6 +1527,14 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1695,6 +1563,10 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789823129857705082, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789823129857705082, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1704,12 +1576,21 @@ PrefabInstance:
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
--- !u!224 &5191063889612611989 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 1998281097548910301, guid: b170104e466853c49b29f9b5b103364e, type: 3}
|
||||
m_PrefabInstance: {fileID: 6030617905449693000}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &7357818532964008284
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3564845846173557862}
|
||||
m_Modifications:
|
||||
- target: {fileID: 15566658635405967, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
@ -1724,6 +1605,14 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 15566658635405967, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 15566658635405967, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 15566658635405967, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1856,6 +1745,10 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6087025893861054323, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6087025893861054323, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1876,6 +1769,14 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6095356919362338847, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1896,6 +1797,14 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8126322204359135913, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1924,6 +1833,10 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789823129857705082, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8789823129857705082, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
@ -1933,4 +1846,12 @@ PrefabInstance:
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
--- !u!224 &9054323132593917825 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 1998281097548910301, guid: 71eabba88b30a4945b153dbaa6237441, type: 3}
|
||||
m_PrefabInstance: {fileID: 7357818532964008284}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
@ -289,7 +289,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -39.377686, y: -11.536156}
|
||||
m_AnchoredPosition: {x: -39.377686, y: -11.536133}
|
||||
m_SizeDelta: {x: 13.244633, y: 23.072311}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4668999733870816598
|
||||
@ -366,7 +366,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 2.4864044, y: 1.9340992}
|
||||
m_AnchoredPosition: {x: 2.4864044, y: 1.9341125}
|
||||
m_SizeDelta: {x: -32.6004, y: -34.8105}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &5495363713580354324
|
||||
@ -550,7 +550,7 @@ MonoBehaviour:
|
||||
m_Right: 2
|
||||
m_Top: 8
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 5
|
||||
m_ChildAlignment: 2
|
||||
m_Spacing: 10
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
@ -805,7 +805,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -6.70842, y: -11.536156}
|
||||
m_AnchoredPosition: {x: -6.70842, y: -11.536133}
|
||||
m_SizeDelta: {x: 13.244633, y: 23.072311}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5491933055009295031
|
||||
@ -1134,7 +1134,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -23.04305, y: -11.536156}
|
||||
m_AnchoredPosition: {x: -23.04305, y: -11.536133}
|
||||
m_SizeDelta: {x: 13.244633, y: 23.072311}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4550245631254650544
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -64,10 +64,10 @@ namespace AxibugEmuOnline.Client.Manager
|
||||
m_emuCore.SetupScheme();
|
||||
|
||||
m_controllerSetuper = Supporter.GetControllerSetuper();
|
||||
|
||||
|
||||
SetupController();
|
||||
|
||||
Eventer.Instance.RegisterEvent(EEvent.OnRoomSlotDataChanged,OnSlotDataChanged);
|
||||
|
||||
Eventer.Instance.RegisterEvent(EEvent.OnRoomSlotDataChanged, OnSlotDataChanged);
|
||||
}
|
||||
|
||||
private void OnSlotDataChanged()
|
||||
@ -102,7 +102,7 @@ namespace AxibugEmuOnline.Client.Manager
|
||||
InGameUI.Instance.Hide();
|
||||
LaunchUI.Instance.ShowMainMenu();
|
||||
m_controllerSetuper = null;
|
||||
Eventer.Instance.UnregisterEvent(EEvent.OnRoomSlotDataChanged,OnSlotDataChanged);
|
||||
Eventer.Instance.UnregisterEvent(EEvent.OnRoomSlotDataChanged, OnSlotDataChanged);
|
||||
}
|
||||
|
||||
public void ResetGame()
|
||||
|
@ -1,4 +1,4 @@
|
||||
using AxibugEmuOnline.Client.ClientCore;
|
||||
using AxibugEmuOnline.Client.ClientCore;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
@ -19,7 +19,7 @@ namespace AxibugEmuOnline.Client
|
||||
case EnumPlatform.NES:
|
||||
return App.nesRomLib;
|
||||
default:
|
||||
throw new System.NotImplementedException($"未实现的平台 {Platform}");
|
||||
throw new System.NotImplementedException($"未实现的平台 {Platform}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -69,14 +69,14 @@ namespace AxibugEmuOnline.Client
|
||||
{
|
||||
private RomListMenuItem m_romListUI;
|
||||
|
||||
public OptMenu_Search(RomListMenuItem romListUI, Sprite icon = null) : base("搜索", icon)
|
||||
public OptMenu_Search(RomListMenuItem romListUI, Sprite icon = null) : base("搜索", icon)
|
||||
{
|
||||
m_romListUI = romListUI;
|
||||
}
|
||||
|
||||
public override void OnExcute(OptionUI optionUI, ref bool cancelHide)
|
||||
{
|
||||
OverlayManager.Input(OnSearchCommit, "输入Rom名称", m_romListUI.SearchKey);
|
||||
OverlayManager.Input(OnSearchCommit, "输入Rom名称", m_romListUI.SearchKey);
|
||||
}
|
||||
|
||||
private void OnSearchCommit(string text)
|
||||
@ -92,7 +92,7 @@ namespace AxibugEmuOnline.Client
|
||||
|
||||
public override bool Visible => !string.IsNullOrWhiteSpace(m_ui.SearchKey);
|
||||
|
||||
public OptMenu_ShowAll(RomListMenuItem romListUI, Sprite icon = null) : base("显示全部", icon)
|
||||
public OptMenu_ShowAll(RomListMenuItem romListUI, Sprite icon = null) : base("显示全部", icon)
|
||||
{
|
||||
m_ui = romListUI;
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
using DG.Tweening;
|
||||
using DG.Tweening;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
@ -13,7 +13,7 @@ namespace AxibugEmuOnline.Client
|
||||
Selector SelectBorder;
|
||||
|
||||
[Space]
|
||||
[Header("模板")]
|
||||
[Header("模板")]
|
||||
[SerializeField] OptionUI_ExecuteItem TEMPLATE_EXECUTEITEM;
|
||||
[SerializeField] OptionUI_ValueEditItem TEMPLATE_VALUEEDITITEM;
|
||||
|
||||
@ -21,15 +21,15 @@ namespace AxibugEmuOnline.Client
|
||||
private OptionUI m_parent;
|
||||
|
||||
public override bool AloneMode => true;
|
||||
public override bool Enable => m_bPoped && (m_child == null || !m_child.m_bPoped);
|
||||
public override bool Enable => m_bPoped && (!m_child || !m_child.m_bPoped);
|
||||
|
||||
private bool m_bPoped = false;
|
||||
private List<OptionUI_MenuItem> m_runtimeMenuItems = new List<OptionUI_MenuItem>();
|
||||
private bool m_bPoped;
|
||||
private readonly List<OptionUI_MenuItem> m_runtimeMenuItems = new List<OptionUI_MenuItem>();
|
||||
|
||||
private int m_selectIndex = -1;
|
||||
public int SelectIndex
|
||||
{
|
||||
get { return m_selectIndex; }
|
||||
get => m_selectIndex;
|
||||
set
|
||||
{
|
||||
value = Mathf.Clamp(value, 0, m_runtimeMenuItems.Count - 1);
|
||||
@ -81,9 +81,7 @@ namespace AxibugEmuOnline.Client
|
||||
|
||||
private void UpdateMenuState()
|
||||
{
|
||||
bool dirty = false;
|
||||
dirty = checkDirty();
|
||||
if (dirty)
|
||||
if (checkDirty())
|
||||
{
|
||||
RebuildSelectIndex();
|
||||
}
|
||||
@ -150,7 +148,7 @@ namespace AxibugEmuOnline.Client
|
||||
private Action m_onClose;
|
||||
|
||||
/// <summary>
|
||||
/// 当菜单弹出时,动态添加一个菜单选项
|
||||
/// 当菜单弹出时,动态添加一个菜单选项
|
||||
/// </summary>
|
||||
/// <param name="menu"></param>
|
||||
public void AddOptionMenuWhenPoping(OptionMenu menu)
|
||||
@ -285,7 +283,7 @@ namespace AxibugEmuOnline.Client
|
||||
menuUI.SetData(this, valueSetMenu);
|
||||
m_runtimeMenuItems.Add(menuUI);
|
||||
}
|
||||
else throw new NotImplementedException($"暂不支持的菜单类型{menuData.GetType().Name}");
|
||||
else throw new NotImplementedException($"暂不支持的菜单类型{menuData.GetType().Name}");
|
||||
}
|
||||
|
||||
private void ReleaseRuntimeMenus()
|
||||
@ -316,7 +314,7 @@ namespace AxibugEmuOnline.Client
|
||||
protected override void OnCmdSelectItemLeft()
|
||||
{
|
||||
var executer = m_runtimeMenuItems[SelectIndex];
|
||||
if (executer != null)
|
||||
if (executer)
|
||||
{
|
||||
executer.OnLeft();
|
||||
}
|
||||
@ -345,7 +343,7 @@ namespace AxibugEmuOnline.Client
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 展开下级菜单
|
||||
/// 展开下级菜单
|
||||
/// </summary>
|
||||
/// <typeparam name="T"></typeparam>
|
||||
/// <param name="menus"></param>
|
||||
@ -380,17 +378,17 @@ namespace AxibugEmuOnline.Client
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 带有执行行为的菜单
|
||||
/// 带有执行行为的菜单
|
||||
/// </summary>
|
||||
public abstract class ExecuteMenu : OptionMenu
|
||||
{
|
||||
public ExecuteMenu(string name, Sprite icon = null) : base(name, icon) { }
|
||||
protected ExecuteMenu(string name, Sprite icon = null) : base(name, icon) { }
|
||||
|
||||
public abstract void OnExcute(OptionUI optionUI, ref bool cancelHide);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 带有展开行为的菜单
|
||||
/// 带有展开行为的菜单
|
||||
/// </summary>
|
||||
public abstract class ExpandMenu : ExecuteMenu
|
||||
{
|
||||
@ -405,7 +403,7 @@ namespace AxibugEmuOnline.Client
|
||||
protected abstract List<OptionMenu> GetOptionMenus();
|
||||
}
|
||||
|
||||
/// <summary> 不要直接继承这个类 </summary>
|
||||
/// <summary> 不要直接继承这个类 </summary>
|
||||
public abstract class OptionMenu
|
||||
{
|
||||
public string Name { get; protected set; }
|
||||
@ -413,7 +411,7 @@ namespace AxibugEmuOnline.Client
|
||||
public virtual bool Visible => true;
|
||||
public virtual bool Enable => true;
|
||||
|
||||
public OptionMenu(string name, Sprite icon = null)
|
||||
protected OptionMenu(string name, Sprite icon = null)
|
||||
{
|
||||
Name = name;
|
||||
Icon = icon;
|
||||
@ -424,11 +422,11 @@ namespace AxibugEmuOnline.Client
|
||||
public virtual void OnHide() { }
|
||||
}
|
||||
/// <summary>
|
||||
/// 带有值类型显示和编辑的菜单
|
||||
/// 带有值类型显示和编辑的菜单
|
||||
/// </summary>
|
||||
public abstract class ValueSetMenu : OptionMenu
|
||||
{
|
||||
public ValueSetMenu(string name) : base(name) { }
|
||||
protected ValueSetMenu(string name) : base(name) { }
|
||||
|
||||
public abstract Type ValueType { get; }
|
||||
public abstract object ValueRaw { get; }
|
||||
|
@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
@ -249,7 +249,7 @@ namespace VirtualNes.Core
|
||||
LoadDISK();
|
||||
|
||||
{
|
||||
// Pad・ッ・鬣ケトレ、タ、ネウ<EFBFBD>レサッ・ソ・、・゚・<EFBFBD>ー、ャ゚W、、、ホ、ヌ、ウ、ウ、ヌ
|
||||
// Padクラス内だと初期化タイミングが遅いのでここで
|
||||
uint crc = rom.GetPROM_CRC();
|
||||
if (
|
||||
crc == 0xe792de94 // Best Play - Pro Yakyuu (New) (J)
|
||||
@ -275,7 +275,7 @@ namespace VirtualNes.Core
|
||||
|
||||
LoadTurboFile();
|
||||
|
||||
// VS-Unisystem、ホ・ヌ・ユ・ゥ・<EFBFBD>ネヤOカィ
|
||||
// VS-Unisystemのデフォルト設定
|
||||
if (rom.IsVSUNISYSTEM())
|
||||
{
|
||||
uint crc = rom.GetPROM_CRC();
|
||||
@ -286,13 +286,13 @@ namespace VirtualNes.Core
|
||||
|
||||
Reset();
|
||||
|
||||
// ・イゥ`・犹フモミ、ホ・ヌ・ユ・ゥ・<EFBDA9>ネ・ェ・ラ・キ・逾<EFBDA5><E980BE>Oカィ(ヤOカィ諾、ケ瓶、ヒハケ、ヲ樣)
|
||||
// ゲーム固有のデフォルトオプションを設定(設定戻す時に使う為)
|
||||
GameOption.defRenderMethod = (int)GetRenderMethod();
|
||||
GameOption.defIRQtype = GetIrqType();
|
||||
GameOption.defFrameIRQ = GetFrameIRQmode();
|
||||
GameOption.defVideoMode = GetVideoMode();
|
||||
|
||||
// ヤOカィ、<EFBFBD>愰`・ノ、キ、ニヤOカィ、ケ、<EFBDB9>(・ィ・<EFBDA8>ネ・熙ャ殪、ア、<EFBDB1>ミ・ヌ・ユ・ゥ・<EFBDA9>ネ、ャネ<EFBDAC><EFBE88>)
|
||||
// 設定をロードして設定する(エントリが無ければデフォルトが入る)
|
||||
if (rom.GetMapperNo() != 20)
|
||||
{
|
||||
GameOption.Load(rom.GetPROM_CRC());
|
||||
@ -331,12 +331,12 @@ namespace VirtualNes.Core
|
||||
{
|
||||
if (fp == null)
|
||||
{
|
||||
// xxx ・ユ・。・、・<EFBFBD><EFBFBD>_、ア、゙、サ、<EFBFBD>
|
||||
// xxx ファイルを開けません
|
||||
throw new Exception($"Can Not Open File [TurboFile.vtf]");
|
||||
}
|
||||
|
||||
long size = fp.Length;
|
||||
// ・ユ・。・、・<EFBFBD>オ・、・コネ。オテ
|
||||
// ファイルサイズ取得
|
||||
if (size > 32 * 1024)
|
||||
{
|
||||
size = 32 * 1024;
|
||||
@ -354,7 +354,7 @@ namespace VirtualNes.Core
|
||||
|
||||
private void LoadDISK()
|
||||
{
|
||||
//todo : エナオ忞巐チネ。ヨァウヨ
|
||||
//todo : 磁碟机读取支持
|
||||
}
|
||||
|
||||
private void LoadSRAM()
|
||||
@ -400,7 +400,7 @@ namespace VirtualNes.Core
|
||||
{
|
||||
int i;
|
||||
|
||||
// メモリクリア
|
||||
// 儊儌儕僋儕傾
|
||||
MemoryUtility.ZEROMEMORY(MMU.RAM, MMU.RAM.Length);
|
||||
MemoryUtility.ZEROMEMORY(MMU.WRAM, MMU.WRAM.Length);
|
||||
MemoryUtility.ZEROMEMORY(MMU.DRAM, MMU.DRAM.Length);
|
||||
@ -420,11 +420,11 @@ namespace VirtualNes.Core
|
||||
|
||||
MMU.PROM = MMU.VROM = null;
|
||||
|
||||
// 0 除算防止対策
|
||||
// 0 彍嶼杊巭懳嶔
|
||||
MMU.PROM_8K_SIZE = MMU.PROM_16K_SIZE = MMU.PROM_32K_SIZE = 1;
|
||||
MMU.VROM_1K_SIZE = MMU.VROM_2K_SIZE = MMU.VROM_4K_SIZE = MMU.VROM_8K_SIZE = 1;
|
||||
|
||||
// デフォルトバンク設定
|
||||
// 僨僼僅儖僩僶儞僋愝掕
|
||||
for (i = 0; i < 8; i++)
|
||||
{
|
||||
MMU.CPU_MEM_BANK[i] = null;
|
||||
@ -432,11 +432,11 @@ namespace VirtualNes.Core
|
||||
MMU.CPU_MEM_PAGE[i] = 0;
|
||||
}
|
||||
|
||||
// 内臓RAM/WRAM
|
||||
// 撪憻RAM/WRAM
|
||||
MMU.SetPROM_Bank(0, MMU.RAM, MMU.BANKTYPE_RAM);
|
||||
MMU.SetPROM_Bank(3, MMU.WRAM, MMU.BANKTYPE_RAM);
|
||||
|
||||
// ダミー
|
||||
// 僟儈乕
|
||||
MMU.SetPROM_Bank(1, MMU.XRAM, MMU.BANKTYPE_ROM);
|
||||
MMU.SetPROM_Bank(2, MMU.XRAM, MMU.BANKTYPE_ROM);
|
||||
|
||||
@ -522,7 +522,7 @@ namespace VirtualNes.Core
|
||||
}
|
||||
}
|
||||
}
|
||||
ppu.ScanlineNext(); // これの位置でラスター系は画面が違う
|
||||
ppu.ScanlineNext(); // 偙傟偺埵抲偱儔僗僞乕宯偼夋柺偑堘偆
|
||||
if (RenderMethod == EnumRenderMethod.PRE_ALL_RENDER)
|
||||
EmulationCPU(nescfg.ScanlineCycles);
|
||||
|
||||
@ -583,7 +583,7 @@ namespace VirtualNes.Core
|
||||
{
|
||||
pad.VSync();
|
||||
|
||||
// VBLANK期間
|
||||
// VBLANK婜娫
|
||||
if (scanline == nescfg.TotalScanlines - 1)
|
||||
{
|
||||
ppu.VBlankEnd();
|
||||
@ -642,7 +642,7 @@ namespace VirtualNes.Core
|
||||
|
||||
if (scanline == 0)
|
||||
{
|
||||
// ダミースキャンライン
|
||||
// 僟儈乕僗僉儍儞儔僀儞
|
||||
// H-Draw (4fetches*32)
|
||||
EmulationCPU(FETCH_CYCLES * 128);
|
||||
ppu.FrameStart();
|
||||
@ -655,7 +655,7 @@ namespace VirtualNes.Core
|
||||
}
|
||||
else if (scanline < 240)
|
||||
{
|
||||
// スクリーン描画(Scanline 1~239)
|
||||
// 僗僋儕乕儞昤夋(Scanline 1乣239)
|
||||
if (bDraw)
|
||||
{
|
||||
ppu.Scanline(scanline, Supporter.Config.graphics.bAllSprite, Supporter.Config.graphics.bLeftClip);
|
||||
@ -707,7 +707,7 @@ namespace VirtualNes.Core
|
||||
}
|
||||
else if (scanline == 240)
|
||||
{
|
||||
// ダミースキャンライン (Scanline 240)
|
||||
// 僟儈乕僗僉儍儞儔僀儞 (Scanline 240)
|
||||
mapper.VSync();
|
||||
|
||||
EmulationCPU(nescfg.HDrawCycles);
|
||||
@ -720,7 +720,7 @@ namespace VirtualNes.Core
|
||||
{
|
||||
pad.VSync();
|
||||
|
||||
// VBLANK期間
|
||||
// VBLANK婜娫
|
||||
if (scanline == nescfg.TotalScanlines - 1)
|
||||
{
|
||||
ppu.VBlankEnd();
|
||||
@ -864,7 +864,7 @@ namespace VirtualNes.Core
|
||||
MMU.VROM_4K_SIZE = rom.GetVROM_SIZE() * 2;
|
||||
MMU.VROM_8K_SIZE = rom.GetVROM_SIZE();
|
||||
|
||||
// デフォルトバンク
|
||||
// 僨僼僅儖僩僶儞僋
|
||||
if (MMU.VROM_8K_SIZE != 0)
|
||||
{
|
||||
MMU.SetVROM_8K_Bank(0);
|
||||
@ -874,7 +874,7 @@ namespace VirtualNes.Core
|
||||
MMU.SetCRAM_8K_Bank(0);
|
||||
}
|
||||
|
||||
// ミラー
|
||||
// 儈儔乕
|
||||
if (rom.Is4SCREEN())
|
||||
{
|
||||
MMU.SetVRAM_Mirror(MMU.VRAM_MIRROR4);
|
||||
@ -976,13 +976,13 @@ namespace VirtualNes.Core
|
||||
reg.S = 0xFF;
|
||||
reg.P = CPU.Z_FLAG | CPU.R_FLAG | CPU.I_FLAG;
|
||||
|
||||
// 安全対策を兼ねてあえてループに(1秒分)
|
||||
// 埨慡懳嶔傪寭偹偰偁偊偰儖乕僾偵(1昩暘)
|
||||
for (int i = 0; i < nescfg.TotalScanlines * 60; i++)
|
||||
{
|
||||
EmulationCPU(nescfg.ScanlineCycles);
|
||||
cpu.GetContext(ref reg);
|
||||
|
||||
// 無限ループに入ったことを確認したら抜ける
|
||||
// 柍尷儖乕僾偵擖偭偨偙偲傪妋擣偟偨傜敳偗傞
|
||||
if (reg.PC == 0x4700)
|
||||
{
|
||||
break;
|
||||
@ -993,7 +993,7 @@ namespace VirtualNes.Core
|
||||
}
|
||||
|
||||
cpu.GetContext(ref reg);
|
||||
// 無限ループに入っていたら再設定する
|
||||
// 柍尷儖乕僾偵擖偭偰偄偨傜嵞愝掕偡傞
|
||||
if (reg.PC == 0x4700)
|
||||
{
|
||||
reg.PC = 0x4720; // Play Address
|
||||
@ -1009,7 +1009,7 @@ namespace VirtualNes.Core
|
||||
else
|
||||
{
|
||||
cpu.GetContext(ref reg);
|
||||
reg.PC = 0x4700; // 無限ループ
|
||||
reg.PC = 0x4700; // 柍尷儖乕僾
|
||||
reg.S = 0xFF;
|
||||
|
||||
EmulationCPU(nescfg.ScanlineCycles * nescfg.TotalScanlines);
|
||||
@ -1186,7 +1186,7 @@ namespace VirtualNes.Core
|
||||
if (m_BarcodeCycles > 1000)
|
||||
{
|
||||
m_BarcodeCycles = 0;
|
||||
// 停止?
|
||||
// 掆巭丠
|
||||
if (m_BarcodeData[m_BarcodePtr] != 0xFF)
|
||||
{
|
||||
m_BarcodeOut = m_BarcodeData[m_BarcodePtr++];
|
||||
@ -1227,7 +1227,7 @@ namespace VirtualNes.Core
|
||||
return;
|
||||
|
||||
m_TapeCycles += (nescfg.CpuClock / 32000.0);
|
||||
// m_TapeCycles += (nescfg.CpuClock / 22050.0); // 遅すぎてダメっぽい
|
||||
// m_TapeCycles += (nescfg.CpuClock / 22050.0); // 抶偡偓偰僟儊偭傐偄
|
||||
|
||||
if (m_bTapePlay)
|
||||
{
|
||||
@ -1293,7 +1293,7 @@ namespace VirtualNes.Core
|
||||
return MMU.CPU_MEM_BANK[addr >> 13][addr & 0x1FFF];
|
||||
}
|
||||
|
||||
return 0x00; // Warning予防
|
||||
return 0x00; // Warning梊杊
|
||||
}
|
||||
|
||||
private byte ReadReg(ushort addr)
|
||||
@ -1504,7 +1504,7 @@ namespace VirtualNes.Core
|
||||
pad.Write(addr, data);
|
||||
apu.Write(addr, data);
|
||||
break;
|
||||
// VirtuaNES固有ポート
|
||||
// VirtuaNES屌桳億乕僩
|
||||
case 0x18:
|
||||
apu.Write(addr, data);
|
||||
break;
|
||||
@ -1596,7 +1596,7 @@ namespace VirtualNes.Core
|
||||
ref state.reg.cpureg.FrameIRQ_type,
|
||||
ref state.reg.cpureg.FrameIRQ,
|
||||
ref state.reg.cpureg.FrameIRQ_occur);
|
||||
state.reg.cpureg.FrameIRQ_cycles = cycles; // イホユユ、ャINT、ハ樣」ィ、ゥ
|
||||
state.reg.cpureg.FrameIRQ_cycles = cycles; // 参照がINTな為(ぉ
|
||||
|
||||
state.reg.cpureg.DMA_cycles = cpu.GetDmaCycles();
|
||||
state.reg.cpureg.emul_cycles = emul_cycles;
|
||||
@ -1625,7 +1625,7 @@ namespace VirtualNes.Core
|
||||
MemoryUtility.memcpy(state.ram.SPPAL, MMU.SPPAL, state.ram.SPPAL.Length);
|
||||
MemoryUtility.memcpy(state.ram.SPRAM, MMU.SPRAM, state.ram.SPRAM.Length);
|
||||
|
||||
// S-RAM STATE(ハケモテ/ホエハケモテ、ヒ騅、<E9A885>鬢コエ贇レ、ケ、<EFBDB9>ミ・サゥ`・ヨ、ケ、<EFBDB9>)
|
||||
// S-RAM STATE(使用/未使用に関わらず存在すればセーブする)
|
||||
if (rom.IsSAVERAM())
|
||||
{
|
||||
size = (uint)SAVERAM_SIZE;
|
||||
@ -1649,9 +1649,9 @@ namespace VirtualNes.Core
|
||||
uint size = 0;
|
||||
|
||||
// SAVE CPU MEMORY BANK DATA
|
||||
// BANK0,1,2、マ・ミ・<EFBFBD>ッ・サゥ`・ヨ、ヒ騅4、ハ、キ
|
||||
// VirtuaNES0.30、ォ、<EFBFBD>
|
||||
// ・ミ・<EFBFBD>ッ」ウ、マSRAMハケモテ、ヒ騅、<EFBFBD>鬢コ・サゥ`・ヨ
|
||||
// BANK0,1,2はバンクセーブに関係なし
|
||||
// VirtuaNES0.30から
|
||||
// バンク3はSRAM使用に関わらずセーブ
|
||||
for (int i = 3; i < 8; i++)
|
||||
{
|
||||
state.mmu.CPU_MEM_TYPE[i] = MMU.CPU_MEM_TYPE[i];
|
||||
@ -1696,7 +1696,7 @@ namespace VirtualNes.Core
|
||||
}
|
||||
}
|
||||
|
||||
// WRITE VRAM MEMORY(ウ」、ヒ4Kキヨ、ケ、ル、ニ抱、ュ゙z、<EFBFBD>)
|
||||
// WRITE VRAM MEMORY(常に4K分すべて書き込む)
|
||||
state.VRAM = new byte[4 * 1024];
|
||||
Array.Copy(MMU.VRAM, state.VRAM, state.VRAM.Length);
|
||||
|
||||
@ -1764,7 +1764,7 @@ namespace VirtualNes.Core
|
||||
int DiskSize = 16 + 65500 * rom.GetDiskNo();
|
||||
|
||||
|
||||
// マ珀`ハ<>、<EFBFBD>ォ・ヲ・<EFBDA6>ネ
|
||||
// 相違数をカウント
|
||||
for (int i = 16; i < DiskSize; i++)
|
||||
{
|
||||
if (lpWrite[i] != 0)
|
||||
@ -1874,9 +1874,9 @@ namespace VirtualNes.Core
|
||||
//BANK STATE
|
||||
{
|
||||
// SAVE CPU MEMORY BANK DATA
|
||||
// BANK0,1,2、マ・ミ・<EFBFBD>ッ・サゥ`・ヨ、ヒ騅4、ハ、キ
|
||||
// VirtuaNES0.30、ォ、<EFBFBD>
|
||||
// ・ミ・<EFBFBD>ッ」ウ、マSRAMハケモテ、ヒ騅、<EFBFBD>鬢コ・サゥ`・ヨ
|
||||
// BANK0,1,2はバンクセーブに関係なし
|
||||
// VirtuaNES0.30から
|
||||
// バンク3はSRAM使用に関わらずセーブ
|
||||
for (byte i = 3; i < 8; i++)
|
||||
{
|
||||
MMU.CPU_MEM_TYPE[i] = state.mmu.CPU_MEM_TYPE[i];
|
||||
|
Loading…
Reference in New Issue
Block a user