diff --git a/Assets/Resources/Images/NewDesign/icon_none_PC.png b/Assets/Resources/Images/NewDesign/icon_none_PC.png new file mode 100644 index 00000000..a57b2260 Binary files /dev/null and b/Assets/Resources/Images/NewDesign/icon_none_PC.png differ diff --git a/Assets/Resources/Images/NewDesign/icon_none_PC.png.meta b/Assets/Resources/Images/NewDesign/icon_none_PC.png.meta new file mode 100644 index 00000000..7dd31b57 --- /dev/null +++ b/Assets/Resources/Images/NewDesign/icon_none_PC.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 636f568c33e7a03409ae710a1e44e945 +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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + 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: 2048 + 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: 2048 + 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: 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab b/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab index 87222c29..03c7b70a 100644 --- a/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab @@ -489,6 +489,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6d865b6d0ecb54044a4600bc590d8c29, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} --- !u!1 &1273472110172321477 GameObject: m_ObjectHideFlags: 0 @@ -709,7 +710,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1569894540830352816} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1710,9 +1711,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1569894539194797782} - - {fileID: 1569894539192063988} - - {fileID: 1569894539226892726} - {fileID: 1569894541186943689} + - {fileID: 1569894539226892726} + - {fileID: 1569894539192063988} m_Father: {fileID: 956475306156679521} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1985,7 +1986,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1569894540830352816} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -6628,18 +6629,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} ---- !u!1 &5469857785895773085 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322, - type: 3} - m_PrefabInstance: {fileID: 5377764333726817737} - m_PrefabAsset: {fileID: 0} --- !u!224 &8698039831671925482 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} m_PrefabInstance: {fileID: 5377764333726817737} m_PrefabAsset: {fileID: 0} +--- !u!1 &5469857785895773085 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + m_PrefabInstance: {fileID: 5377764333726817737} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5377764333992007874 PrefabInstance: m_ObjectHideFlags: 0 @@ -6794,18 +6795,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} ---- !u!224 &8698039833564966881 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, - type: 3} - m_PrefabInstance: {fileID: 5377764333992007874} - m_PrefabAsset: {fileID: 0} --- !u!1 &5469857784028620438 stripped GameObject: m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} m_PrefabInstance: {fileID: 5377764333992007874} m_PrefabAsset: {fileID: 0} +--- !u!224 &8698039833564966881 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + m_PrefabInstance: {fileID: 5377764333992007874} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5377764333995795933 PrefabInstance: m_ObjectHideFlags: 0 @@ -7332,18 +7333,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} ---- !u!1 &5469857784411156186 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322, - type: 3} - m_PrefabInstance: {fileID: 5377764334339281038} - m_PrefabAsset: {fileID: 0} --- !u!224 &8698039832972322733 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} m_PrefabInstance: {fileID: 5377764334339281038} m_PrefabAsset: {fileID: 0} +--- !u!1 &5469857784411156186 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + m_PrefabInstance: {fileID: 5377764334339281038} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5377764334390996350 PrefabInstance: m_ObjectHideFlags: 0 @@ -7659,18 +7660,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 7247456572859612787} m_PrefabAsset: {fileID: 0} ---- !u!1 &9065530877846007579 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322, - type: 3} - m_PrefabInstance: {fileID: 7247456572859612787} - m_PrefabAsset: {fileID: 0} --- !u!1 &7340126173464641575 stripped GameObject: m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} m_PrefabInstance: {fileID: 7247456572859612787} m_PrefabAsset: {fileID: 0} +--- !u!1 &9065530877846007579 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + m_PrefabInstance: {fileID: 7247456572859612787} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7648405948234622015 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab index 7ecd0726..fea7a59f 100644 --- a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab @@ -512,7 +512,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 9010183385215238374} + - {fileID: 3339464244184089886} - {fileID: 6716876375646013416} - {fileID: 8875822429274516680} m_Father: {fileID: 1226992094195917165} @@ -1384,52 +1384,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 ---- !u!1 &1895906820022942409 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9010183385215238374} - - component: {fileID: 7106983103777545877} - m_Layer: 5 - m_Name: Error - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &9010183385215238374 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1895906820022942409} - 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: 3931808720592084674} - - {fileID: 1133521839064619488} - m_Father: {fileID: 7904755005890146302} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 75, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7106983103777545877 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1895906820022942409} - m_CullTransparentMesh: 0 --- !u!1 &2360510148091404934 GameObject: m_ObjectHideFlags: 0 @@ -1745,6 +1699,80 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: +--- !u!1 &2753566381595610405 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5067855589099975263} + - component: {fileID: 5980198234481237507} + - component: {fileID: 9152867552372689918} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5067855589099975263 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2753566381595610405} + 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: 3339464244184089886} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 19.5} + m_SizeDelta: {x: 0, y: -39} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5980198234481237507 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2753566381595610405} + m_CullTransparentMesh: 0 +--- !u!114 &9152867552372689918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2753566381595610405} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 636f568c33e7a03409ae710a1e44e945, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2930936292948438031 GameObject: m_ObjectHideFlags: 0 @@ -2723,8 +2751,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 20} - m_SizeDelta: {x: 0, y: -40} + m_AnchoredPosition: {x: 0, y: 19.5} + m_SizeDelta: {x: 0, y: -39} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4479758116663823600 CanvasRenderer: @@ -2753,7 +2781,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e573a7ea39b67e141bbbf37295befcff, type: 3} + m_Sprite: {fileID: 21300000, guid: 636f568c33e7a03409ae710a1e44e945, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2779,6 +2807,98 @@ MonoBehaviour: m_MaskInteraction: 85 m_UseStencil: 1 m_RaycastFilter: 0 +--- !u!1 &4785922910559355343 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7906538989203152227} + - component: {fileID: 8419352065523252852} + - component: {fileID: 3473731100606217896} + - component: {fileID: 4657782939923318745} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7906538989203152227 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4785922910559355343} + 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: 3339464244184089886} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -130} + m_SizeDelta: {x: 0, y: 19} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8419352065523252852 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4785922910559355343} + m_CullTransparentMesh: 0 +--- !u!114 &3473731100606217896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4785922910559355343} + 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: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Found Nothing +--- !u!114 &4657782939923318745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4785922910559355343} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &4853418147711016672 GameObject: m_ObjectHideFlags: 0 @@ -3890,11 +4010,11 @@ RectTransform: m_Father: {fileID: 465239218947862517} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -160} - m_SizeDelta: {x: 292, y: 332} - m_Pivot: {x: 0.5, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 22} + m_SizeDelta: {x: 148, y: 149} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1032965800497702725 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4367,80 +4487,6 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &6101878047772796162 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3931808720592084674} - - component: {fileID: 498152741112043245} - - component: {fileID: 7765890115663569630} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3931808720592084674 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6101878047772796162} - 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: 9010183385215238374} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 12.5} - m_SizeDelta: {x: 0, y: -25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &498152741112043245 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6101878047772796162} - m_CullTransparentMesh: 0 ---- !u!114 &7765890115663569630 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6101878047772796162} - 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_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a1a24d26a55a3cd4382984833364e241, 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 &1429559311976359905 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5900,6 +5946,52 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: +--- !u!1 &6711773372079057828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3339464244184089886} + - component: {fileID: 2014425186598242905} + m_Layer: 5 + m_Name: Error + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3339464244184089886 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6711773372079057828} + 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: 5067855589099975263} + - {fileID: 7906538989203152227} + m_Father: {fileID: 7904755005890146302} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 22} + m_SizeDelta: {x: 148, y: 149} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2014425186598242905 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6711773372079057828} + m_CullTransparentMesh: 0 --- !u!1 &6743599095249549403 GameObject: m_ObjectHideFlags: 0 @@ -6116,10 +6208,10 @@ RectTransform: m_Father: {fileID: 8976674304292884952} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -292} - m_SizeDelta: {x: 211, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -130} + m_SizeDelta: {x: 0, y: 19} m_Pivot: {x: 0.5, y: 1} --- !u!222 &267367882303563041 CanvasRenderer: @@ -6142,98 +6234,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - m_FontSize: 28 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Found Nothing ---- !u!114 &5096622704785779144 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7187515827089651429} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} - m_Name: - m_EditorClassIdentifier: - key: ---- !u!1 &7215725316183276582 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1133521839064619488} - - component: {fileID: 2160574081170763192} - - component: {fileID: 3194640981892857471} - - component: {fileID: 5525001437956308744} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1133521839064619488 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7215725316183276582} - 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: 9010183385215238374} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 19} - m_Pivot: {x: 0.5, y: 0} ---- !u!222 &2160574081170763192 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7215725316183276582} - m_CullTransparentMesh: 0 ---- !u!114 &3194640981892857471 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7215725316183276582} - 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: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -6254,13 +6254,13 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Found Nothing ---- !u!114 &5525001437956308744 +--- !u!114 &5096622704785779144 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7215725316183276582} + m_GameObject: {fileID: 7187515827089651429} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} @@ -7007,18 +7007,18 @@ PrefabInstance: m_RemovedComponents: - {fileID: 7793409217181307314, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} ---- !u!1 &1500710352127235982 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - m_PrefabInstance: {fileID: 3480729881595313676} - m_PrefabAsset: {fileID: 0} --- !u!224 &1500710352127235983 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} m_PrefabInstance: {fileID: 3480729881595313676} m_PrefabAsset: {fileID: 0} +--- !u!1 &1500710352127235982 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + m_PrefabInstance: {fileID: 3480729881595313676} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5321188461237024149 PrefabInstance: m_ObjectHideFlags: 0 @@ -7183,30 +7183,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} ---- !u!224 &2234182990056195463 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} --- !u!1 &3075247155673026290 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} ---- !u!1 &4628129972378993927 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &6398833330297696636 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} --- !u!1 &8149286171844735752 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, @@ -7219,9 +7201,21 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} ---- !u!1 &3344798044730818033 stripped +--- !u!1 &6398833330297696636 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} +--- !u!224 &2234182990056195463 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4951052648640690816 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} @@ -7231,9 +7225,15 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} ---- !u!1 &4951052648640690816 stripped +--- !u!1 &4628129972378993927 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3344798044730818033 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} @@ -7391,9 +7391,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} ---- !u!1 &3980532922793874755 stripped +--- !u!1 &6749386026079657654 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} @@ -7427,24 +7427,24 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} ---- !u!1 &6216688916544654740 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 6073211655158443556} - m_PrefabAsset: {fileID: 0} ---- !u!1 &6749386026079657654 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 6073211655158443556} - m_PrefabAsset: {fileID: 0} --- !u!1 &7820744829146851513 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} +--- !u!1 &3980532922793874755 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 6073211655158443556} + m_PrefabAsset: {fileID: 0} +--- !u!1 &6216688916544654740 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 6073211655158443556} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6653062728498872177 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab index 334557a8..6cac4b3e 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab @@ -6333,10 +6333,10 @@ RectTransform: m_Father: {fileID: 8976674304292884952} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 19} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -80} + m_SizeDelta: {x: 114, y: 19} m_Pivot: {x: 0.5, y: 0} --- !u!222 &267367882303563041 CanvasRenderer: @@ -6535,10 +6535,10 @@ RectTransform: m_Father: {fileID: 8119043696946072022} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 19} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -80} + m_SizeDelta: {x: 114, y: 19} m_Pivot: {x: 0.5, y: 0} --- !u!222 &4537646163777136460 CanvasRenderer: diff --git a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs index 291319ce..b895e671 100644 --- a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs @@ -365,7 +365,7 @@ public class MapListController : PFUIPanel { var scrollrect = scroll.GetComponent(); Debug.Log(scrollrect.verticalNormalizedPosition); - if (scrollrect.verticalNormalizedPosition <= 0) + if (scrollrect.verticalNormalizedPosition < 0) { pageIndex++; GetList(); diff --git a/Assets/Scripts/UI/Prefab/Panel/MapListExtraController.cs b/Assets/Scripts/UI/Prefab/Panel/MapListExtraController.cs index e4b3bdb4..6c31b0d7 100644 --- a/Assets/Scripts/UI/Prefab/Panel/MapListExtraController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/MapListExtraController.cs @@ -137,6 +137,7 @@ public class MapListExtraController : PFUIPanel var res = await ConfigHelper.mapApi.GetMemberMapRouteAreaList(pageIndex, 10); if (res.result) { + p2.Find("Scroll View/Error").gameObject.SetActive(res.data.Count == 0); foreach (var area in res.data) { var item = Instantiate(tmpCollectItem); diff --git a/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs b/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs index e9e1bc16..29b32c3f 100644 --- a/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs @@ -267,16 +267,15 @@ public class NewRouteDetailController : PFUIPanel #if !(UNITY_ANDROID || UNITY_IOS) transform.Find("Container/Left/NOData").gameObject.SetActive(res.data.UserList.Count == 0); transform.Find("Container/Left/Users").DestroyChildren(); -#endif foreach (var item in res.data.UserList) { var info = Instantiate(userinfo); Utils.DisplayImageTempDict(info.transform.Find("Avatar").GetComponent(), item.WxHeadImg, caches); info.transform.Find("NickName").GetComponent().text = item.NickName; - info.transform.SetParent(transform.Find("Container/Left/Users")); info.transform.localScale = Vector3.one; } +#endif } } diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index c9a97ea9..8b558396 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -334,9 +334,8 @@ public class UIManager : MonoBehaviour } public static void ShowNewRouteDetailPanel(MapRouteAreaItem area) { - UIManager.Instance.NewRouteDetailPanel - .GetComponent().Initial(area); UIManager.Show(UIManager.Instance.NewRouteDetailPanel, UIManager.Instance.MainPanel); + UIManager.Instance.NewRouteDetailPanel.GetComponent().Initial(area); } #endregion private CountDownAnimation mCountDownAnimation;