diff --git a/Assets/ManagedResources/Atlas/LingMaiMiJingAtlas/l_lmmj_rukouzi.png b/Assets/ManagedResources/Atlas/LingMaiMiJingAtlas/l_lmmj_rukouzi.png deleted file mode 100644 index 57b3f8f048..0000000000 Binary files a/Assets/ManagedResources/Atlas/LingMaiMiJingAtlas/l_lmmj_rukouzi.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/LingMaiMiJingAtlas/l_lmmj_rukouzi.png.meta b/Assets/ManagedResources/Atlas/LingMaiMiJingAtlas/l_lmmj_rukouzi.png.meta deleted file mode 100644 index a643f2ebbf..0000000000 --- a/Assets/ManagedResources/Atlas/LingMaiMiJingAtlas/l_lmmj_rukouzi.png.meta +++ /dev/null @@ -1,99 +0,0 @@ -fileFormatVersion: 2 -guid: d1b422455711b1340a6245105093011b -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - 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: 2 - 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 - platformSettings: - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 65 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 56 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 897086dec085fb3469557ffccb60dd17 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: LingMaiMiJingAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerPanel.prefab index 9443e048c4..d350177a7d 100644 --- a/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerPanel.prefab @@ -10532,7 +10532,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -300, y: 0} - m_SizeDelta: {x: 218, y: 234} + m_SizeDelta: {x: 227, y: 251} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1015615774236508778 CanvasRenderer: @@ -15795,7 +15795,7 @@ RectTransform: m_GameObject: {fileID: 2794339759379771853} 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_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: [] m_Father: {fileID: 7251764507722681894} m_RootOrder: 1 @@ -15803,7 +15803,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -300, y: 0} - m_SizeDelta: {x: 218, y: 234} + m_SizeDelta: {x: 236, y: 243} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2823757633366089830 CanvasRenderer: @@ -33581,7 +33581,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -300, y: 0} - m_SizeDelta: {x: 218, y: 234} + m_SizeDelta: {x: 276, y: 255} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3989280014579273972 CanvasRenderer: @@ -48626,7 +48626,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -300, y: 0} - m_SizeDelta: {x: 218, y: 234} + m_SizeDelta: {x: 301, y: 263} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8675873484287591112 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab index aabbb59273..f77120635c 100644 --- a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab @@ -113,8 +113,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -63.5} - m_SizeDelta: {x: 130, y: 29} + m_AnchoredPosition: {x: 90, y: -69.5} + m_SizeDelta: {x: 0, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7691693457103453835 CanvasRenderer: @@ -146,7 +146,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -157,7 +157,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7075\u8109\u5B88\u62A4\u8005" + m_Text: --- !u!1 &209475058191851178 GameObject: m_ObjectHideFlags: 0 @@ -684,8 +684,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -63.5} - m_SizeDelta: {x: 130, y: 29} + m_AnchoredPosition: {x: 90, y: -69.5} + m_SizeDelta: {x: 0, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7592949108739914947 CanvasRenderer: @@ -717,7 +717,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -728,7 +728,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7075\u8109\u5B88\u62A4\u8005" + m_Text: --- !u!1 &962644386338986399 GameObject: m_ObjectHideFlags: 0 @@ -1565,8 +1565,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -63.5} - m_SizeDelta: {x: 130, y: 29} + m_AnchoredPosition: {x: 90, y: -69.5} + m_SizeDelta: {x: 0, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2824955056710838185 CanvasRenderer: @@ -1598,7 +1598,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -1609,7 +1609,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7075\u8109\u5B88\u62A4\u8005" + m_Text: --- !u!1 &1815411574373718898 GameObject: m_ObjectHideFlags: 0 @@ -2160,7 +2160,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -105.5} + m_AnchoredPosition: {x: 90, y: -113.5} m_SizeDelta: {x: 140, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2169242978042406828 @@ -2467,7 +2467,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -105.5} + m_AnchoredPosition: {x: 90, y: -113.5} m_SizeDelta: {x: 140, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8275641842061975345 @@ -2940,7 +2940,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 216, y: 35} - m_SizeDelta: {x: 180, y: 138} + m_SizeDelta: {x: 180, y: 146} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5868794079429826473 CanvasRenderer: @@ -3325,8 +3325,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -63.5} - m_SizeDelta: {x: 130, y: 29} + m_AnchoredPosition: {x: 90, y: -69.5} + m_SizeDelta: {x: 0, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7094272986949129498 CanvasRenderer: @@ -3358,7 +3358,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -3369,7 +3369,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7075\u8109\u5B88\u62A4\u8005" + m_Text: --- !u!1 &3451549911650722859 GameObject: m_ObjectHideFlags: 0 @@ -3734,7 +3734,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 216, y: 35} - m_SizeDelta: {x: 180, y: 138} + m_SizeDelta: {x: 180, y: 146} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1199029002568934720 CanvasRenderer: @@ -4455,8 +4455,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -29.5} - m_SizeDelta: {x: 130, y: 29} + m_AnchoredPosition: {x: 90, y: -31.5} + m_SizeDelta: {x: 0, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5652105710072003985 CanvasRenderer: @@ -4488,7 +4488,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -4499,7 +4499,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7075\u8109\u5B88\u62A4\u8005" + m_Text: --- !u!1 &4853360574621518357 GameObject: m_ObjectHideFlags: 0 @@ -4682,7 +4682,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -4693,7 +4693,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7075\u8109\u5B88\u62A4\u8005" + m_Text: --- !u!1 &4975741343732262209 GameObject: m_ObjectHideFlags: 0 @@ -4877,8 +4877,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -29.5} - m_SizeDelta: {x: 130, y: 29} + m_AnchoredPosition: {x: 90, y: -31.5} + m_SizeDelta: {x: 0, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2724932391288793835 CanvasRenderer: @@ -4910,7 +4910,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -4921,7 +4921,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7075\u8109\u5B88\u62A4\u8005" + m_Text: --- !u!1 &5294068394628429193 GameObject: m_ObjectHideFlags: 0 @@ -5317,8 +5317,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -63.5} - m_SizeDelta: {x: 130, y: 29} + m_AnchoredPosition: {x: 90, y: -69.5} + m_SizeDelta: {x: 0, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5163837157058092222 CanvasRenderer: @@ -5350,7 +5350,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -5361,7 +5361,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7075\u8109\u5B88\u62A4\u8005" + m_Text: --- !u!1 &5835246887390854034 GameObject: m_ObjectHideFlags: 0 @@ -5396,8 +5396,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -29.5} - m_SizeDelta: {x: 130, y: 29} + m_AnchoredPosition: {x: 90, y: -31.5} + m_SizeDelta: {x: 0, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2300935670332315273 CanvasRenderer: @@ -5429,7 +5429,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -5440,7 +5440,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7075\u8109\u5B88\u62A4\u8005" + m_Text: --- !u!1 &5852231789236734259 GameObject: m_ObjectHideFlags: 0 @@ -5475,8 +5475,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -29.5} - m_SizeDelta: {x: 130, y: 29} + m_AnchoredPosition: {x: 90, y: -31.5} + m_SizeDelta: {x: 0, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6110422117996540657 CanvasRenderer: @@ -5508,7 +5508,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -5519,7 +5519,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7075\u8109\u5B88\u62A4\u8005" + m_Text: --- !u!1 &5874574276312272247 GameObject: m_ObjectHideFlags: 0 @@ -6041,7 +6041,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -105.5} + m_AnchoredPosition: {x: 90, y: -113.5} m_SizeDelta: {x: 140, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2842374577674842247 @@ -6255,7 +6255,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -105.5} + m_AnchoredPosition: {x: 90, y: -113.5} m_SizeDelta: {x: 140, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5413234649567959671 @@ -6322,7 +6322,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -200.3, y: 37.1} - m_SizeDelta: {x: 180, y: 138} + m_SizeDelta: {x: 180, y: 146} m_Pivot: {x: 0.5, y: 1} --- !u!222 &909463984979692923 CanvasRenderer: @@ -6877,7 +6877,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -105.5} + m_AnchoredPosition: {x: 90, y: -113.5} m_SizeDelta: {x: 140, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5810748664204631574 @@ -7088,8 +7088,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -29.5} - m_SizeDelta: {x: 130, y: 29} + m_AnchoredPosition: {x: 90, y: -31.5} + m_SizeDelta: {x: 0, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9149616867445548595 CanvasRenderer: @@ -7121,7 +7121,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 26 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -7132,7 +7132,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u7075\u8109\u5B88\u62A4\u8005" + m_Text: --- !u!1 &7249936126995698810 GameObject: m_ObjectHideFlags: 0 @@ -7173,7 +7173,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -214, y: 33} - m_SizeDelta: {x: 180, y: 138} + m_SizeDelta: {x: 180, y: 146} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8388300647261936205 CanvasRenderer: @@ -8844,7 +8844,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 216, y: 35} - m_SizeDelta: {x: 180, y: 138} + m_SizeDelta: {x: 180, y: 146} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7669409904160591410 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/LingMaiFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/LingMaiFormation.lua index 09c91be08d..e044a428ab 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/LingMaiFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/LingMaiFormation.lua @@ -12,7 +12,6 @@ function this.Init(root,...) this.spLoader = SpriteLoader.New() this.root = root local temp = {...} - LogGreen("temp[1]:"..tostring(temp[1]).." temp[2]:"..tostring(temp[2])) this.nodeData = temp[1] this.isTest = temp[2] and temp[2] or false this.InitView() @@ -118,6 +117,11 @@ function this.StartFight() arg.red.frame = this.nodeData.headFrame -- 不用回放直接显示结果 UIManager.OpenPanel(UIName.ArenaResultPopup, arg) + if msg.result == 0 then + PopupTipPanel.ShowTip("挑战失败,未抢夺到目标的灵脉!") + else + PopupTipPanel.ShowTip("成功抢夺目标所在的灵脉!") + end end):SetResult(msg.result) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua index efdecc8623..42a8fdc040 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua @@ -7,7 +7,7 @@ local type = { id = JumpServer_Type.HightLadder, --跨服天梯 funcId = FUNCTION_OPEN_TYPE.JumpServer_HightLadder, sort = 1, - bg = "r_Dungeon_rendi_01", + bg = "r_Dungeon_rendi_03", name = "k_kuafuwanfa_luofuzhengfeng", live = "m_chsm_0035_png", livePos = Vector2(274.5, -408.1), @@ -55,12 +55,12 @@ local type = { id = JumpServer_Type.LingMaiMiJing, funcId = FUNCTION_OPEN_TYPE.LINGMAIMIJING, sort = 4, - bg = "m_syjm_0026_png", - name = "q_qjsl_rikou_ysz", - live = "", - livePos = Vector2(0,0), - liveSize = Vector2(0,0), - tipBg = "r_Dungeon_juqingdian", + bg = "r_Dungeon_rendi_01", + name = "l_lmmj_rukouzi", + live = "z_zddh_yj", + livePos = Vector2(251,-26), + liveSize = Vector2(550,500), + tipBg = "r_Dungeon_rendi_01", resetTime = string.format("%s",specialConfig[137].Value), tip = "", redPointType = RedPointType.LingMaiMiJing, diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua index 07f63ab504..19435bebc7 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua @@ -2,10 +2,9 @@ require("Base/BasePanel") local LingMaiMiJingPanel = Inherit(BasePanel) local lodeConfig = ConfigManager.GetConfig(ConfigName.LodeConfig) local TEXTLIST = { - [1] = "距灵脉秘境结束:%s", + [1] = "距抢夺期结束:%s", [2] = "距灵脉秘境开启:%s", [3] = "距灵脉秘境关闭:%s", - [4] = "当前state为0", } local veinName = { [3] = "l_lmmj_huangjilingmai",