diff --git a/Assets/ManagedResources/BG/UI/ChongRank/1开服冲榜排名.png b/Assets/ManagedResources/BG/UI/ChongRank/1开服冲榜排名.png deleted file mode 100644 index 61e6a5f877..0000000000 Binary files a/Assets/ManagedResources/BG/UI/ChongRank/1开服冲榜排名.png and /dev/null differ diff --git a/Assets/ManagedResources/BG/UI/ChongRank/1开服冲榜排名.png.meta b/Assets/ManagedResources/BG/UI/ChongRank/1开服冲榜排名.png.meta deleted file mode 100644 index dd01f67195..0000000000 --- a/Assets/ManagedResources/BG/UI/ChongRank/1开服冲榜排名.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 9d66b425404d77343a9d8124ff53e4ea -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: 114a70b214c82d4419f177288bd87451 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/ChongRank/2开服冲榜奖励.png b/Assets/ManagedResources/BG/UI/ChongRank/2开服冲榜奖励.png deleted file mode 100644 index f35040e58f..0000000000 Binary files a/Assets/ManagedResources/BG/UI/ChongRank/2开服冲榜奖励.png and /dev/null differ diff --git a/Assets/ManagedResources/BG/UI/ChongRank/2开服冲榜奖励.png.meta b/Assets/ManagedResources/BG/UI/ChongRank/2开服冲榜奖励.png.meta deleted file mode 100644 index 12de7e3c60..0000000000 --- a/Assets/ManagedResources/BG/UI/ChongRank/2开服冲榜奖励.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 67ccc0c583f33b848baf2a9cf41700fd -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: 5a824c3dc88056041ab057a34dd2616f - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab index 3db203dfb9..9c35a83874 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab @@ -30720,7 +30720,7 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 10 + m_Top: 20 m_Bottom: 0 m_ChildAlignment: 1 m_Spacing: 0 @@ -61717,7 +61717,7 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 + m_Top: 10 m_Bottom: 0 m_ChildAlignment: 7 m_Spacing: 0 @@ -62334,6 +62334,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 254808626956959445} + - component: {fileID: 6628988877118604342} + - component: {fileID: 5866493900034951323} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -62357,9 +62359,46 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 68, y: 59.199997} - m_SizeDelta: {x: 142.16, y: 29.089996} + m_AnchoredPosition: {x: 135.29999, y: 59.199997} + m_SizeDelta: {x: 165.83, y: 43.075} m_Pivot: {x: 0, y: 0} +--- !u!222 &6628988877118604342 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8153109158223354641} + m_CullTransparentMesh: 0 +--- !u!114 &5866493900034951323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8153109158223354641} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &8227266380726873817 GameObject: m_ObjectHideFlags: 0 @@ -62560,7 +62599,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1023.1, y: 273.5} + m_SizeDelta: {x: 1012.72, y: 273.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &846970422949237584 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingStrongPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingStrongPopup.prefab index 24ef04fce6..18751770cb 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingStrongPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingStrongPopup.prefab @@ -37,7 +37,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 919.75, y: 0} + m_SizeDelta: {x: 925.79, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7974638551173884801 MonoBehaviour: @@ -5034,9 +5034,9 @@ RectTransform: m_Father: {fileID: 8612448653538319347} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 465.9, y: 140.7} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -126} m_SizeDelta: {x: 258, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &652273418092532629 @@ -14980,8 +14980,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: 516.9501, y: -1166.4} - m_SizeDelta: {x: 924.7, y: 523.3} + m_AnchoredPosition: {x: 516.9501, y: -1200} + m_SizeDelta: {x: 924.7, y: 456.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3222931571978974844 MonoBehaviour: @@ -25058,7 +25058,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: 404.1, y: -311.2} + m_AnchoredPosition: {x: 404.1, y: -276.5} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5368335582911155739 @@ -25461,6 +25461,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3121986929336286929} + - component: {fileID: 2626255792577603162} + - component: {fileID: 8066968104396685843} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -25485,8 +25487,45 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 68, y: 149.4} - m_SizeDelta: {x: 142.16, y: 29.089996} + m_SizeDelta: {x: 142.16, y: 41.535} m_Pivot: {x: 0, y: 0} +--- !u!222 &2626255792577603162 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2974794707458944267} + m_CullTransparentMesh: 0 +--- !u!114 &8066968104396685843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2974794707458944267} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3127440240486801206 GameObject: m_ObjectHideFlags: 0 @@ -25884,7 +25923,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.95686275, b: 0.19607843, a: 1} + m_Color: {r: 0.97654855, g: 0.990566, b: 0.97654855, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -25892,7 +25931,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -45437,7 +45476,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: 79.9, y: -27.8} + m_AnchoredPosition: {x: 78.80002, y: -27.800003} m_SizeDelta: {x: 158.98999, y: 58.130005} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5633617524614080011 @@ -50609,8 +50648,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: 516.9501, y: -692.5} - m_SizeDelta: {x: 924.7, y: 403} + m_AnchoredPosition: {x: 516.9501, y: -727.6} + m_SizeDelta: {x: 924.7, y: 473.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1781372147787460381 MonoBehaviour: @@ -50721,7 +50760,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 382.9, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 725.8, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8721606002947256786 @@ -50764,7 +50803,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.8 m_Text: 11111111111111111111111111111111111111111111111111111111111111111111111111111111 --- !u!114 &6498033699173816014 MonoBehaviour: @@ -70607,7 +70646,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 459.875, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 919.75, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &8503993551599267867 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingListPanel.prefab index f4e4650ee5..a0966534a9 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingListPanel.prefab @@ -162,7 +162,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 224690099723896378} - - component: {fileID: 5711041211766083441} + - component: {fileID: 3796311078098026237} + - component: {fileID: 5371367985400623830} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -187,9 +188,17 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 1.8000488, y: 0.5999985} - m_SizeDelta: {x: 117.88, y: 29.09} + m_SizeDelta: {x: 117.88, y: 32.19} m_Pivot: {x: 0, y: 0} ---- !u!114 &5711041211766083441 +--- !u!222 &3796311078098026237 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263646239547842} + m_CullTransparentMesh: 0 +--- !u!114 &5371367985400623830 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -198,20 +207,26 @@ MonoBehaviour: m_GameObject: {fileID: 1263646239547842} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 6 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &1313846791451132 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingUpStarListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingUpStarListPanel.prefab index 9cc02ef39b..9e303423c4 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingUpStarListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/FaLingUpStarListPanel.prefab @@ -162,7 +162,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 224690099723896378} - - component: {fileID: 5711041211766083441} + - component: {fileID: 6544363586014601840} + - component: {fileID: 453820055874082697} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -187,9 +188,17 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 1.8000488, y: 0.5999985} - m_SizeDelta: {x: 117.88, y: 29.09} + m_SizeDelta: {x: 117.88, y: 33.08} m_Pivot: {x: 0, y: 0} ---- !u!114 &5711041211766083441 +--- !u!222 &6544363586014601840 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263646239547842} + m_CullTransparentMesh: 0 +--- !u!114 &453820055874082697 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -198,20 +207,26 @@ MonoBehaviour: m_GameObject: {fileID: 1263646239547842} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 6 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &1313846791451132 GameObject: m_ObjectHideFlags: 0 @@ -369,7 +384,7 @@ 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.070007324, y: 42.3} + m_AnchoredPosition: {x: 0.070007324, y: 42.299988} m_SizeDelta: {x: -91.3, y: -295.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222808304241616932 @@ -2259,7 +2274,7 @@ 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.060058594, y: 38.475} + m_AnchoredPosition: {x: 0.060058594, y: 38.474976} m_SizeDelta: {x: -91.3, y: -303.05} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1934384922840743642 diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index fa7bf10cb3..56ae990bd1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -511,7 +511,7 @@ function this.SingleItemDataShow(_go, _itemData) refine.gameObject:SetActive(true) refine.text="+".._itemData.refineLv end - if _itemData.treeLv>0 then + if _itemData.treeLv and _itemData.treeLv>0 then treeLvObj.gameObject:SetActive(true) treeLv.text=_itemData.treeLv end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/FaLingManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/FaLingManager.lua index ffe2ab3efe..14a147c536 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/FaLingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/FaLingManager.lua @@ -56,7 +56,12 @@ function this.GetAllEquipDataNoBless() end end table.sort(list,function(a,b) - return a.lv>b.lv + if a.lv==b.lv then + return a.lv > b.lv + else + return a.staticId > b.staticId + end + end) return list end @@ -68,6 +73,14 @@ function this.GetAllUpListNoBless(_id) table.insert(list,v) end end + table.sort(list,function(a,b) + if a.lv==b.lv then + return a.lv > b.lv + else + return a.staticId > b.staticId + end + + end) return list end @@ -80,6 +93,14 @@ function this.GetCanBlessEquipList() table.insert(list,v) end end + table.sort(list,function(a,b) + if a.lv==b.lv then + return a.lv > b.lv + else + return a.staticId > b.staticId + end + + end) return list end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua index 58149ab4ce..8fd70c1239 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua @@ -184,7 +184,6 @@ function FaLingSingleShowPopup:OnOpen(_parent,_equipData,_openType,_isShowGet,_i end function FaLingSingleShowPopup:SetBtns() - local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig,self.equipData.staticId) self.btnDown:SetActive(self.openType == 2) self.btnStrong:SetActive(self.openType==2) self.btnAdd:SetActive(self.openType ==3) @@ -201,9 +200,6 @@ function FaLingSingleShowPopup:OnShow() equipConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, self.equipData.staticId) local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig,self.equipData.staticId) local aaa=equipConfigData.Quantity - if equipConfigData.Quantity==8 then - aaa=7 - end self.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("Bg_hz_beibao_pinjise_0"..aaa) self.equipQuaText.text=GetStringByEquipQua(equipConfigData.Quantity,GetQuaStringByEquipQua(equipConfigData.Quantity)) self.eqiopName.text=GetStringByEquipQua(equipConfigData.Quantity,GetLanguageStrById(equipConfigData.Name)) @@ -217,9 +213,7 @@ function FaLingSingleShowPopup:OnShow() else self.powerNum.text=EquipManager.CalculateWarForce(self.equipData.staticId) end - - EquipManager.SetEquipStarShow(self.spLoader, self.star,equipConfigData.staticId) - self.equipType.text="法灵" + self.equipType.text="法宝" --下部按钮信息 self.effectbaijin:SetActive(equipConfigData.Quantity==7) Util.SetParticleSortLayer(self.effectbaijin,self.sortingOrder + 1) @@ -351,6 +345,23 @@ function FaLingSingleShowPopup:OnShow() self.basePro:SetActive(false) end + local star=talismana.Star + + if star>0 then + self.star:SetActive(true) + local starType=1 + local starSize=nil + starType=3 + star=star+11 + starSize = Vector2.New(1,-13) + --starScale = 0 + SetHeroStars(self.spLoader,self.star, star,starType,starSize,starScale) + Util.SetParticleSortLayer(self.star, self.sortingOrder + 3) + else + self.star:SetActive(false) + end + + --技能显示 local lvList=ConfigManager.TryGetAllConfigsDataByKey(ConfigName.EquipTalismana,"TalismanaId",self.equipData.staticId) local skillList={} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua index 0ea3a5c2ce..b82921501c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua @@ -48,7 +48,7 @@ function FaLingStrongPopup:InitComponent() --superPro self.superPro = Util.GetGameObject(self.midBar, "superPro") - self.superTitle = Util.GetGameObject(self.midBar, "superPro/Text"):GetComponent("Text") + self.superTitle = Util.GetGameObject(self.midBar, "superPro/Image/name"):GetComponent("Text") self.superTitle.text="法宝天赋" self.superProGrid = Util.GetGameObject(self.superPro, "proGrid") self.superProPre = Util.GetGameObject(self.superPro, "proGrid/Desc") @@ -57,7 +57,7 @@ function FaLingStrongPopup:InitComponent() --costpro self.costPro = Util.GetGameObject(self.transform, "costPro") - self.costTitle = Util.GetGameObject(self.transform, "costPro/Text"):GetComponent("Text") + self.costTitle = Util.GetGameObject(self.transform, "costPro/Image/name"):GetComponent("Text") self.costTitle.text="强化要求" self.costProGrid = Util.GetGameObject(self.costPro, "proGrid") self.costProPre = Util.GetGameObject(self.costPro, "proGrid/item") @@ -151,6 +151,22 @@ function FaLingStrongPopup:OnShow() --basePro基础属性 LogError("lv========================"..lv) talismana=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",self.equipData.staticId,"Level",lv) + + local star=talismana.Star + + if star>0 then + self.star:SetActive(true) + local starType=1 + local starSize=nil + starType=3 + star=star+11 + starSize = Vector2.New(1,-13) + --starScale = 0 + SetHeroStars(self.spLoader,self.star, star,starType,starSize,starScale) + Util.SetParticleSortLayer(self.star, self.sortingOrder + 3) + else + self.star:SetActive(false) + end local nextLvData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",self.equipData.staticId,"Level",lv+1) self.btnStrong:SetActive(nextLvData~=nil) for _, pro in ipairs(_BaseProList) do diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua index 24a7d9f1dc..b1e725ed05 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua @@ -36,7 +36,7 @@ function this.InitSingleTreasureData(_singleData,notAdd) single.maxLv = currJewel.Max[1] single.maxRefineLv = currJewel.Max[2] single.maxTreeLv = currJewel.GodHoodMaxlv - single.treeLv=_singleData.treeLv <= single.maxTreeLv and _singleData.treeLv or single.maxTreeLv + --single.treeLv=_singleData.treeLv <= single.maxTreeLv and _singleData.treeLv or single.maxTreeLv single.upHeroDid = "" single.fourTotal = MonsterCampManager.GetFourElementTotalWave() local quantity = currJewel.Level diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua index 4ca826510b..a2afdcd07b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingListPanel.lua @@ -136,7 +136,21 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 formationImage:SetActive(false) lockImage:SetActive(false) name.text = SubString2(GetLanguageStrById(itemConfig.Name),8) - SetHeroStars(this.spLoader,starGrid, itemConfig.HeroStar[1] or 6,1,nil,nil,Vector2.New(0,1)) + local talismana=ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",heroData.staticId,"Level",heroData.lv) + local star=talismana.Star + if star>0 then + starGrid:SetActive(true) + local starType=1 + local starSize=nil + starType=3 + star=star+11 + starSize = Vector2.New(0.8,-20) + local starScale = -20 + SetHeroStars(this.spLoader,starGrid, star,starType,starSize,starScale) + Util.SetParticleSortLayer(starGrid, this.sortingOrder + 3) + else + starGrid:SetActive(false) + end local isSelect = CheckListIsContainValue1(curSelectHeroList,heroData.did) choosed:SetActive(isSelect) Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua index 97c6e9134e..e5a609136a 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaLingUpStarListPanel.lua @@ -107,7 +107,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 local noumenon = Util.GetGameObject(go, "noumenon") local starGrid = Util.GetGameObject(go.transform, "star") local cardBtn = Util.GetGameObject(go.transform, "icon") - + local itemConfig=heroData.itemConfig frame.sprite = this.spLoader:LoadSprite(heroData.frame) if heroData.lv>0 then @@ -122,7 +122,21 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 lockImage:SetActive(false) noumenon:SetActive(false) name.text = SubString2(GetLanguageStrById(itemConfig.Name),8) - SetHeroStars(this.spLoader,starGrid, itemConfig.HeroStar[1] or 6,1,nil,nil,Vector2.New(0,1)) + local talismana=ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",heroData.staticId,"Level",heroData.lv) + local star=talismana.Star + if star>0 then + starGrid:SetActive(true) + local starType=1 + local starSize=nil + starType=3 + star=star+11 + starSize = Vector2.New(0.8,-20) + local starScale = -20 + SetHeroStars(this.spLoader,starGrid, star,starType,starSize,starScale) + Util.SetParticleSortLayer(starGrid, this.sortingOrder + 3) + else + starGrid:SetActive(false) + end local isSelect = CheckListIsContainValue1(curSelectHeroList,heroData.did) choosed:SetActive(isSelect) Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1)