diff --git a/Assets/ManagedResources/BG/UI/2icon/X1_zhucheng_tubiaomingcheng.png b/Assets/ManagedResources/BG/UI/2icon/X1_zhucheng_tubiaomingcheng.png new file mode 100644 index 0000000000..42df3eeeec Binary files /dev/null and b/Assets/ManagedResources/BG/UI/2icon/X1_zhucheng_tubiaomingcheng.png differ diff --git a/Assets/ManagedResources/BG/UI/2icon/X1_zhucheng_tubiaomingcheng.png.meta b/Assets/ManagedResources/BG/UI/2icon/X1_zhucheng_tubiaomingcheng.png.meta new file mode 100644 index 0000000000..3b982fb3d2 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/2icon/X1_zhucheng_tubiaomingcheng.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 6bd1dc3ac7d56c74aa2c2392df9c4155 +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: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0d1f1bd7942706847b18781edc2cb1fa + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index 3a6366bcba..c3502ee664 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -249,17 +249,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 859890044841408504} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1} m_Children: [] m_Father: {fileID: 982672466233666759} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -69.1, y: 555} - m_SizeDelta: {x: 253, y: 86} + m_AnchoredPosition: {x: -61.52, y: 555} + m_SizeDelta: {x: 264.43, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9171929062687719813 CanvasRenderer: @@ -289,7 +289,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 36435452dc2fb16478891c4637a8d782, type: 3} + m_Sprite: {fileID: 21300000, guid: 96a8610cbd895ac4e9038018b7ac1fab, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -976,7 +976,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -78.6} - m_SizeDelta: {x: 432, y: 1097.2} + m_SizeDelta: {x: 430, y: 1097.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3141451647582073682 CanvasRenderer: @@ -1167,8 +1167,8 @@ RectTransform: 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: 62.1, y: 555} - m_SizeDelta: {x: 253, y: 86} + m_AnchoredPosition: {x: 63.559986, y: 555} + m_SizeDelta: {x: 260.73, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &982918930573210986 CanvasRenderer: @@ -1198,7 +1198,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 36435452dc2fb16478891c4637a8d782, type: 3} + m_Sprite: {fileID: 21300000, guid: 96a8610cbd895ac4e9038018b7ac1fab, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1866,7 +1866,7 @@ RectTransform: 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: 64.4, y: 555.1} + m_AnchoredPosition: {x: 68.9, y: 555.1} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1230793493522679058 @@ -1899,10 +1899,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 40 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -2216,7 +2216,7 @@ RectTransform: 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: -62.3, y: 555.1} + m_AnchoredPosition: {x: -64.6, y: 555.1} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5544174398057538207 @@ -2249,10 +2249,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 40 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -4212,7 +4212,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -78.6} - m_SizeDelta: {x: 432, y: 1097.2} + m_SizeDelta: {x: 430, y: 1097.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4875746903694999264 CanvasRenderer: @@ -4482,8 +4482,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 364, y: 1358} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: 395, y: 1364.2} + m_SizeDelta: {x: 863, y: 83.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4444820926737583134 CanvasRenderer: @@ -4514,7 +4514,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab index 5f845a0435..3de0993677 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab @@ -3095,7 +3095,7 @@ RectTransform: 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: 223, y: 2} + m_AnchoredPosition: {x: 383, y: 2} m_SizeDelta: {x: 197.42, y: 79.69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4859407655032388677 @@ -4514,7 +4514,7 @@ RectTransform: 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: 205, y: -43} + m_AnchoredPosition: {x: 267, y: 1} m_SizeDelta: {x: 72, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6254220327772854485 @@ -4798,7 +4798,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: 761, y: -76} + m_AnchoredPosition: {x: 893, y: -80} m_SizeDelta: {x: 154.33, y: 65.25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7874263200387672949 @@ -5505,7 +5505,7 @@ RectTransform: 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: 401.9, y: 1} + m_AnchoredPosition: {x: 366, y: 1} m_SizeDelta: {x: 160, y: 38.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3532143096143649296 @@ -5529,7 +5529,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.91372555, g: 0.9058824, b: 0.7843138, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 169e2ad212..fc22f7bee0 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -7881,7 +7881,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: -6, y: -126} + m_AnchoredPosition: {x: -6, y: -132} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0, y: 1} --- !u!222 &718071596653331093 diff --git a/Assets/ManagedResources/Prefabs/UI/Message/MsgPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Message/MsgPanel.prefab index 0b7fe99b54..04fceef8c9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Message/MsgPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Message/MsgPanel.prefab @@ -309,7 +309,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 260, y: 74} + m_SizeDelta: {x: 260, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222265248986405452 CanvasRenderer: @@ -339,8 +339,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b204bd77afb57e14e830d912e88eb357, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 8938c410d98136f4e9b081060e0025fd, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -448,7 +448,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 260, y: 74} + m_SizeDelta: {x: 260, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222029870269845318 CanvasRenderer: @@ -478,8 +478,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 6ff20609e8c68014394e6b730e1c7948, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5ce4cf7c6a156d64ca117ce0caf6a53b, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -760,7 +760,7 @@ RectTransform: 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: 3.899994, y: -270.09998} + m_AnchoredPosition: {x: 3.899994, y: -281} m_SizeDelta: {x: 941.7, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &114397805334737452