diff --git a/.gitignore b/.gitignore index 53bd8090..b658f5ea 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /AxibugEmuOnline.Client/Logs /virtuanessrc097-master +/AxibugEmuOnline.Server/config.cfg +/AxibugEmuOnline.Server/bin/ diff --git a/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/mulutplayer.png b/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/mulutplayer.png new file mode 100644 index 00000000..9ba9f90d Binary files /dev/null and b/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/mulutplayer.png differ diff --git a/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/mulutplayer.png.meta b/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/mulutplayer.png.meta new file mode 100644 index 00000000..43d2efba --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/mulutplayer.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 3c5bcd93f63e578418fe9015ea1c0337 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/vthlpkgstdm9tocdpk79q9g5as-aa380ae6cc6170d967c692309188eac9.png.meta b/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/vthlpkgstdm9tocdpk79q9g5as-aa380ae6cc6170d967c692309188eac9.png.meta index e2a88e25..e400bbb2 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/vthlpkgstdm9tocdpk79q9g5as-aa380ae6cc6170d967c692309188eac9.png.meta +++ b/AxibugEmuOnline.Client/Assets/Resources/Icons/XMB-Icons/vthlpkgstdm9tocdpk79q9g5as-aa380ae6cc6170d967c692309188eac9.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 9, y: 0, z: 63, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -99,6 +99,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/MenuItemTemplate.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/MenuItemTemplate.prefab index f4d3a07b..eb7c63cf 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/MenuItemTemplate.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/MenuItemTemplate.prefab @@ -128,6 +128,8 @@ MonoBehaviour: m_EditorClassIdentifier: Icon: {fileID: 6771349210554360888} Txt: {fileID: 991446423622995247} + SubTitle: {fileID: 0} + spline: {fileID: 0} Descript: {fileID: 0} Root: {fileID: 8754483333502849411} ShadowIcon: {fileID: 0} @@ -222,7 +224,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -296,8 +298,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed40f0945dba47e409627739ce124125, type: 3} m_Name: m_EditorClassIdentifier: - PulseInvoke_Delay: 0.4 - PulseInvoke_Interval: 0.05 m_menuItemRoot: {fileID: 3226730524206505336} SubMenuItemTemplate: {fileID: 2502609279043838113, guid: 01f3c5497992f944eae9b9efa15a19c2, type: 3} alphaGroup: {fileID: 6355204462360987243} diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OptionUI.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OptionUI.prefab index eedeefcd..a736bf9f 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OptionUI.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OptionUI.prefab @@ -733,7 +733,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OverlayUI/InputUI.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OverlayUI/InputUI.prefab index 344c61ac..16930e5a 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OverlayUI/InputUI.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/OverlayUI/InputUI.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 75 m_FontStyle: 2 m_BestFit: 0 @@ -78,7 +78,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: Enter text... + m_Text: "\u8F93\u5165\u5185\u5BB9..." --- !u!1 &3197032368305979763 GameObject: m_ObjectHideFlags: 0 @@ -145,7 +145,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 75 m_FontStyle: 0 m_BestFit: 0 @@ -439,8 +439,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d366ee5eba9505c4ca908df5cfb35585, type: 3} m_Name: m_EditorClassIdentifier: - PulseInvoke_Delay: 0.4 - PulseInvoke_Interval: 0.05 StartAlpha: 0 StartScale: 1.2 Duration: 0.5 diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/Background_Template.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/Background_Template.prefab index 1a78bec9..9c29e13f 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/Background_Template.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/Background_Template.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -920,7 +920,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/GlobalFilter_Template.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/GlobalFilter_Template.prefab index 236bdf54..01422504 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/GlobalFilter_Template.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/GlobalFilter_Template.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -920,7 +920,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/Room_Template.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/Room_Template.prefab index aa64ea1d..ccf26090 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/Room_Template.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/Room_Template.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -445,10 +445,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 13190caeb949d3541bfcb2b2f66b5d45, type: 3} m_Name: m_EditorClassIdentifier: - PulseInvoke_Delay: 0.4 - PulseInvoke_Interval: 0.05 Icon: {fileID: 6771349210554360888} Txt: {fileID: 991446423622995247} + SubTitle: {fileID: 0} + spline: {fileID: 0} Descript: {fileID: 3380485461544738227} Root: {fileID: 8754483333502849411} ShadowIcon: {fileID: 2619187604372594158} @@ -635,8 +635,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1d1e3e91ac34bc8468f357ee247ffb6a, type: 3} m_Name: m_EditorClassIdentifier: - PulseInvoke_Delay: 0.4 - PulseInvoke_Interval: 0.05 m_menuItemRoot: {fileID: 0} SubMenuItemTemplate: {fileID: 0} alphaGroup: {fileID: 0} @@ -826,7 +824,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/BgSetting_Color_ItemTemplate.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/BgSetting_Color_ItemTemplate.prefab index 76e2bb4d..143ede96 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/BgSetting_Color_ItemTemplate.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/BgSetting_Color_ItemTemplate.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -641,7 +641,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -735,7 +735,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/FilterItemTemplate.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/FilterItemTemplate.prefab index df1f9a29..e9785275 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/FilterItemTemplate.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/FilterItemTemplate.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -565,7 +565,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -659,7 +659,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RomItemTemplate.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RomItemTemplate.prefab index f549c797..a8a28f46 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RomItemTemplate.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RomItemTemplate.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -145,7 +145,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 @@ -1097,7 +1097,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RoomItemTemplate.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RoomItemTemplate.prefab index 52419533..addbea9e 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RoomItemTemplate.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/VirtualItemTemplates/RoomItemTemplate.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -145,7 +145,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 @@ -987,7 +987,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/XMBTopGroup.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/XMBTopGroup.prefab index 9baf6838..f16b8b89 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/XMBTopGroup.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/XMBTopGroup.prefab @@ -1,5 +1,148 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &593135073566011419 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4894793418161725275} + - component: {fileID: 5471965615950956593} + m_Layer: 5 + m_Name: OnlinePlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4894793418161725275 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 593135073566011419} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1108503213262670097} + - {fileID: 1710183501897154830} + m_Father: {fileID: 5353336693430589123} + m_RootOrder: 1 + 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: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5471965615950956593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 593135073566011419} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 20 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &2791573445756476025 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1710183501897154830} + - component: {fileID: 5218580839012101497} + - component: {fileID: 9033504323044377285} + m_Layer: 5 + m_Name: OnlinePlayerCount + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1710183501897154830 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2791573445756476025} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4894793418161725275} + m_RootOrder: 1 + 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 &5218580839012101497 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2791573445756476025} + m_CullTransparentMesh: 1 +--- !u!114 &9033504323044377285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2791573445756476025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 44 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 10 --- !u!1 &2950463686674914991 GameObject: m_ObjectHideFlags: 0 @@ -236,6 +379,102 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &4957813508399359771 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1108503213262670097} + - component: {fileID: 795616588828334423} + - component: {fileID: 7275542771624007700} + - component: {fileID: 3265845674591991370} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1108503213262670097 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4957813508399359771} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4894793418161725275} + m_RootOrder: 0 + 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 &795616588828334423 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4957813508399359771} + m_CullTransparentMesh: 1 +--- !u!114 &7275542771624007700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4957813508399359771} + 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: 3c5bcd93f63e578418fe9015ea1c0337, 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 &3265845674591991370 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4957813508399359771} + 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: 67.51 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &5568161260996910275 GameObject: m_ObjectHideFlags: 0 @@ -266,6 +505,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4541943946029862829} + - {fileID: 4894793418161725275} - {fileID: 2005113594707322973} - {fileID: 4195056312044822544} - {fileID: 1746243318642131728} @@ -321,6 +561,7 @@ MonoBehaviour: imgPower2: {fileID: 7232861150095392420} imgPower3: {fileID: 6694955234077232327} DelayValue: {fileID: 6486398873987280650} + OnlinePlayerCount: {fileID: 9033504323044377285} FPS: {fileID: 2545793518460288919} --- !u!1 &5629957813601835122 GameObject: @@ -354,7 +595,7 @@ RectTransform: m_Children: - {fileID: 1735688216191931001} m_Father: {fileID: 5353336693430589123} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -485,11 +726,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 0 m_MaxSize: 55 m_Alignment: 5 m_AlignByGeometry: 0 @@ -604,7 +845,7 @@ RectTransform: - {fileID: 1777012203952456443} - {fileID: 7158194035478552859} m_Father: {fileID: 5353336693430589123} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -667,7 +908,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5353336693430589123} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -703,11 +944,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 47 + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 0 m_MaxSize: 55 m_Alignment: 5 m_AlignByGeometry: 0 @@ -782,11 +1023,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 44 + m_Font: {fileID: 12800000, guid: 33a3bdf8f6bd1ec4eba7c4bc58183212, type: 3} + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 0 m_MaxSize: 44 m_Alignment: 4 m_AlignByGeometry: 0 diff --git a/AxibugEmuOnline.Client/Assets/Resources/XMBFont.meta b/AxibugEmuOnline.Client/Assets/Resources/XMBFont.meta new file mode 100644 index 00000000..8c491cbc --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Resources/XMBFont.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9726a2645e7a05e47b3cf5ebb5c736ab +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Resources/XMBFont/SCE-PS3-NR-B-JPN.TTF b/AxibugEmuOnline.Client/Assets/Resources/XMBFont/SCE-PS3-NR-B-JPN.TTF new file mode 100644 index 00000000..53707b8b Binary files /dev/null and b/AxibugEmuOnline.Client/Assets/Resources/XMBFont/SCE-PS3-NR-B-JPN.TTF differ diff --git a/AxibugEmuOnline.Client/Assets/Resources/XMBFont/SCE-PS3-NR-B-JPN.TTF.meta b/AxibugEmuOnline.Client/Assets/Resources/XMBFont/SCE-PS3-NR-B-JPN.TTF.meta new file mode 100644 index 00000000..6e323eb2 --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Resources/XMBFont/SCE-PS3-NR-B-JPN.TTF.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: 33a3bdf8f6bd1ec4eba7c4bc58183212 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - SCE-PS3 NewRodin JPN + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Script/Manager/UserDataManager.cs b/AxibugEmuOnline.Client/Assets/Script/Manager/UserDataManager.cs index fe2b2639..e7a33990 100644 --- a/AxibugEmuOnline.Client/Assets/Script/Manager/UserDataManager.cs +++ b/AxibugEmuOnline.Client/Assets/Script/Manager/UserDataManager.cs @@ -152,6 +152,7 @@ namespace AxibugEmuOnline.Client.Manager public void RecvUserOnlinelist(byte[] reqData) { Protobuf_UserList_RESP msg = ProtoBufHelper.DeSerizlize(reqData); + DictUID2User.Clear(); for (int i = 0; i < msg.UserList.Count; i++) { UserMiniInfo mi = msg.UserList[i]; diff --git a/AxibugEmuOnline.Client/Assets/Script/UI/XMBTopGroupUI/XMBTopGroup.cs b/AxibugEmuOnline.Client/Assets/Script/UI/XMBTopGroupUI/XMBTopGroup.cs index 811a23d7..909da4bf 100644 --- a/AxibugEmuOnline.Client/Assets/Script/UI/XMBTopGroupUI/XMBTopGroup.cs +++ b/AxibugEmuOnline.Client/Assets/Script/UI/XMBTopGroupUI/XMBTopGroup.cs @@ -12,6 +12,7 @@ public class XMBTopGroup : MonoBehaviour public Image imgPower2; public Image imgPower3; public Text DelayValue; + public Text OnlinePlayerCount; public Text FPS; void OnEnable() @@ -56,12 +57,22 @@ public class XMBTopGroup : MonoBehaviour if (App.user == null) { DelayValue.text = $"-"; + OnlinePlayerCount.text = $"-"; return; } - if (App.user.IsLoggedIn) - DelayValue.text = $"{App.tickLoop.AveNetDelay * 1000:0}ms"; else - DelayValue.text = "-"; + { + if (App.user.IsLoggedIn) + { + DelayValue.text = $"{App.tickLoop.AveNetDelay * 1000:0}ms"; + OnlinePlayerCount.text = App.user.OnlinePlayerCount.ToString(); + } + else + { + DelayValue.text = "-"; + OnlinePlayerCount.text = $"-"; + } + } } void RefreshTime()