Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline

AxibugEmuOnline.Client/Assets/Resources/IMPORTENT.prefab

@@ -736,6 +736,34 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: -5
       objectReference: {fileID: 0}
+    - target: {fileID: 734174642832146072, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734174642832146072, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734174642832146072, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734174642832146072, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734174642832146072, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734174642832146072, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 734174642832146072, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 736530578155193984, guid: 1de15a80c8c1aa94486563740a15d91c, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -1388,6 +1416,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 193475523204617150, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 193475523204617150, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -1436,6 +1468,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 449160040343683211, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 449160040343683211, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -1508,6 +1544,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 833899971404383597, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 833899971404383597, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 833899971404383597, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -1532,6 +1576,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1029475975899771591, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1029475975899771591, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -1552,6 +1600,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1055836741060224427, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1055836741060224427, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1055836741060224427, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -1588,6 +1644,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1258174585615042852, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1258174585615042852, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1258174585615042852, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -1608,6 +1672,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1579312852857843245, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1579312852857843245, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1579312852857843245, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -1792,6 +1864,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1748522118614936523, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1748522118614936523, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -1816,6 +1892,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1749692929982472183, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1749692929982472183, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -1848,6 +1928,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2078164669047027966, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2078164669047027966, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -1976,6 +2060,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2511120698149964204, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2511120698149964204, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2032,6 +2120,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2579334080811426254, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2579334080811426254, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2084,6 +2176,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3095773685132211997, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3095773685132211997, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3095773685132211997, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2108,6 +2208,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3399532356687036599, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3399532356687036599, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2128,6 +2232,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3441853701272737755, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3441853701272737755, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3441853701272737755, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2148,6 +2260,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3554980154840165367, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3554980154840165367, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2168,6 +2284,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3583643212238109851, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3583643212238109851, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3583643212238109851, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2296,6 +2420,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3829360616745704338, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3829360616745704338, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3829360616745704338, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2316,6 +2448,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3876161320726367486, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3876161320726367486, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2472,6 +2608,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5928623329274860706, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5928623329274860706, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2496,6 +2636,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6256155029986723735, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6256155029986723735, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2516,6 +2660,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6487249402547224379, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6487249402547224379, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6487249402547224379, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2536,6 +2688,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6591991037354951281, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6591991037354951281, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6591991037354951281, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2620,6 +2780,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8365089343948286075, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8365089343948286075, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2644,6 +2808,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9003803253190325092, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 9003803253190325092, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2664,6 +2832,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9163141629633368263, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9163141629633368263, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 9163141629633368263, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2684,6 +2860,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9206624128085952427, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 9206624128085952427, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2743,6 +2923,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1108503213262670097, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1108503213262670097, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2783,6 +2967,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1710183501897154830, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1710183501897154830, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2803,6 +2991,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1746243318642131728, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1746243318642131728, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1746243318642131728, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2827,6 +3023,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1777012203952456443, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1777012203952456443, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2847,6 +3047,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2005113594707322973, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2005113594707322973, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2005113594707322973, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -2939,6 +3147,14 @@ PrefabInstance:
       propertyPath: m_AnchorMin.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2921874279820016524, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2921874279820016524, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2940710093054777883, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -2995,6 +3211,10 @@ PrefabInstance:
       propertyPath: m_AnchorMin.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3201409976408832832, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3201409976408832832, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
@@ -3079,6 +3299,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4195056312044822544, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4195056312044822544, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4195056312044822544, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -3099,6 +3327,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4541943946029862829, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4541943946029862829, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4541943946029862829, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -3159,6 +3395,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4894793418161725275, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4894793418161725275, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4894793418161725275, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0
@@ -3303,6 +3547,14 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5681144522345305637, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5681144522345305637, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6064974212694732928, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -3523,6 +3775,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7158194035478552859, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7158194035478552859, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 0

AxibugEmuOnline.Client/Assets/Resources/NES/NesEmulator.prefab

@@ -175,10 +175,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 4232056520494431727}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &377334483991090399
 CanvasRenderer:

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

@@ -826,6 +826,7 @@ RectTransform:
   m_Children:
   - {fileID: 6503369113137645357}
   - {fileID: 1714682891259844147}
+  - {fileID: 366056510674839125}
   - {fileID: 4264754383554125665}
   m_Father: {fileID: 4478785627166277610}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -875,6 +876,103 @@ MonoBehaviour:
   m_MenuNameTxt: {fileID: 1824253632728291860}
   m_Icon: {fileID: 394891843266770919}
   ExpandFlag: {fileID: 1501213187178026014}
+  ApplyFlag: {fileID: 3335801350916860509}
+--- !u!1 &3335801350916860509
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 366056510674839125}
+  - component: {fileID: 8134207541370216537}
+  - component: {fileID: 9115911462236684960}
+  - component: {fileID: 630275888015180765}
+  m_Layer: 5
+  m_Name: ApplyFlag
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &366056510674839125
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3335801350916860509}
+  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: 2780569438310375802}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8134207541370216537
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3335801350916860509}
+  m_CullTransparentMesh: 1
+--- !u!114 &9115911462236684960
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3335801350916860509}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: eba3f71cfd582184cb08d7a56e6428d2, 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 &630275888015180765
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3335801350916860509}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: 30
+  m_PreferredHeight: 30
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &4124172888520656882
 GameObject:
   m_ObjectHideFlags: 0
@@ -1126,7 +1224,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.25}
   m_AnchorMax: {x: 1, y: 0.75}
-  m_AnchoredPosition: {x: -5.0000153, y: 0}
+  m_AnchoredPosition: {x: -5, y: 0}
   m_SizeDelta: {x: -20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5174902406667317058

AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/GlobalFilter_Template.prefab

@@ -681,7 +681,7 @@ GameObject:
   - component: {fileID: 4672405243908051711}
   - component: {fileID: 3086674949377227884}
   m_Layer: 5
-  m_Name: RomGroupScroll
+  m_Name: SubGroupScroll
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

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

@@ -681,7 +681,7 @@ GameObject:
   - component: {fileID: 4672405243908051711}
   - component: {fileID: 3086674949377227884}
   m_Layer: 5
-  m_Name: RomGroupScroll
+  m_Name: SubItemScroll
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

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

@@ -1,5 +1,6 @@
 using AxibugEmuOnline.Client.Manager;
 using AxibugEmuOnline.Client.Network;
+using AxibugProtobuf;
 using System;
 using System.Collections;
 using System.IO;
@@ -64,7 +65,7 @@ namespace AxibugEmuOnline.Client.ClientCore
             emu = new AppEmu();
             //netgame = new AppNetGame();
             httpAPI = new HttpAPI();
-            nesRomLib = new RomLib(EnumSupportEmuPlatform.NES);
+            nesRomLib = new RomLib(RomPlatformType.Nes);
             CacheMgr = new CacheManager();
             roomMgr = new AppRoom();
             share = new AppShare();

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

@@ -1,4 +1,5 @@
-using UnityEngine;
+using AxibugProtobuf;
+using UnityEngine;
 
 namespace AxibugEmuOnline.Client
 {
@@ -17,7 +18,7 @@ namespace AxibugEmuOnline.Client
         void DoReset();
         IControllerSetuper GetControllerSetuper();
 
-        EnumSupportEmuPlatform Platform { get; }
+        RomPlatformType Platform { get; }
         uint Frame { get; }
     }
 

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

@@ -1,5 +1,6 @@
 using AxibugEmuOnline.Client.ClientCore;
 using AxibugEmuOnline.Client.Event;
+using AxibugProtobuf;
 using UnityEngine;
 
 namespace AxibugEmuOnline.Client.Manager
@@ -31,7 +32,7 @@ namespace AxibugEmuOnline.Client.Manager
             if (!m_emuCore.IsNull()) StopGame();
 
             var roomInfo = App.roomMgr.mineRoomMiniInfo;
-            roomInfo.FetchRomFileInRoomInfo(EnumSupportEmuPlatform.NES, (_, romFile) =>
+            roomInfo.FetchRomFileInRoomInfo(RomPlatformType.Nes, (_, romFile) =>
             {
                 if (!romFile.RomReady) //这个rom并没有下载,所以取消进入房间
                 {
@@ -51,7 +52,7 @@ namespace AxibugEmuOnline.Client.Manager
 
             switch (romFile.Platform)
             {
-                case EnumSupportEmuPlatform.NES:
+                case RomPlatformType.Nes:
                     m_emuCore = GameObject.Instantiate(Resources.Load<GameObject>("NES/NesEmulator")).GetComponent<IEmuCore>();
                     break;
             }

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

@@ -1,4 +1,5 @@
 using AxibugEmuOnline.Client.ClientCore;
+using AxibugProtobuf;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,7 +13,7 @@ namespace AxibugEmuOnline.Client
     public class FilterManager
     {
         private List<Filter> m_filters;
-        private Dictionary<EnumSupportEmuPlatform, Filter> m_filterPlatforms = new Dictionary<EnumSupportEmuPlatform, Filter>();
+        private Dictionary<RomPlatformType, Filter> m_filterPlatforms = new Dictionary<RomPlatformType, Filter>();
 
         private AlphaWraper m_previewFilterWraper;
         FilterRomSetting m_filterRomSetting;
@@ -176,7 +177,8 @@ namespace AxibugEmuOnline.Client
             if (filter != null)
             {
                 string presetName = value.Item2;
-                preset = filter.Presets.FirstOrDefault(p => p.Name == presetName);
+                if (presetName == filter.DefaultPreset.Name) preset = filter.DefaultPreset;
+                else preset = filter.Presets.FirstOrDefault(p => p.Name == presetName);
             }
 
             return new GetFilterSetting_result()

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

@@ -1,4 +1,4 @@
-using System;
+using AxibugProtobuf;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -23,7 +23,7 @@ namespace AxibugEmuOnline.Client
         /// </summary>
         /// <param name="platform"></param>
         /// <returns></returns>
-        public EnumScalerMode GetMode(EnumSupportEmuPlatform platform)
+        public EnumScalerMode GetMode(RomPlatformType platform)
         {
             int setVal = PlayerPrefs.GetInt($"{nameof(ScreenScaler)}.PlatMode.{platform}", -1);
             if (setVal == -1)
@@ -37,10 +37,10 @@ namespace AxibugEmuOnline.Client
         /// </summary>
         /// <param name="m_rawImg"></param>
         /// <param name="platform">不指定模拟器平台时,使用全局设置的缩放模式</param>
-        public void CalcScale(RawImage rawImg, EnumSupportEmuPlatform? platform = null)
+        public void CalcScale(RawImage rawImg, RomPlatformType? platform = null)
         {
             var targetMode = platform == null ? GlobalMode : GetMode(platform.Value);
-            var resolution = GetRawResolution(platform == null ? EnumSupportEmuPlatform.NES : platform.Value);
+            var resolution = GetRawResolution(platform == null ? RomPlatformType.Nes : platform.Value);
             var canvasRect = (rawImg.canvas.transform as RectTransform).rect;
             switch (targetMode)
             {
@@ -89,11 +89,11 @@ namespace AxibugEmuOnline.Client
             }
         }
 
-        public Vector2Int GetRawResolution(EnumSupportEmuPlatform platform)
+        public Vector2Int GetRawResolution(RomPlatformType platform)
         {
             switch (platform)
             {
-                case EnumSupportEmuPlatform.NES: return new Vector2Int(256, 240);
+                case RomPlatformType.Nes: return new Vector2Int(256, 240);
                 default: return new Vector2Int(256, 240);
             }
         }

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/RomLib/EnumPlatform.cs

@@ -1,7 +0,0 @@
-namespace AxibugEmuOnline.Client
-{
-    public enum EnumSupportEmuPlatform
-    {
-        NES
-    }
-}

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/RomLib/EnumPlatform.cs.meta

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

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/RomLib/RomFile.cs

@@ -1,11 +1,10 @@
 using AxibugEmuOnline.Client.ClientCore;
+using AxibugProtobuf;
 using ICSharpCode.SharpZipLib.Zip;
 using System;
 using System.Collections;
 using System.IO;
 using UnityEngine;
-using UnityEngine.Networking;
-using static UnityEngine.EventSystems.EventTrigger;
 
 namespace AxibugEmuOnline.Client
 {
@@ -13,7 +12,6 @@ namespace AxibugEmuOnline.Client
     {
         private HttpAPI.Resp_RomInfo webData;
         private bool hasLocalFile;
-        private EnumSupportEmuPlatform platform;
         //private UnityWebRequest downloadRequest;
         private AxiHttpProxy.SendDownLoadProxy downloadRequest;
 
@@ -22,8 +20,8 @@ namespace AxibugEmuOnline.Client
         /// <summary> 指示该Rom文件的存放路径 </summary>
         public string LocalFilePath =>
                                     IsUserRom ?
-                                    $"{App.PersistentDataPath}/UserRoms/{platform}/{FileName}" :
+                                    $"{App.PersistentDataPath}/UserRoms/{Platform}/{FileName}" :
-                                    $"{App.PersistentDataPath}/RemoteRoms/{platform}/{FileName}";
+                                    $"{App.PersistentDataPath}/RemoteRoms/{Platform}/{FileName}";
 
         /// <summary> 指示该Rom文件是否已下载完毕 </summary>
         public bool RomReady => hasLocalFile;
@@ -36,7 +34,7 @@ namespace AxibugEmuOnline.Client
         public float Progress => IsDownloading ? downloadRequest.downloadHandler.DownLoadPr : 0;
 
 
-        public EnumSupportEmuPlatform Platform => platform;
+        public RomPlatformType Platform => webData != null ? (RomPlatformType)webData.ptype : RomPlatformType.Invalid;
         /// <summary> 指示该Rom信息是否已填充 </summary>
         public bool InfoReady => webData != null;
         /// <summary> 唯一标识 </summary>
@@ -61,9 +59,8 @@ namespace AxibugEmuOnline.Client
         public event Action<RomFile> OnDownloadOver;
         public event Action OnInfoFilled;
 
-        public RomFile(EnumSupportEmuPlatform platform, int index, int insidePage)
+        public RomFile(int index, int insidePage)
         {
-            this.platform = platform;
             Index = index;
             Page = insidePage;
         }
@@ -181,14 +178,5 @@ namespace AxibugEmuOnline.Client
             OnInfoFilled?.Invoke();
         }
 
-        private RomFile() { }
-        public static RomFile CreateExistRom(EnumSupportEmuPlatform platform, string fileName)
-        {
-            var res = new RomFile();
-            res.IsUserRom = true;
-            res.FileName = fileName;
-            res.hasLocalFile = File.Exists(res.LocalFilePath);
-            return res;
-        }
     }
 }

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

@@ -1,5 +1,6 @@
 using AxibugEmuOnline.Client.ClientCore;
 using AxibugEmuOnline.Client.Common;
+using AxibugProtobuf;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -19,30 +20,21 @@ namespace AxibugEmuOnline.Client
         private Dictionary<string, RomFile> nesRomFileNameMapper = new Dictionary<string, RomFile>();
         private HttpAPI.GetRomListAPI m_romGetFunc;
         private HttpAPI.SearchRomListAPI m_romSearchFunc;
-        private EnumSupportEmuPlatform m_platform;
+        private RomPlatformType m_platform;
         private string lastSearchKey;
 
-        public RomLib(EnumSupportEmuPlatform platform)
+        public RomLib(RomPlatformType platform)
         {
             m_platform = platform;
             switch (platform)
             {
-                case EnumSupportEmuPlatform.NES:
+                case RomPlatformType.Nes:
                     m_romGetFunc = App.httpAPI.GetNesRomList;
                     m_romSearchFunc = App.httpAPI.SearchNesRomList;
                     break;
             }
         }
 
-        public RomFile GetExistRom(string fileName)
-        {
-            var res = RomFile.CreateExistRom(m_platform, fileName);
-
-            nesRomFileNameMapper[res.FileName] = res;
-
-            return res;
-        }
-
         public RomFile GetRomFile(string romFileName)
         {
             RomFile romFile;
@@ -89,15 +81,12 @@ namespace AxibugEmuOnline.Client
                     for (int i = 0; i < nesRomFetchList.Length; i++)
                     {
                         //以后考虑用对象池实例化RomFile
-                        nesRomFetchList[i] = new RomFile(m_platform, i, i / PAGE_SIZE);
+                        nesRomFetchList[i] = new RomFile(i, i / PAGE_SIZE);
                     }
                     SaveRomInfoFromWeb(romList);
 
                     callback.Invoke(nesRomFetchList);
-                },
+                }, m_platform, 0, PAGE_SIZE);
-                //TODO 平台参数
-                AxibugProtobuf.RomPlatformType.Nes
-                , 0, PAGE_SIZE);
             }
             else
             {
@@ -115,15 +104,12 @@ namespace AxibugEmuOnline.Client
                     for (int i = 0; i < nesRomFetchList.Length; i++)
                     {
                         //以后考虑用对象池实例化RomFile
-                        nesRomFetchList[i] = new RomFile(m_platform, i, i / PAGE_SIZE);
+                        nesRomFetchList[i] = new RomFile(i, i / PAGE_SIZE);
                     }
                     SaveRomInfoFromWeb(romList);
 
                     callback.Invoke(nesRomFetchList);
-                },
+                }, m_platform, searchKey, 0, PAGE_SIZE);
-                //TODO 平台参数
-                AxibugProtobuf.RomPlatformType.Nes
-                , searchKey, 0, PAGE_SIZE);
             }
         }
 

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

@@ -4,6 +4,7 @@ using System.Globalization;
 using System.IO;
 using System.Xml.Linq;
 using AxibugEmuOnline.Client.ClientCore;
+using AxibugProtobuf;
 using UnityEditor;
 using UnityEngine;
 using VirtualNes.Core;
@@ -58,7 +59,7 @@ namespace AxibugEmuOnline.Client
             VideoProvider.ApplyFilterEffect();
         }
 
-        public EnumSupportEmuPlatform Platform => EnumSupportEmuPlatform.NES;
+        public RomPlatformType Platform => RomPlatformType.Nes;
         private CoreSupporter m_coreSupporter;
         /// <summary>
         /// 指定ROM开始游戏

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

@@ -1,4 +1,5 @@
 using AxibugEmuOnline.Client.ClientCore;
+using AxibugProtobuf;
 using System;
 using System.Runtime.InteropServices;
 using UnityEngine;
@@ -84,7 +85,7 @@ namespace AxibugEmuOnline.Client
 
         public void ApplyScreenScaler()
         {
-            App.settings.ScreenScaler.CalcScale(Image, EnumSupportEmuPlatform.NES);
+            App.settings.ScreenScaler.CalcScale(Image, RomPlatformType.Nes);
         }
 
         private unsafe void PrepareUI(uint* screenData)

AxibugEmuOnline.Client/Assets/Script/AppMain/Protobuf/ProtobufAxibugEmuOnline.cs

@@ -133,15 +133,15 @@ namespace AxibugProtobuf {
             "U3dpdGNoSm95Q29uEAcSEgoOWEJPWDM2MENvbnRyb2wQCBISCg5YQk9YT05F",
             "Q29udHJvbBAJEhEKDVBTVml0YUNvbnRyb2wQChISCg5XaWlVUGFkQ29udHJv",
             "bBALEhQKEFdpaVJlbW90ZUNvbnRyb2wQDBIWChJOaW50ZW5kbzNEU0NvbnRy",
-            "b2wQDSqUAQoPUm9tUGxhdGZvcm1UeXBlEgcKA0FsbBAAEgcKA05lcxABEhEK",
+            "b2wQDSqiAQoPUm9tUGxhdGZvcm1UeXBlEgsKB0ludmFsaWQQABIHCgNOZXMQ",
-            "DU1hc3Rlcl9TeXN0ZW0QAhINCglHYW1lX0dlYXIQAxIMCghHYW1lX0JveRAE",
+            "ARIRCg1NYXN0ZXJfU3lzdGVtEAISDQoJR2FtZV9HZWFyEAMSDAoIR2FtZV9C",
-            "EhIKDkdhbWVfQm95X0NvbG9yEAUSEQoNQ29sZWNvX1Zpc2lvbhAGEgsKB1ND",
+            "b3kQBBISCg5HYW1lX0JveV9Db2xvchAFEhEKDUNvbGVjb19WaXNpb24QBhIL",
-            "XzMwMDAQBxILCgdTR18xMDAwEAgqcAoNUm9vbUdhbWVTdGF0ZRISCg5Ob25l",
+            "CgdTQ18zMDAwEAcSCwoHU0dfMTAwMBAIEggKA0FsbBDnBypwCg1Sb29tR2Ft",
-            "X0dhbWVTdGF0ZRAAEgwKCE9ubHlIb3N0EAESEQoNV2FpdFJhd1VwZGF0ZRAC",
+            "ZVN0YXRlEhIKDk5vbmVfR2FtZVN0YXRlEAASDAoIT25seUhvc3QQARIRCg1X",
-            "Eg0KCVdhaXRSZWFkeRADEgkKBVBhdXNlEAQSEAoMSW5PbmxpbmVHYW1lEAUq",
+            "YWl0UmF3VXBkYXRlEAISDQoJV2FpdFJlYWR5EAMSCQoFUGF1c2UQBBIQCgxJ",
-            "TgoRTG9naW5SZXN1bHRTdGF0dXMSIQodTG9naW5SZXN1bHRTdGF0dXNfQmFz",
+            "bk9ubGluZUdhbWUQBSpOChFMb2dpblJlc3VsdFN0YXR1cxIhCh1Mb2dpblJl",
-            "ZURlZmF1bHQQABIGCgJPSxABEg4KCkFjY291bnRFcnIQAkICSAFiBnByb3Rv",
+            "c3VsdFN0YXR1c19CYXNlRGVmYXVsdBAAEgYKAk9LEAESDgoKQWNjb3VudEVy",
-            "Mw=="));
+            "chACQgJIAWIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::AxibugProtobuf.CommandID), typeof(global::AxibugProtobuf.ErrorCode), typeof(global::AxibugProtobuf.LoginType), typeof(global::AxibugProtobuf.DeviceType), typeof(global::AxibugProtobuf.GamePadType), typeof(global::AxibugProtobuf.RomPlatformType), typeof(global::AxibugProtobuf.RoomGameState), typeof(global::AxibugProtobuf.LoginResultStatus), }, null, new pbr::GeneratedClrTypeInfo[] {
@@ -416,7 +416,7 @@ namespace AxibugProtobuf {
   }
 
   public enum RomPlatformType {
-    [pbr::OriginalName("All")] All = 0,
+    [pbr::OriginalName("Invalid")] Invalid = 0,
     [pbr::OriginalName("Nes")] Nes = 1,
     [pbr::OriginalName("Master_System")] MasterSystem = 2,
     [pbr::OriginalName("Game_Gear")] GameGear = 3,
@@ -425,6 +425,7 @@ namespace AxibugProtobuf {
     [pbr::OriginalName("Coleco_Vision")] ColecoVision = 6,
     [pbr::OriginalName("SC_3000")] Sc3000 = 7,
     [pbr::OriginalName("SG_1000")] Sg1000 = 8,
+    [pbr::OriginalName("All")] All = 999,
   }
 
   public enum RoomGameState {

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

@@ -1,4 +1,4 @@
-using AxibugEmuOnline.Client.ClientCore;
+using AxibugEmuOnline.Client.ClientCore;
 using System;
 using System.Collections.Generic;
 
@@ -6,13 +6,13 @@ namespace AxibugEmuOnline.Client
 {
     public class BackgroundListMenuItem : VirtualSubMenuItem
     {
-        protected override void GetVirtualListDatas(Action<object> datas)
+        protected override void GetVirtualListDatas(VirtualListDataHandle callback)
         {
             List<object> list = new List<object>()
             {
                 App.settings.BgColor,
             };
-            datas.Invoke(list);
+            callback.Invoke(list, 0);
         }
     }
 }

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

@@ -22,12 +22,12 @@ namespace AxibugEmuOnline.Client
             return base.OnExitItem();
         }
 
-        protected override void GetVirtualListDatas(Action<object> datas)
+        protected override void GetVirtualListDatas(VirtualListDataHandle callback)
         {
             List<object> list = new List<object>();
             list.Add(null);
             list.AddRange(App.settings.Filter.Filters.Select(f => (object)f));
-            datas.Invoke(list);
+            callback.Invoke(list, 0);
         }
     }
 }

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

@@ -20,11 +20,15 @@ namespace AxibugEmuOnline.Client
             return base.OnExitItem();
         }
 
-        protected override void GetVirtualListDatas(Action<object> datas)
+        protected override void GetVirtualListDatas(VirtualListDataHandle callback)
         {
             List<object> list = new List<object>();
             foreach (var enumValue in Enum.GetValues(typeof(ScreenScaler.EnumScalerMode))) list.Add(enumValue);
-            datas.Invoke(list);
+
+            var select = list.IndexOf(App.settings.ScreenScaler.GlobalMode);
+            if (select == -1) select = 0;
+
+            callback.Invoke(list, select);
         }
     }
 }

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/GamesUI/RomListMenuItem.cs

@@ -1,4 +1,5 @@
 using AxibugEmuOnline.Client.ClientCore;
+using AxibugProtobuf;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
@@ -8,7 +9,7 @@ namespace AxibugEmuOnline.Client
     public class RomListMenuItem : VirtualSubMenuItem
     {
         [SerializeField]
-        protected EnumSupportEmuPlatform Platform;
+        protected RomPlatformType Platform;
 
         private RomLib RomLib
         {
@@ -16,7 +17,7 @@ namespace AxibugEmuOnline.Client
             {
                 switch (Platform)
                 {
-                    case EnumSupportEmuPlatform.NES:
+                    case RomPlatformType.Nes:
                         return App.nesRomLib;
                     default:
                         throw new System.NotImplementedException($"未实现的平台 {Platform}");
@@ -38,9 +39,9 @@ namespace AxibugEmuOnline.Client
         }
 
         public string SearchKey;
-        protected override void GetVirtualListDatas(Action<object> datas)
+        protected override void GetVirtualListDatas(VirtualListDataHandle callback)
         {
-            RomLib.FetchRomCount((roms) => datas.Invoke(roms), SearchKey);
+            RomLib.FetchRomCount((roms) => callback.Invoke(roms, 0), SearchKey);
         }
 
         public override bool OnEnterItem()

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

@@ -5,7 +5,7 @@ using static AxibugEmuOnline.Client.FilterManager;
 
 namespace AxibugEmuOnline.Client
 {
-	public class InGameUI_FilterSetting : ExpandMenu
+    public class InGameUI_FilterSetting : ExpandMenu
     {
         private InGameUI m_gameUI;
 
@@ -26,15 +26,17 @@ namespace AxibugEmuOnline.Client
         {
             private RomFile m_rom;
 
+            public override bool IsApplied => App.settings.Filter.GetFilterSetting(m_rom).filter == null;
             public FilterNone(RomFile rom) : base("取消滤镜", null)
             {
                 m_rom = rom;
+
+                var currentFilterSetting = App.settings.Filter.GetFilterSetting(m_rom);
             }
 
             public override void OnExcute(OptionUI optionUI, ref bool cancelHide)
             {
                 App.settings.Filter.ShutDownFilter();
-
                 App.settings.Filter.SetupFilter(m_rom, null, null);
             }
         }
@@ -44,6 +46,19 @@ namespace AxibugEmuOnline.Client
             private Filter m_filter;
             private List<OptionMenu> m_presetsMenuItems;
 
+            public override bool IsApplied
+            {
+                get
+                {
+                    foreach (FilterPresetMenu preset in m_presetsMenuItems)
+                    {
+                        if (preset.IsApplied) return true;
+                    }
+
+                    return false;
+                }
+            }
+
             public FilterMenu(RomFile rom, Filter filter) : base(filter.Name, null)
             {
                 m_filter = filter;
@@ -63,6 +78,16 @@ namespace AxibugEmuOnline.Client
             private RomFile m_rom;
             private Filter m_filter;
 
+            public override bool IsApplied
+            {
+                get
+                {
+                    var setting = App.settings.Filter.GetFilterSetting(m_rom);
+                    return setting.filter == m_filter && setting.preset == m_preset;
+                }
+            }
+
+
             public FilterPresetMenu(RomFile rom, Filter filter, FilterPreset preset) : base(preset.Name, null)
             {
                 m_preset = preset;

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -470,7 +470,7 @@ public class ItemPresent : GridLayoutGroup, IVirtualLayout
     }
 
 
-    public void SetData(object dataList)
+    public void SetData(IEnumerable dataList)
     {
         Clear();
 
@@ -493,7 +493,7 @@ public class ItemPresent : GridLayoutGroup, IVirtualLayout
         }
         else
         {
-            Debug.LogException(new Exception("ItemPresent SetData 传递的参数类型不受支持"), gameObject);
+            Debug.LogException(new Exception("ItemPresent SetData 传递的参数类型不受支持"), gameObject);
             return;
         }
 

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/ItemProxy.cs

@@ -1,3 +1,4 @@
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
@@ -16,7 +17,7 @@ public interface IVirtualLayout
 
 	void UpdateProxyVisualState();
 	void UpdateDependencyProperty(object dp);
-	void SetData(object dataList);
+	void SetData(IEnumerable dataList);
 	void MoveToScrollViewCenter(ScrollRect scrollRect, int dataIndex);
 }
 

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

@@ -1,4 +1,4 @@
-using AxibugEmuOnline.Client.UI;
+using AxibugEmuOnline.Client.UI;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -39,7 +39,7 @@ namespace AxibugEmuOnline.Client
             }
 
             Canvas.ForceUpdateCanvases();
-            SelectIndex = 0;
+            if (m_selectIndex == -1) SelectIndex = 0;
         }
 
         protected virtual MenuItem GetItemUIByIndex(int index)

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

@@ -270,17 +270,17 @@ namespace AxibugEmuOnline.Client
         private void CreateRuntimeMenuItem(OptionMenu menuData)
         {
             if (menuData is ExecuteMenu)
-            {
+            {
-				ExecuteMenu executeMenu = (ExecuteMenu)menuData;
+                ExecuteMenu executeMenu = (ExecuteMenu)menuData;
-				var menuUI = Instantiate(TEMPLATE_EXECUTEITEM.gameObject, TEMPLATE_EXECUTEITEM.transform.parent).GetComponent<OptionUI_ExecuteItem>();
+                var menuUI = Instantiate(TEMPLATE_EXECUTEITEM.gameObject, TEMPLATE_EXECUTEITEM.transform.parent).GetComponent<OptionUI_ExecuteItem>();
                 menuUI.gameObject.SetActive(true);
                 menuUI.SetData(this, executeMenu);
                 m_runtimeMenuItems.Add(menuUI);
             }
             else if (menuData is ValueSetMenu)
             {
-                var valueSetMenu = (ValueSetMenu)menuData;
+                var valueSetMenu = (ValueSetMenu)menuData;
-				var menuUI = Instantiate(TEMPLATE_VALUEEDITITEM.gameObject, TEMPLATE_VALUEEDITITEM.transform.parent).GetComponent<OptionUI_ValueEditItem>();
+                var menuUI = Instantiate(TEMPLATE_VALUEEDITITEM.gameObject, TEMPLATE_VALUEEDITITEM.transform.parent).GetComponent<OptionUI_ValueEditItem>();
                 menuUI.gameObject.SetActive(true);
                 menuUI.SetData(this, valueSetMenu);
                 m_runtimeMenuItems.Add(menuUI);
@@ -384,13 +384,15 @@ namespace AxibugEmuOnline.Client
     /// </summary>
     public abstract class ExecuteMenu : OptionMenu
     {
+        /// <summary> 设置这个值以控制菜单中显示"已应用"标记 </summary>
+        public virtual bool IsApplied { get; }
         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
     {
@@ -403,6 +405,19 @@ namespace AxibugEmuOnline.Client
         }
 
         protected abstract List<OptionMenu> GetOptionMenus();
+    }
+    /// <summary>
+    /// 带有值类型显示和编辑的菜单
+    /// </summary>
+    public abstract class ValueSetMenu : OptionMenu
+    {
+        protected ValueSetMenu(string name) : base(name) { }
+
+        public abstract Type ValueType { get; }
+        public abstract object ValueRaw { get; }
+        public abstract void OnValueChanged(object newValue);
+        public abstract object Min { get; }
+        public abstract object Max { get; }
     }
 
     /// <summary> 不要直接继承这个类 </summary>
@@ -423,17 +438,5 @@ namespace AxibugEmuOnline.Client
         public virtual void OnShow(OptionUI_MenuItem ui) { }
         public virtual void OnHide() { }
     }
-    /// <summary>
-    /// 带有值类型显示和编辑的菜单
-    /// </summary>
-    public abstract class ValueSetMenu : OptionMenu
-    {
-        protected ValueSetMenu(string name) : base(name) { }
 
-        public abstract Type ValueType { get; }
-        public abstract object ValueRaw { get; }
-        public abstract void OnValueChanged(object newValue);
-        public abstract object Min { get; }
-        public abstract object Max { get; }
-    }
 }

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI_ExecuteItem.cs

@@ -1,21 +1,28 @@
-using UnityEngine;
+using UnityEngine;
 
 namespace AxibugEmuOnline.Client
 {
     public class OptionUI_ExecuteItem : OptionUI_MenuItem<ExecuteMenu>
     {
         public GameObject ExpandFlag;
+        public GameObject ApplyFlag;
 
         protected override void OnSetData(OptionMenu menuData)
         {
             base.OnSetData(menuData);
 
             ExpandFlag.SetActiveEx(IsExpandMenu);
+            ApplyFlag.SetActiveEx(IsApplied);
         }
 
         public override void OnExecute(OptionUI optionUI, ref bool cancelHide)
         {
             MenuData.OnExcute(optionUI, ref cancelHide);
         }
+
+        protected override void Update()
+        {
+            ApplyFlag.SetActiveEx(IsApplied);
+        }
     }
 }

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI_MenuItem.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.UI;
 
 namespace AxibugEmuOnline.Client
@@ -31,6 +31,7 @@ namespace AxibugEmuOnline.Client
         }
 
         public bool IsExpandMenu => m_Menu is ExpandMenu;
+        public bool IsApplied => m_Menu is ExecuteMenu om && om.IsApplied;
 
         protected abstract void OnSetData(OptionMenu menuData);
 
@@ -39,6 +40,7 @@ namespace AxibugEmuOnline.Client
         public virtual void OnRight() { }
         public abstract void OnFocus();
         public virtual void OnHide() { }
+        protected virtual void Update() { }
     }
 
     public abstract class OptionUI_MenuItem<T> : OptionUI_MenuItem

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/RoomUI/RoomItem.cs

@@ -86,7 +86,7 @@ namespace AxibugEmuOnline.Client
             SetBaseInfo("--", $"<b>{hostNick}</b>的房间", $"{cur}/{max}");
             SetIcon(null);
 
-            roomInfo.FetchRomFileInRoomInfo(EnumSupportEmuPlatform.NES, (room, romFile) =>
+            roomInfo.FetchRomFileInRoomInfo(RomPlatformType.Nes, (room, romFile) =>
             {
                 if (room.RoomID != RoomID) return;
 

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/RoomUI/RoomListMenuItem.cs

@@ -1,4 +1,4 @@
-using AxibugEmuOnline.Client.ClientCore;
+using AxibugEmuOnline.Client.ClientCore;
 using AxibugEmuOnline.Client.Event;
 using System;
 
@@ -61,10 +61,10 @@ namespace AxibugEmuOnline.Client
             }
         }
 
-        protected override void GetVirtualListDatas(Action<object> datas)
+        protected override void GetVirtualListDatas(VirtualListDataHandle callback)
         {
             var roomList = App.roomMgr.GetRoomList();
-            datas.Invoke(roomList);
+            callback.Invoke(roomList, 0);
         }
 
     }

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

@@ -1,4 +1,4 @@
-using AxibugEmuOnline.Client.UI;
+using AxibugEmuOnline.Client.UI;
 using DG.Tweening;
 using System.Collections.Generic;
 using UnityEngine;
@@ -39,10 +39,10 @@ namespace AxibugEmuOnline.Client
             }
         }
 
-        public void ResetToFirst()
+        public void ResetToIndex(int selectIndex)
         {
             m_selectIndex = -1;
-            SelectIndex = 0;
+            SelectIndex = selectIndex;
         }
 
         protected override MenuItem GetItemUIByIndex(int index)

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

@@ -1,8 +1,9 @@
-using AxibugEmuOnline.Client.UI;
+using AxibugEmuOnline.Client.UI;
 using DG.Tweening;
 using DG.Tweening.Core;
 using DG.Tweening.Plugins.Options;
 using System;
+using System.Collections;
 using UnityEngine;
 
 namespace AxibugEmuOnline.Client
@@ -64,19 +65,22 @@ namespace AxibugEmuOnline.Client
             return true;
         }
 
+        public delegate void VirtualListDataHandle(IEnumerable data, int initialIndex);
+
+
         protected void RefreshUI()
         {
-            GetVirtualListDatas((datas) =>
+            GetVirtualListDatas((datas, initialIndex) =>
             {
                 var thirdMenuGroup = SubMenuItemGroup as ThirdMenuRoot;
                 thirdMenuGroup.itemGroup.UpdateDependencyProperty(thirdMenuGroup);
                 thirdMenuGroup.itemGroup.SetData(datas);
                 thirdMenuGroup.itemGroup.UpdateProxyVisualState();
-                thirdMenuGroup.ResetToFirst();
+                thirdMenuGroup.ResetToIndex(initialIndex);
             });
         }
 
-        protected abstract void GetVirtualListDatas(Action<object> datas);
+        protected abstract void GetVirtualListDatas(VirtualListDataHandle callback);
 
         public override bool OnExitItem()
         {

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

@@ -34,7 +34,7 @@ namespace AxibugEmuOnline.Client
         }
 
         private static Dictionary<int, RomFile> s_RomFileCahcesInRoomInfo = new Dictionary<int, RomFile>();
-        public static void FetchRomFileInRoomInfo(this Protobuf_Room_MiniInfo roomInfo, EnumSupportEmuPlatform platform, Action<Protobuf_Room_MiniInfo, RomFile> callback)
+        public static void FetchRomFileInRoomInfo(this Protobuf_Room_MiniInfo roomInfo, RomPlatformType platform, Action<Protobuf_Room_MiniInfo, RomFile> callback)
         {
             RomFile romFile;
 
@@ -45,10 +45,10 @@ namespace AxibugEmuOnline.Client
             }
             switch (platform)
             {
-                case EnumSupportEmuPlatform.NES:
+                case RomPlatformType.Nes:
                     App.StartCoroutine(App.httpAPI.GetRomInfo(roomInfo.GameRomID, (romWebData) =>
                     {
-                        RomFile _romFile = new RomFile(EnumSupportEmuPlatform.NES, 0, 0);
+                        RomFile _romFile = new RomFile(0, 0);
                         _romFile.SetWebData(romWebData);
                         s_RomFileCahcesInRoomInfo[roomInfo.GameRomID] = _romFile;
 

AxibugEmuOnline.Client/ProjectSettings/ProjectSettings.asset

@@ -47,7 +47,7 @@ PlayerSettings:
   defaultScreenWidthWeb: 960
   defaultScreenHeightWeb: 600
   m_StereoRenderingPath: 0
-  m_ActiveColorSpace: 1
+  m_ActiveColorSpace: 0
   unsupportedMSAAFallback: 0
   m_SpriteBatchMaxVertexCount: 65535
   m_SpriteBatchVertexThreshold: 300

AxibugEmuOnline.Server/Protobuf/ProtobufAxibugEmuOnline.cs

@@ -133,15 +133,15 @@ namespace AxibugProtobuf {
             "U3dpdGNoSm95Q29uEAcSEgoOWEJPWDM2MENvbnRyb2wQCBISCg5YQk9YT05F",
             "Q29udHJvbBAJEhEKDVBTVml0YUNvbnRyb2wQChISCg5XaWlVUGFkQ29udHJv",
             "bBALEhQKEFdpaVJlbW90ZUNvbnRyb2wQDBIWChJOaW50ZW5kbzNEU0NvbnRy",
-            "b2wQDSqUAQoPUm9tUGxhdGZvcm1UeXBlEgcKA0FsbBAAEgcKA05lcxABEhEK",
+            "b2wQDSqiAQoPUm9tUGxhdGZvcm1UeXBlEgsKB0ludmFsaWQQABIHCgNOZXMQ",
-            "DU1hc3Rlcl9TeXN0ZW0QAhINCglHYW1lX0dlYXIQAxIMCghHYW1lX0JveRAE",
+            "ARIRCg1NYXN0ZXJfU3lzdGVtEAISDQoJR2FtZV9HZWFyEAMSDAoIR2FtZV9C",
-            "EhIKDkdhbWVfQm95X0NvbG9yEAUSEQoNQ29sZWNvX1Zpc2lvbhAGEgsKB1ND",
+            "b3kQBBISCg5HYW1lX0JveV9Db2xvchAFEhEKDUNvbGVjb19WaXNpb24QBhIL",
-            "XzMwMDAQBxILCgdTR18xMDAwEAgqcAoNUm9vbUdhbWVTdGF0ZRISCg5Ob25l",
+            "CgdTQ18zMDAwEAcSCwoHU0dfMTAwMBAIEggKA0FsbBDnBypwCg1Sb29tR2Ft",
-            "X0dhbWVTdGF0ZRAAEgwKCE9ubHlIb3N0EAESEQoNV2FpdFJhd1VwZGF0ZRAC",
+            "ZVN0YXRlEhIKDk5vbmVfR2FtZVN0YXRlEAASDAoIT25seUhvc3QQARIRCg1X",
-            "Eg0KCVdhaXRSZWFkeRADEgkKBVBhdXNlEAQSEAoMSW5PbmxpbmVHYW1lEAUq",
+            "YWl0UmF3VXBkYXRlEAISDQoJV2FpdFJlYWR5EAMSCQoFUGF1c2UQBBIQCgxJ",
-            "TgoRTG9naW5SZXN1bHRTdGF0dXMSIQodTG9naW5SZXN1bHRTdGF0dXNfQmFz",
+            "bk9ubGluZUdhbWUQBSpOChFMb2dpblJlc3VsdFN0YXR1cxIhCh1Mb2dpblJl",
-            "ZURlZmF1bHQQABIGCgJPSxABEg4KCkFjY291bnRFcnIQAkICSAFiBnByb3Rv",
+            "c3VsdFN0YXR1c19CYXNlRGVmYXVsdBAAEgYKAk9LEAESDgoKQWNjb3VudEVy",
-            "Mw=="));
+            "chACQgJIAWIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::AxibugProtobuf.CommandID), typeof(global::AxibugProtobuf.ErrorCode), typeof(global::AxibugProtobuf.LoginType), typeof(global::AxibugProtobuf.DeviceType), typeof(global::AxibugProtobuf.GamePadType), typeof(global::AxibugProtobuf.RomPlatformType), typeof(global::AxibugProtobuf.RoomGameState), typeof(global::AxibugProtobuf.LoginResultStatus), }, null, new pbr::GeneratedClrTypeInfo[] {
@@ -416,7 +416,7 @@ namespace AxibugProtobuf {
   }
 
   public enum RomPlatformType {
-    [pbr::OriginalName("All")] All = 0,
+    [pbr::OriginalName("Invalid")] Invalid = 0,
     [pbr::OriginalName("Nes")] Nes = 1,
     [pbr::OriginalName("Master_System")] MasterSystem = 2,
     [pbr::OriginalName("Game_Gear")] GameGear = 3,
@@ -425,6 +425,7 @@ namespace AxibugProtobuf {
     [pbr::OriginalName("Coleco_Vision")] ColecoVision = 6,
     [pbr::OriginalName("SC_3000")] Sc3000 = 7,
     [pbr::OriginalName("SG_1000")] Sg1000 = 8,
+    [pbr::OriginalName("All")] All = 999,
   }
 
   public enum RoomGameState {

ProtobufCore/out/CS/ProtobufAxibugEmuOnline.cs

@@ -133,15 +133,15 @@ namespace AxibugProtobuf {
             "U3dpdGNoSm95Q29uEAcSEgoOWEJPWDM2MENvbnRyb2wQCBISCg5YQk9YT05F",
             "Q29udHJvbBAJEhEKDVBTVml0YUNvbnRyb2wQChISCg5XaWlVUGFkQ29udHJv",
             "bBALEhQKEFdpaVJlbW90ZUNvbnRyb2wQDBIWChJOaW50ZW5kbzNEU0NvbnRy",
-            "b2wQDSqUAQoPUm9tUGxhdGZvcm1UeXBlEgcKA0FsbBAAEgcKA05lcxABEhEK",
+            "b2wQDSqiAQoPUm9tUGxhdGZvcm1UeXBlEgsKB0ludmFsaWQQABIHCgNOZXMQ",
-            "DU1hc3Rlcl9TeXN0ZW0QAhINCglHYW1lX0dlYXIQAxIMCghHYW1lX0JveRAE",
+            "ARIRCg1NYXN0ZXJfU3lzdGVtEAISDQoJR2FtZV9HZWFyEAMSDAoIR2FtZV9C",
-            "EhIKDkdhbWVfQm95X0NvbG9yEAUSEQoNQ29sZWNvX1Zpc2lvbhAGEgsKB1ND",
+            "b3kQBBISCg5HYW1lX0JveV9Db2xvchAFEhEKDUNvbGVjb19WaXNpb24QBhIL",
-            "XzMwMDAQBxILCgdTR18xMDAwEAgqcAoNUm9vbUdhbWVTdGF0ZRISCg5Ob25l",
+            "CgdTQ18zMDAwEAcSCwoHU0dfMTAwMBAIEggKA0FsbBDnBypwCg1Sb29tR2Ft",
-            "X0dhbWVTdGF0ZRAAEgwKCE9ubHlIb3N0EAESEQoNV2FpdFJhd1VwZGF0ZRAC",
+            "ZVN0YXRlEhIKDk5vbmVfR2FtZVN0YXRlEAASDAoIT25seUhvc3QQARIRCg1X",
-            "Eg0KCVdhaXRSZWFkeRADEgkKBVBhdXNlEAQSEAoMSW5PbmxpbmVHYW1lEAUq",
+            "YWl0UmF3VXBkYXRlEAISDQoJV2FpdFJlYWR5EAMSCQoFUGF1c2UQBBIQCgxJ",
-            "TgoRTG9naW5SZXN1bHRTdGF0dXMSIQodTG9naW5SZXN1bHRTdGF0dXNfQmFz",
+            "bk9ubGluZUdhbWUQBSpOChFMb2dpblJlc3VsdFN0YXR1cxIhCh1Mb2dpblJl",
-            "ZURlZmF1bHQQABIGCgJPSxABEg4KCkFjY291bnRFcnIQAkICSAFiBnByb3Rv",
+            "c3VsdFN0YXR1c19CYXNlRGVmYXVsdBAAEgYKAk9LEAESDgoKQWNjb3VudEVy",
-            "Mw=="));
+            "chACQgJIAWIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::AxibugProtobuf.CommandID), typeof(global::AxibugProtobuf.ErrorCode), typeof(global::AxibugProtobuf.LoginType), typeof(global::AxibugProtobuf.DeviceType), typeof(global::AxibugProtobuf.GamePadType), typeof(global::AxibugProtobuf.RomPlatformType), typeof(global::AxibugProtobuf.RoomGameState), typeof(global::AxibugProtobuf.LoginResultStatus), }, null, new pbr::GeneratedClrTypeInfo[] {
@@ -416,7 +416,7 @@ namespace AxibugProtobuf {
   }
 
   public enum RomPlatformType {
-    [pbr::OriginalName("All")] All = 0,
+    [pbr::OriginalName("Invalid")] Invalid = 0,
     [pbr::OriginalName("Nes")] Nes = 1,
     [pbr::OriginalName("Master_System")] MasterSystem = 2,
     [pbr::OriginalName("Game_Gear")] GameGear = 3,
@@ -425,6 +425,7 @@ namespace AxibugProtobuf {
     [pbr::OriginalName("Coleco_Vision")] ColecoVision = 6,
     [pbr::OriginalName("SC_3000")] Sc3000 = 7,
     [pbr::OriginalName("SG_1000")] Sg1000 = 8,
+    [pbr::OriginalName("All")] All = 999,
   }
 
   public enum RoomGameState {

ProtobufCore/proto/protobuf_AxibugEmuOnline.proto

@@ -126,7 +126,7 @@ enum GamePadType //手柄类型
 
 enum RomPlatformType
 {
-    All = 0;
+    Invalid = 0;
     Nes = 1;
     Master_System = 2;
 	Game_Gear = 3;
@@ -135,6 +135,7 @@ enum RomPlatformType
 	Coleco_Vision = 6;
 	SC_3000 = 7;
 	SG_1000 = 8;
+	All = 999;
 }
 
 //enum RoomPlayerState