diff --git a/Assets/ManagedResources/BG/UI/1All/bag_banner.png b/Assets/ManagedResources/BG/UI/1All/bag_banner.png new file mode 100644 index 0000000000..e957e83583 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/bag_banner.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/bag_banner.png.meta b/Assets/ManagedResources/BG/UI/1All/bag_banner.png.meta new file mode 100644 index 0000000000..92c973f21c --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/bag_banner.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 088e58c5c5f408545bc72ac5eefbe925 +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: e4f34ab209fc8014a86e69a654e17799 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/ArenaNewRankRewardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/ArenaNewRankRewardPanel.prefab index c291976be0..0a8ef8bdf9 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/ArenaNewRankRewardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/ArenaNewRankRewardPanel.prefab @@ -38,7 +38,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: 254, y: -73} + m_AnchoredPosition: {x: 272.1, y: -73} m_SizeDelta: {x: 96, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7464658710358595252 @@ -107,7 +107,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 910.5, y: 0} + m_SizeDelta: {x: 903.75, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3777276423853369077 MonoBehaviour: @@ -210,7 +210,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: -299.5, y: 24.7} + m_AnchoredPosition: {x: -287.5, y: 24.7} m_SizeDelta: {x: 304.56, y: 86.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3075153581816410464 @@ -320,7 +320,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: a0197572fad951f42aea1fe738f49ab6, type: 3} + m_Sprite: {fileID: 21300000, guid: 71162a8d1456dde45a156c169aeccf54, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -341,6 +341,7 @@ GameObject: - component: {fileID: 1717374476794664400} - component: {fileID: 6303161114519152955} - component: {fileID: 7325094275243928223} + - component: {fileID: 1073400566865172516} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -364,7 +365,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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.9} m_SizeDelta: {x: 200, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1717374476794664400 @@ -425,6 +426,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7CFB\u7EDF\u7CFB\u7EDF" LanguageIndex: 0 +--- !u!114 &1073400566865172516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868105504917259197} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &961051761279443282 GameObject: m_ObjectHideFlags: 0 @@ -600,7 +616,7 @@ RectTransform: m_GameObject: {fileID: 961051761890590050} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.57066673, y: 0.57066673, z: 0} + m_LocalScale: {x: 1, y: 1, z: 0} m_Children: - {fileID: 961051762309561059} m_Father: {fileID: 961051762370573078} @@ -608,8 +624,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: 3, y: -1.3000116} - m_SizeDelta: {x: 250.56, y: 156.09} + m_AnchoredPosition: {x: -2.7, y: 7.2} + m_SizeDelta: {x: 103, y: 103} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &961051761890590049 CanvasRenderer: @@ -639,8 +655,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: 3c01a305eb51c04478b39d3060aceefe, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: b53765073d7f9cd47bcfcdba0bc1b5d1, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -659,6 +675,7 @@ GameObject: - component: {fileID: 961051762309561059} - component: {fileID: 961051762309561057} - component: {fileID: 961051762309561056} + - component: {fileID: 2071029253164870485} m_Layer: 5 m_Name: rankNumberText m_TagString: Untagged @@ -706,7 +723,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.84313726, g: 0.78431374, b: 0.6627451, a: 1} + m_Color: {r: 0.6901961, g: 0.57254905, b: 0.77254903, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -715,7 +732,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 70 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -727,6 +744,21 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 999-999 +--- !u!114 &2071029253164870485 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 961051762309561058} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &961051762370573081 GameObject: m_ObjectHideFlags: 0 @@ -764,7 +796,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: -357.8, y: -5.6} + m_AnchoredPosition: {x: -293.1, y: -5.6} m_SizeDelta: {x: 96, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &961051762370573079 @@ -860,6 +892,7 @@ GameObject: - component: {fileID: 8668657611625403729} - component: {fileID: 3697547188951766042} - component: {fileID: 4329906323614115465} + - component: {fileID: 243492823680368529} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -929,6 +962,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6BB5\u4F4D\u5956\u52B1\u5C06\u5728\u6D3B\u52A8\u7ED3\u675F\u540E\u901A\u8FC7\u90AE\u4EF6\u53D1\u653E" LanguageIndex: 0 +--- !u!114 &243492823680368529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1161621251690501446} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1817935718322979027 GameObject: m_ObjectHideFlags: 0 @@ -941,6 +989,7 @@ GameObject: - component: {fileID: 2266854158888604861} - component: {fileID: 4253506038593969925} - component: {fileID: 8412820231584169140} + - component: {fileID: 2200537861003458007} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -964,7 +1013,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: 130, y: -44} + m_AnchoredPosition: {x: 137, y: -44} m_SizeDelta: {x: 241.3, y: 79.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2266854158888604861 @@ -988,7 +1037,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.25490198, g: 0.24313727, b: 0.24313727, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1030,6 +1079,21 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &2200537861003458007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1817935718322979027} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1897799333142705599 GameObject: m_ObjectHideFlags: 0 @@ -1064,8 +1128,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.0030212402, y: 0.000015258789} - m_SizeDelta: {x: -0.0060425, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1820674405524845267 CanvasRenderer: @@ -1137,8 +1201,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: 0, y: 466.821} - m_SizeDelta: {x: 890, y: 921.9} + m_AnchoredPosition: {x: 0, y: 544.08} + m_SizeDelta: {x: 890, y: 743.85} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1821009118062142051 CanvasRenderer: @@ -1186,7 +1250,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 906, y: 0} + m_SizeDelta: {x: 901.76, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5501481888203783616 MonoBehaviour: @@ -1232,15 +1296,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.5471698, g: 0.5471698, b: 0.5471698, 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_Sprite: {fileID: 21300000, guid: a8f530feeafc0954db3b66a08004edf3, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1283,7 +1347,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 913.8, y: 150} + m_SizeDelta: {x: 885.04, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6769380160563262240 CanvasRenderer: @@ -1306,14 +1370,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7843138, g: 0.7843138, b: 0.7843138, a: 1} + 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_Sprite: {fileID: 21300000, guid: 088e58c5c5f408545bc72ac5eefbe925, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1414,7 +1478,7 @@ RectTransform: m_GameObject: {fileID: 3856837781194705270} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.57066673, y: 0.57066673, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0} m_Children: - {fileID: 7490919295917193221} m_Father: {fileID: 4561351718391851631} @@ -1453,7 +1517,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: 3c01a305eb51c04478b39d3060aceefe, type: 3} + m_Sprite: {fileID: 21300000, guid: b53765073d7f9cd47bcfcdba0bc1b5d1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1501,7 +1565,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 16.174988} m_SizeDelta: {x: 917, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!114 &601167039537785818 @@ -1534,9 +1598,9 @@ MonoBehaviour: m_Left: 0 m_Right: 0 m_Top: 0 - m_Bottom: 20 + m_Bottom: 5 m_ChildAlignment: 7 - m_Spacing: 0 + m_Spacing: -10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -1578,8 +1642,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: -0.19999999, y: -14.6} - m_SizeDelta: {x: 917, y: 1336} + m_AnchoredPosition: {x: -0.19999999, y: -1.44} + m_SizeDelta: {x: 917, y: 1309.67} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1730735810005144887 MonoBehaviour: @@ -1644,8 +1708,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: -3} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -1.498497} + m_SizeDelta: {x: 0, y: 2.997} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &743129640651236064 MonoBehaviour: @@ -1799,7 +1863,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: -292, y: -32.2} + m_AnchoredPosition: {x: -280, y: -32.2} m_SizeDelta: {x: 403.9, y: 86.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6136145831622170253 @@ -1855,6 +1919,7 @@ GameObject: - component: {fileID: 549028146439105342} - component: {fileID: 3503675132825878559} - component: {fileID: 2866558390246914103} + - component: {fileID: 7879883308491810166} m_Layer: 0 m_Name: num m_TagString: Untagged @@ -1902,7 +1967,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.9215687, b: 0.79215693, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1924,6 +1989,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6211\u7684\u6392\u540D\uFF1A1" LanguageIndex: 0 +--- !u!114 &7879883308491810166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5573397877204337712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &5604336228874931611 GameObject: m_ObjectHideFlags: 0 @@ -1935,6 +2015,7 @@ GameObject: - component: {fileID: 7490919295917193221} - component: {fileID: 4840291067138943871} - component: {fileID: 7913156611969118444} + - component: {fileID: 3499458306400781624} m_Layer: 5 m_Name: rankNumberText m_TagString: Untagged @@ -1982,7 +2063,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.84313726, g: 0.78431374, b: 0.6627451, a: 1} + m_Color: {r: 0.6920529, g: 0.5728907, b: 0.7735849, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1991,7 +2072,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 70 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -2003,6 +2084,21 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 999 +--- !u!114 &3499458306400781624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5604336228874931611} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &5796951416222024341 GameObject: m_ObjectHideFlags: 0 @@ -2144,7 +2240,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: a7b811773e905084ebec79845a64c981, type: 3} + m_Sprite: {fileID: 21300000, guid: 793daa5b79ef859428a58303319d59fe, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2164,6 +2260,7 @@ GameObject: - component: {fileID: 7415038804377193509} - component: {fileID: 7965364919141115804} - component: {fileID: 33582443529931163} + - component: {fileID: 1640054337002258374} m_Layer: 5 m_Name: Name m_TagString: Untagged @@ -2187,8 +2284,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: 104.68, y: -0.25} - m_SizeDelta: {x: 702.64, y: 80.5} + m_AnchoredPosition: {x: 131.59998, y: -0.25} + m_SizeDelta: {x: 636.8, y: 80.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7965364919141115804 CanvasRenderer: @@ -2233,6 +2330,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5956\u52B1\u9053\u5177" LanguageIndex: 0 +--- !u!114 &1640054337002258374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6635177886559080152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6755720773737469922 GameObject: m_ObjectHideFlags: 0 @@ -2270,7 +2382,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: 0, y: 507.5} + m_AnchoredPosition: {x: 0, y: 576.5} m_SizeDelta: {x: 900, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7183896567638729956 @@ -2301,8 +2413,8 @@ MonoBehaviour: 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_Sprite: {fileID: 21300000, guid: 1c277d7bafa8559468580283ac966e48, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2321,6 +2433,7 @@ GameObject: - component: {fileID: 5475593589961714323} - component: {fileID: 7068228392812480230} - component: {fileID: 1301162403726069487} + - component: {fileID: 697483930780045705} m_Layer: 5 m_Name: tipText m_TagString: Untagged @@ -2368,7 +2481,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2390,6 +2503,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6BB5\u4F4D\u5956\u52B1\u5C06\u5728\u6D3B\u52A8\u7ED3\u675F\u540E\u901A\u8FC7\u90AE\u4EF6\u53D1\u653E" LanguageIndex: 0 +--- !u!114 &697483930780045705 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6821132438793605154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6935125826849794846 GameObject: m_ObjectHideFlags: 0 @@ -2401,6 +2529,7 @@ GameObject: - component: {fileID: 8657764085028407951} - component: {fileID: 1014536491302307773} - component: {fileID: 9056678276452677718} + - component: {fileID: 5103116453044332999} m_Layer: 5 m_Name: Rank m_TagString: Untagged @@ -2470,6 +2599,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6BB5\u4F4D" LanguageIndex: 0 +--- !u!114 &5103116453044332999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6935125826849794846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6954741617760189355 GameObject: m_ObjectHideFlags: 0 @@ -2581,8 +2725,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: 0.000012218952, y: 0.000036239624} - m_SizeDelta: {x: 917, y: 1336} + m_AnchoredPosition: {x: -0.59, y: 0.000036239624} + m_SizeDelta: {x: 931.78, y: 1336} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7176244144573760227 CanvasRenderer: @@ -2612,8 +2756,8 @@ MonoBehaviour: 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_Sprite: {fileID: 21300000, guid: b58713968e107324dbcdba541e584a97, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2888,8 +3032,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.22154781} m_AnchorMax: {x: 0.5, y: 0.22154781} - m_AnchoredPosition: {x: -1.5922, y: 212.8} - m_SizeDelta: {x: 917.04, y: 1198.4} + m_AnchoredPosition: {x: -0.000039101, y: 340.97} + m_SizeDelta: {x: 903.4, y: 1224.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7175911098251229519 CanvasRenderer: @@ -2912,7 +3056,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.69803923, g: 0.69411767, b: 0.69411767, a: 1} + m_Color: {r: 0.69803923, g: 0.69411767, b: 0.69411767, a: 0.24313726} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2964,8 +3108,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: 1.565, y: 25.02} - m_SizeDelta: {x: 913.87, y: 1095.44} + m_AnchoredPosition: {x: -0.22, y: -39.55} + m_SizeDelta: {x: 903.44, y: 1224.55} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6955633158965638705 GameObject: @@ -3001,8 +3145,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: -67.1, y: 626.25} - m_SizeDelta: {x: 850, y: 83.5} + m_AnchoredPosition: {x: -69.99, y: 626.25} + m_SizeDelta: {x: 857.36, y: 83.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7175475526905257057 CanvasRenderer: @@ -3269,8 +3413,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: 0, y: -40} - m_SizeDelta: {x: 907.25, y: 160} + m_AnchoredPosition: {x: 0, y: -31.502} + m_SizeDelta: {x: 903.75, y: 142.99} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1578572585119901521 CanvasRenderer: @@ -3454,7 +3598,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: 458, y: -40} + m_AnchoredPosition: {x: 458.5, y: -40} m_SizeDelta: {x: 906, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3261128506586867012 @@ -3603,8 +3747,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: 547, y: -93} - m_SizeDelta: {x: 554, y: 102.6} + m_AnchoredPosition: {x: 547, y: -72.150024} + m_SizeDelta: {x: 554, y: 144.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4340290308287308387 MonoBehaviour: @@ -3697,8 +3841,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.22154781} m_AnchorMax: {x: 0.5, y: 0.22154781} - m_AnchoredPosition: {x: -1.591, y: -269.042} - m_SizeDelta: {x: 917.047, y: 237.985} + m_AnchoredPosition: {x: 0.00060915947, y: -214} + m_SizeDelta: {x: 903.44, y: 109.54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1691319221084092008 CanvasRenderer: @@ -3775,7 +3919,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -1027.13, y: -255.24194} - m_SizeDelta: {x: 890, y: 134.07} + m_SizeDelta: {x: 860, y: 134.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8345408370327979522 GameObject: @@ -3863,6 +4007,7 @@ GameObject: - component: {fileID: 5423228516831869583} - component: {fileID: 6286104115936282594} - component: {fileID: 3566035022976717079} + - component: {fileID: 2890734938601715552} m_Layer: 0 m_Name: Text (1) m_TagString: Untagged @@ -3886,7 +4031,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: 128, y: -111} + m_AnchoredPosition: {x: 135, y: -111} m_SizeDelta: {x: 236.26, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5423228516831869583 @@ -3910,7 +4055,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.25490198, g: 0.24313726, b: 0.24313726, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3952,6 +4097,21 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &2890734938601715552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8513212338348285746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &8670598815330534361 GameObject: m_ObjectHideFlags: 0 @@ -3963,6 +4123,7 @@ GameObject: - component: {fileID: 5504859140887548415} - component: {fileID: 2745569501434497595} - component: {fileID: 5919797093109403205} + - component: {fileID: 3688403363283231433} m_Layer: 0 m_Name: Text2 m_TagString: Untagged @@ -3986,7 +4147,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, y: 54} + m_AnchoredPosition: {x: 0, y: -0.5999985} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2745569501434497595 @@ -4032,6 +4193,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6BB5\u4F4D\u5956\u52B1\u5C06\u5728\u6D3B\u52A8\u7ED3\u675F\u540E\u901A\u8FC7\u90AE\u4EF6\u53D1\u653E" LanguageIndex: 0 +--- !u!114 &3688403363283231433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8670598815330534361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &8690941583417563213 GameObject: m_ObjectHideFlags: 0 @@ -4044,6 +4220,7 @@ GameObject: - component: {fileID: 3736163099803920013} - component: {fileID: 5697629895048002169} - component: {fileID: 4357588129885098525} + - component: {fileID: 3638397580224918215} m_Layer: 0 m_Name: myrank m_TagString: Untagged @@ -4091,7 +4268,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.25490198, g: 0.24313726, b: 0.24313726, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4133,6 +4310,21 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &3638397580224918215 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8690941583417563213} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &8751832165543929816 GameObject: m_ObjectHideFlags: 0 @@ -4167,8 +4359,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: -244.14, y: 0} - m_SizeDelta: {x: 3, y: 75} + m_AnchoredPosition: {x: -188.3, y: 0.09} + m_SizeDelta: {x: 3, y: 53.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &316751718889226779 CanvasRenderer: @@ -4191,7 +4383,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.6431373, g: 0.6392157, b: 0.6392157, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/ArenaNewRewardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/ArenaNewRewardPanel.prefab index 3066d6484b..49dd88c133 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/ArenaNewRewardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/ArenaNewRewardPanel.prefab @@ -204,7 +204,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 904, y: 120} + m_SizeDelta: {x: 879.16, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2896744531674592439 CanvasRenderer: @@ -279,7 +279,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: a0197572fad951f42aea1fe738f49ab6, type: 3} + m_Sprite: {fileID: 21300000, guid: 71162a8d1456dde45a156c169aeccf54, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -300,6 +300,7 @@ GameObject: - component: {fileID: 1717374476794664400} - component: {fileID: 6303161114519152955} - component: {fileID: 7325094275243928223} + - component: {fileID: 5060443283333234217} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -384,6 +385,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7CFB\u7EDF\u7CFB\u7EDF" LanguageIndex: 0 +--- !u!114 &5060443283333234217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868105504917259197} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &961051761279443282 GameObject: m_ObjectHideFlags: 0 @@ -567,7 +583,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, y: -1.3000116} + m_AnchoredPosition: {x: 3, y: 5.7} m_SizeDelta: {x: 250.56, y: 156.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &961051761890590049 @@ -598,7 +614,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: 3c01a305eb51c04478b39d3060aceefe, type: 3} + m_Sprite: {fileID: 21300000, guid: b53765073d7f9cd47bcfcdba0bc1b5d1, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -618,6 +634,7 @@ GameObject: - component: {fileID: 961051762309561059} - component: {fileID: 961051762309561057} - component: {fileID: 961051762309561056} + - component: {fileID: 1505442932854251331} m_Layer: 5 m_Name: rankNumberText m_TagString: Untagged @@ -665,7 +682,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.84313726, g: 0.78431374, b: 0.6627451, a: 1} + m_Color: {r: 0.54948384, g: 0.41972235, b: 0.6792453, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -686,6 +703,21 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 999-999 +--- !u!114 &1505442932854251331 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 961051762309561058} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &961051762370573081 GameObject: m_ObjectHideFlags: 0 @@ -723,7 +755,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: -357.8, y: -5.6} + m_AnchoredPosition: {x: -334.7, y: -5.6} m_SizeDelta: {x: 96, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &961051762370573079 @@ -819,6 +851,7 @@ GameObject: - component: {fileID: 8668657611625403729} - component: {fileID: 3697547188951766042} - component: {fileID: 4329906323614115465} + - component: {fileID: 1444150436630487337} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -866,7 +899,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.7607844, b: 0.5019608, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -888,6 +921,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6392\u884C\u5956\u52B1\u5C06\u5728\u6D3B\u52A8\u7ED3\u675F\u540E\u901A\u8FC7\u90AE\u4EF6\u53D1\u653E" LanguageIndex: 0 +--- !u!114 &1444150436630487337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1161621251690501446} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1817935718322979027 GameObject: m_ObjectHideFlags: 0 @@ -900,6 +948,7 @@ GameObject: - component: {fileID: 2266854158888604861} - component: {fileID: 4253506038593969925} - component: {fileID: 8412820231584169140} + - component: {fileID: 4074596082350485094} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -947,7 +996,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8352942, g: 0.77647066, b: 0.6627451, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -989,6 +1038,21 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &4074596082350485094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1817935718322979027} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1897799333142705599 GameObject: m_ObjectHideFlags: 0 @@ -1023,8 +1087,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.0030212402, y: 0.000015258789} - m_SizeDelta: {x: -0.0060425, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -0.0000009536743, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1820674405524845267 CanvasRenderer: @@ -1054,8 +1118,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: e58e8fbe3f597304c8d2f35ebdaf1cd8, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 5635943dd19a31546bb798d2a5002a41, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1092,7 +1156,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7176975720436526117} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1145,7 +1209,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 906, y: 0} + m_SizeDelta: {x: 887.65, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5501481888203783616 MonoBehaviour: @@ -1191,15 +1255,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.6132076, g: 0.6103151, b: 0.6103151, 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_Sprite: {fileID: 21300000, guid: 1c277d7bafa8559468580283ac966e48, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1242,7 +1306,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 906, y: 150} + m_SizeDelta: {x: 886.22, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6769380160563262240 CanvasRenderer: @@ -1272,7 +1336,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: 3ddf57e863f9779499219883f26c457c, type: 3} + m_Sprite: {fileID: 21300000, guid: 088e58c5c5f408545bc72ac5eefbe925, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1498,7 +1562,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 906, y: 0} + m_SizeDelta: {x: 886.19, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1835020361537443819 MonoBehaviour: @@ -1540,7 +1604,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &440558214214652071 RectTransform: m_ObjectHideFlags: 0 @@ -1550,7 +1614,7 @@ RectTransform: m_GameObject: {fileID: 3856837781194705270} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.57066673, y: 0.57066673, z: 0} + m_LocalScale: {x: 1, y: 1, z: 0} m_Children: - {fileID: 7490919295917193221} m_Father: {fileID: 4561351718391851631} @@ -1559,7 +1623,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 28.95, y: 0} - m_SizeDelta: {x: 152, y: 152} + m_SizeDelta: {x: 103, y: 103} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1282238921172744183 CanvasRenderer: @@ -1589,8 +1653,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: 3c01a305eb51c04478b39d3060aceefe, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: b53765073d7f9cd47bcfcdba0bc1b5d1, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1637,7 +1701,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 17.7} m_SizeDelta: {x: 916, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!114 &601167039537785818 @@ -1780,8 +1844,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: -3} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.20999146, y: -3} + m_SizeDelta: {x: -30.97, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &743129640651236064 MonoBehaviour: @@ -2060,6 +2124,7 @@ GameObject: - component: {fileID: 549028146439105342} - component: {fileID: 3503675132825878559} - component: {fileID: 2866558390246914103} + - component: {fileID: 7345303192371717159} m_Layer: 0 m_Name: num m_TagString: Untagged @@ -2107,7 +2172,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.9215687, b: 0.79215693, a: 1} + m_Color: {r: 1, g: 0.89499515, b: 0.2688679, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2116,12 +2181,12 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 35 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 7 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -2129,6 +2194,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6211\u7684\u6392\u540D\uFF1A1" LanguageIndex: 0 +--- !u!114 &7345303192371717159 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5573397877204337712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &5604336228874931611 GameObject: m_ObjectHideFlags: 0 @@ -2140,6 +2220,7 @@ GameObject: - component: {fileID: 7490919295917193221} - component: {fileID: 4840291067138943871} - component: {fileID: 7913156611969118444} + - component: {fileID: 406600917845640813} m_Layer: 5 m_Name: rankNumberText m_TagString: Untagged @@ -2187,7 +2268,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.84313726, g: 0.78431374, b: 0.6627451, a: 1} + m_Color: {r: 0.6202385, g: 0.3725525, b: 0.8679245, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2196,7 +2277,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 70 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -2208,6 +2289,21 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 999 +--- !u!114 &406600917845640813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5604336228874931611} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &5796951416222024341 GameObject: m_ObjectHideFlags: 0 @@ -2349,7 +2445,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: a7b811773e905084ebec79845a64c981, type: 3} + m_Sprite: {fileID: 21300000, guid: 793daa5b79ef859428a58303319d59fe, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2392,7 +2488,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: 104.68, y: -0.25} + m_AnchoredPosition: {x: 150.6, y: -0.25} m_SizeDelta: {x: 702.64, y: 80.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7965364919141115804 @@ -2475,7 +2571,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: -0.96, y: 467} + m_AnchoredPosition: {x: -0.96, y: 483.5} m_SizeDelta: {x: 901.99, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7183896567638729956 @@ -2499,15 +2595,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.627451} + m_Color: {r: 0.42352942, g: 0.42352942, b: 0.42352942, 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: 21300000, guid: a40c39d20c3dbcb419e836a687d8dcdd, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 1c277d7bafa8559468580283ac966e48, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2526,6 +2622,7 @@ GameObject: - component: {fileID: 5475593589961714323} - component: {fileID: 7068228392812480230} - component: {fileID: 1301162403726069487} + - component: {fileID: 6323267736737502421} m_Layer: 5 m_Name: tipText m_TagString: Untagged @@ -2573,7 +2670,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2582,12 +2679,12 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 36 + m_FontSize: 23 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 20 - m_MaxSize: 36 - m_Alignment: 4 + m_MinSize: 2 + m_MaxSize: 24 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -2595,6 +2692,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6392\u884C\u5956\u52B1\u5C06\u5728\u6D3B\u52A8\u7ED3\u675F\u540E\u901A\u8FC7\u90AE\u4EF6\u53D1\u653E" LanguageIndex: 0 +--- !u!114 &6323267736737502421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6821132438793605154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6879158323507991392 GameObject: m_ObjectHideFlags: 0 @@ -2633,7 +2745,7 @@ RectTransform: 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: -479.4, y: -43.4} + m_AnchoredPosition: {x: -479.4, y: -40.1} m_SizeDelta: {x: 174.5, y: 77.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7890245843210961046 @@ -2720,7 +2832,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 104.67999, y: 0.0000095367} + m_AnchoredPosition: {x: 122.7, y: 0.0000095367} m_SizeDelta: {x: 209.36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1014536491302307773 @@ -2800,8 +2912,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: 91, y: 1.365} - m_SizeDelta: {x: 630.2, y: 131.34} + m_AnchoredPosition: {x: 113.18, y: 0.18998} + m_SizeDelta: {x: 610.37, y: 109.58} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6995625933051527473 MonoBehaviour: @@ -3181,12 +3293,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7176975720436526117} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.22154781} m_AnchorMax: {x: 0.5, y: 0.22154781} - m_AnchoredPosition: {x: -0.10236, y: -345.00003} - m_SizeDelta: {x: 916, y: 82.6} + m_AnchoredPosition: {x: 0.11, y: 222.22} + m_SizeDelta: {x: 888.32, y: 1174.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7175911098251229519 CanvasRenderer: @@ -3209,15 +3321,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.4117647} 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: 21300000, guid: 190952d644da9724daf666e2a2c4f68d, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: e58e8fbe3f597304c8d2f35ebdaf1cd8, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3252,16 +3364,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1823260895894312819} - {fileID: 7177617248845141921} + - {fileID: 1823260895894312819} - {fileID: 268040860860029747} m_Father: {fileID: 7177885720076686703} m_RootOrder: 1 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.68499, y: -7.3} - m_SizeDelta: {x: 917.4, y: 1030.9} + m_AnchoredPosition: {x: 0.19, y: 3.4} + m_SizeDelta: {x: 896.27, y: 1039.56} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6955633158965638705 GameObject: @@ -3297,8 +3409,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.79, y: 626.25} - m_SizeDelta: {x: 832.66, y: 83.5} + m_AnchoredPosition: {x: -63.5, y: 626.25} + m_SizeDelta: {x: 834.08, y: 83.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7175475526905257057 CanvasRenderer: @@ -3565,8 +3677,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: -1.625, y: 0} - m_SizeDelta: {x: 907.25, y: 160} + m_AnchoredPosition: {x: -0.20869, y: 0} + m_SizeDelta: {x: 879.53, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1578572585119901521 CanvasRenderer: @@ -3829,7 +3941,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2319600602800672135 RectTransform: m_ObjectHideFlags: 0 @@ -3844,10 +3956,10 @@ RectTransform: m_Father: {fileID: 2478093206073120517} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 906, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 458, y: -40} + m_SizeDelta: {x: 906, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3261128506586867012 CanvasRenderer: @@ -4090,8 +4202,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: -1027.13, y: -255.24194} - m_SizeDelta: {x: 916, y: 134.07} + m_AnchoredPosition: {x: -1353, y: -282.69} + m_SizeDelta: {x: 878.86, y: 119.46} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8345408370327979522 GameObject: @@ -4127,8 +4239,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: 81.4, y: 37.4} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: 97.7, y: 47.1} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6921680754798296428 CanvasRenderer: @@ -4179,6 +4291,7 @@ GameObject: - component: {fileID: 5423228516831869583} - component: {fileID: 6286104115936282594} - component: {fileID: 3566035022976717079} + - component: {fileID: 3042180841283603764} m_Layer: 0 m_Name: Text (1) m_TagString: Untagged @@ -4226,7 +4339,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8352942, g: 0.77647066, b: 0.6627451, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4268,6 +4381,21 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &3042180841283603764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8513212338348285746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &8670598815330534361 GameObject: m_ObjectHideFlags: 0 @@ -4285,7 +4413,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5504859140887548415 RectTransform: m_ObjectHideFlags: 0 @@ -4360,6 +4488,7 @@ GameObject: - component: {fileID: 3736163099803920013} - component: {fileID: 5697629895048002169} - component: {fileID: 4357588129885098525} + - component: {fileID: 8994076721796140899} m_Layer: 0 m_Name: myrank m_TagString: Untagged @@ -4407,7 +4536,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8352942, g: 0.77647066, b: 0.6627451, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4449,6 +4578,21 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &8994076721796140899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8690941583417563213} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &8751832165543929816 GameObject: m_ObjectHideFlags: 0 @@ -4483,8 +4627,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -247, y: 0} - m_SizeDelta: {x: 80, y: 2} + m_AnchoredPosition: {x: -203.5, y: 0.062} + m_SizeDelta: {x: 54.916, y: 4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &316751718889226779 CanvasRenderer: @@ -4507,14 +4651,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.8352942, g: 0.8352942, b: 0.8352942, 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: 21300000, guid: 21e18b4111348a64684763f0a33d142c, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/ArenaNewRankRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/ArenaNewRankRewardPanel.lua index 4ef9b8cfe4..6e6afba599 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/ArenaNewRankRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/ArenaNewRankRewardPanel.lua @@ -24,7 +24,7 @@ local vec = { -- Tab管理器 local TabBox = require("Modules/Common/TabBox") -local _TabImgData = {select = "UI_hz_zhonghe01_82", default = "UI_hz_zhonghe01_83",} +local _TabImgData = {select = "task_bigbtn01", default = "task_bigbtn02",} local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), select = Color.New(243 / 255, 235 / 255, 202 / 255, 1) } local _TabData = { diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/ArenaNewRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/ArenaNewRewardPanel.lua index 5e13386c1d..346ccf5715 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/ArenaNewRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/ArenaNewRewardPanel.lua @@ -26,8 +26,8 @@ local vec = { -- Tab管理器 local TabBox = require("Modules/Common/TabBox") -local _TabImgData = {select = "UI_hz_zhonghe01_82", default = "UI_hz_zhonghe01_83",} -local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), +local _TabImgData = {select = "task_bigbtn01", default = "task_bigbtn02",} +local _TabFontColor = { default = Color.New(243 / 255, 235 / 255, 202 / 255, 1), select = Color.New(243 / 255, 235 / 255, 202 / 255, 1) } local _TabData = { [1]= {txt = Language[10755]},