From 9c37c03ec4e38456aea7543203562267a36ee4f0 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Fri, 22 Mar 2024 16:54:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=83=E7=95=8C=E7=A7=98=E5=AE=9D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GeneralPanel/GeneralTreasurePanel.prefab | 598 ++++++++++++++---- .../GeneralPanel/GeneralTreasurePanel.lua | 2 +- 2 files changed, 480 insertions(+), 120 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab index ff515658f1..95f4e1d4be 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab @@ -1,5 +1,79 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &32482448577071925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7442040206442319024} + - component: {fileID: 5113712059781067598} + - component: {fileID: 755223583511450858} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7442040206442319024 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32482448577071925} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3241267629725516866} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -34, y: -252} + m_SizeDelta: {x: 1082, y: 1432} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5113712059781067598 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32482448577071925} + m_CullTransparentMesh: 0 +--- !u!114 &755223583511450858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 32482448577071925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 21300000, guid: a2405fced91d3d443befb9c81440a05b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &38655133285007871 GameObject: m_ObjectHideFlags: 0 @@ -31,11 +105,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3241267629593443510} - m_RootOrder: 1 + m_RootOrder: 2 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: 166.75, y: -54.34497} + m_AnchoredPosition: {x: 81, y: -129} m_SizeDelta: {x: 459.7, y: 41.21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4754983125007704958 @@ -72,7 +146,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.4448824, b: 0, a: 1} + m_Color: {r: 0.94509804, g: 0.8039216, b: 0.6901961, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -184,11 +258,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3241267629593443510} - m_RootOrder: 3 + m_RootOrder: 4 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: -314, y: -93} + m_AnchoredPosition: {x: -297, y: -57} m_SizeDelta: {x: 127, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &64378864606187142 @@ -270,6 +344,101 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &841331821000852790 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 609780100827023945} + - component: {fileID: 4556957460999042766} + - component: {fileID: 385935803162586033} + - component: {fileID: 7580661818589813850} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &609780100827023945 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 841331821000852790} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3241267628898898982} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 578} + m_SizeDelta: {x: 160, y: 51.58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4556957460999042766 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 841331821000852790} + m_CullTransparentMesh: 0 +--- !u!114 &385935803162586033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 841331821000852790} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u989D\u5916\u5956\u52B1" +--- !u!114 &7580661818589813850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 841331821000852790} + 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 &1735391867779784190 GameObject: m_ObjectHideFlags: 0 @@ -484,80 +653,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3241267627665383395 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3241267627665383396} - - component: {fileID: 3241267627665383398} - - component: {fileID: 3241267627665383397} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3241267627665383396 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3241267627665383395} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 3241267628898898982} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 591} - m_SizeDelta: {x: 149, y: 43} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3241267627665383398 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3241267627665383395} - m_CullTransparentMesh: 0 ---- !u!114 &3241267627665383397 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3241267627665383395} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - 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: e7cf362085e7b374e8923d1c9789781a, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &3241267627991015112 GameObject: m_ObjectHideFlags: 0 @@ -624,7 +719,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: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 @@ -744,11 +839,11 @@ RectTransform: m_Children: - {fileID: 3241267629031491673} m_Father: {fileID: 3241267629593443510} - m_RootOrder: 2 + m_RootOrder: 3 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: 165, y: -116} + m_AnchoredPosition: {x: 32, y: -238} m_SizeDelta: {x: 200, y: 69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267628388222294 @@ -971,6 +1066,7 @@ GameObject: - component: {fileID: 3241267628631681025} - component: {fileID: 3241267628631681027} - component: {fileID: 973432505614720679} + - component: {fileID: 2764654402130753619} m_Layer: 5 m_Name: gift m_TagString: Untagged @@ -994,7 +1090,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: -177, y: 514} + m_AnchoredPosition: {x: -148, y: 554} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267628631681027 @@ -1018,7 +1114,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8745099, g: 0.6784314, b: 0.39607847, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1026,7 +1122,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: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 @@ -1040,6 +1136,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5956\u52B1" LanguageIndex: 0 +--- !u!114 &2764654402130753619 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3241267628631681024} + 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 &3241267628795801172 GameObject: m_ObjectHideFlags: 0 @@ -1070,8 +1181,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3241267629143768041} - - {fileID: 3241267629678625390} + - {fileID: 2185187962906588156} - {fileID: 3241267629593443510} + - {fileID: 3241267629678625390} - {fileID: 3241267629725516866} m_Father: {fileID: 3241267629037983134} m_RootOrder: 1 @@ -1109,7 +1221,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: fbf8b38cc4af55146a5f00d2801a1d34, type: 3} + m_Sprite: {fileID: 21300000, guid: ff7dc4e7b62364b43ac6397ea6702bea, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1148,7 +1260,7 @@ RectTransform: m_Children: - {fileID: 3241267629666444976} m_Father: {fileID: 3241267629725516866} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1192,14 +1304,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3241267627665383396} + - {fileID: 609780100827023945} m_Father: {fileID: 3241267629612328622} m_RootOrder: 2 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: 97, y: -75} - m_SizeDelta: {x: 324, y: 1273.4} + m_AnchoredPosition: {x: 123.2, y: -20.2} + m_SizeDelta: {x: 276.1, y: 1208.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267628898899160 CanvasRenderer: @@ -1230,7 +1342,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: e8c80b8f927091f4ba5e6443809bda96, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1508,12 +1620,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3241267629725516866} - m_RootOrder: 3 + m_RootOrder: 4 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: -227.7} - m_SizeDelta: {x: 965, y: 974.4} + m_AnchoredPosition: {x: 0, y: -323.1} + m_SizeDelta: {x: 965, y: 1092.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267629042436899 CanvasRenderer: @@ -1559,7 +1671,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -156, y: -180} + m_AnchoredPosition: {x: -90.20001, y: -69} m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267629143768045 @@ -1696,7 +1808,7 @@ RectTransform: - {fileID: 3241267628599728644} - {fileID: 1250312591771339680} m_Father: {fileID: 3241267629725516866} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1741,6 +1853,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3241267629675217320} + - {fileID: 7890124020956530517} - {fileID: 6070178155552615135} - {fileID: 3241267628388222290} - {fileID: 7029792567664143281} @@ -1749,8 +1862,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: 544} - m_SizeDelta: {x: 856, y: 378} + m_AnchoredPosition: {x: 238, y: 663.9} + m_SizeDelta: {x: 758, y: 187.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267629593443496 CanvasRenderer: @@ -1780,7 +1893,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: 30cbad2cddd5bbc4fa703685e7fccd1b, type: 3} + m_Sprite: {fileID: 21300000, guid: a53c2e2ae3539624f875064614af67c9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1823,12 +1936,12 @@ RectTransform: - {fileID: 3241267628631681025} - {fileID: 3241267628898898982} m_Father: {fileID: 3241267629725516866} - 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} - m_AnchoredPosition: {x: -11.2, y: -212} - m_SizeDelta: {x: 1024, y: 1070} + m_AnchoredPosition: {x: -35.9, y: -343.8} + m_SizeDelta: {x: 1002.9, y: 1216} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267629612328609 CanvasRenderer: @@ -1858,7 +1971,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: fbf8b38cc4af55146a5f00d2801a1d34, type: 3} + m_Sprite: {fileID: 21300000, guid: fa3d641a2aaa74141b80cb107d219230, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2047,6 +2160,7 @@ GameObject: - component: {fileID: 3241267629635535361} - component: {fileID: 3241267629635535363} - component: {fileID: 8038376273230580659} + - component: {fileID: 341945682340282627} m_Layer: 5 m_Name: score m_TagString: Untagged @@ -2071,7 +2185,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: -369.9, y: 514} + m_AnchoredPosition: {x: -347, y: 554} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267629635535363 @@ -2095,7 +2209,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8745099, g: 0.6784314, b: 0.39607847, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2103,7 +2217,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: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 @@ -2117,6 +2231,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u79EF\u5206:" LanguageIndex: 0 +--- !u!114 &341945682340282627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3241267629635535360} + 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 &3241267629666444991 GameObject: m_ObjectHideFlags: 0 @@ -2226,7 +2355,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: 166.75, y: 7.6000185} + m_AnchoredPosition: {x: 23, y: -14} m_SizeDelta: {x: 459.73, y: 82.68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267629675217323 @@ -2263,7 +2392,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.4448824, b: 0, a: 1} + m_Color: {r: 0.9433962, g: 0.8021486, b: 0.6897472, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -2315,12 +2444,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3241267628795801173} - m_RootOrder: 1 + m_RootOrder: 3 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: 26, y: 779} - m_SizeDelta: {x: 296, y: 68} + m_AnchoredPosition: {x: 227.8, y: 771.7} + m_SizeDelta: {x: 332, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267629678625376 CanvasRenderer: @@ -2387,16 +2516,17 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7442040206442319024} - {fileID: 3241267629612328622} - {fileID: 3241267628881923245} - {fileID: 3241267629551588876} - {fileID: 3241267629042436898} m_Father: {fileID: 3241267628795801173} - m_RootOrder: 3 + m_RootOrder: 4 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: 33, y: 12} m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267629725516867 @@ -2407,6 +2537,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3241267629725516865} m_CullTransparentMesh: 0 +--- !u!1 &3401186112317096208 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7890124020956530517} + - component: {fileID: 8855819311848489331} + - component: {fileID: 7125000947101694778} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7890124020956530517 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3401186112317096208} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3241267629593443510} + 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: -16.5, y: -118.4} + m_SizeDelta: {x: 469.8, y: 170.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8855819311848489331 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3401186112317096208} + m_CullTransparentMesh: 0 +--- !u!114 &7125000947101694778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3401186112317096208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 21300000, guid: dea7bc7f193f6ab4795ebd7e1b9e5bec, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3654887852278343791 GameObject: m_ObjectHideFlags: 0 @@ -2727,6 +2931,7 @@ GameObject: - component: {fileID: 3062262062278577305} - component: {fileID: 3074381621027325771} - component: {fileID: 9174517148405279865} + - component: {fileID: 6536567471081419007} m_Layer: 5 m_Name: number m_TagString: Untagged @@ -2774,7 +2979,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.9764151, b: 0.9764151, a: 1} + m_Color: {r: 0.9622642, g: 0.8302614, b: 0.013616921, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2782,7 +2987,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: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 @@ -2794,7 +2999,22 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: + m_Text: 999 +--- !u!114 &6536567471081419007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6404533595248026962} + 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 &7277483333634938914 GameObject: m_ObjectHideFlags: 0 @@ -2853,14 +3073,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, 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: 747e1fe1bc251b84da395dce38aab036, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3018,3 +3238,143 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1001 &1496382989221753541 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3241267628795801173} + m_Modifications: + - target: {fileID: 1278836279125380824, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_Name + value: live2d_c_0001 + objectReference: {fileID: 0} + - target: {fileID: 1278836279125380824, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -238.2 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -96.29999 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f82b8c26a95399b42a3130f8cea62404, type: 3} +--- !u!224 &2185187962906588156 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 763185011175080249, guid: f82b8c26a95399b42a3130f8cea62404, + type: 3} + m_PrefabInstance: {fileID: 1496382989221753541} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua index d9cbf89bf1..2da00e239d 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua @@ -2,7 +2,7 @@ require("Base/BasePanel") local GeneralTreasurePanel = Inherit(BasePanel) local itemnum = 0 local LocalData = { - [ActivityTypeDef.QiJieTreasure] = {itemId = 1242,hp = HELP_TYPE.QiJieTreasure,imgName = "q_qjsl_qjmb2",imgBg = "q_qjsl_qjmb",unLockType = 4,Tips = "挑战七界试炼,提升秘宝等级,激活秘宝后还可领取额外奖励"},--七界秘宝 + [ActivityTypeDef.QiJieTreasure] = {itemId = 1242,hp = HELP_TYPE.QiJieTreasure,imgName = "q_qjsl_qjmb2",imgBg = "d_dhxx_di 1",unLockType = 4,Tips = "挑战七界试炼,提升秘宝等级,激活秘宝后还可领取额外奖励"},--七界秘宝 } local id=0 --初始化组件(用于子类重写) From c05ccab607ccdf6334e940c50ee395abf8d697ab Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Fri, 22 Mar 2024 17:07:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/WorldArena/ArenaNewUpRankPanel.prefab | 127 ++++++++++++++---- 1 file changed, 101 insertions(+), 26 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/ArenaNewUpRankPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/ArenaNewUpRankPanel.prefab index 46a0ac2696..b585316c5e 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/ArenaNewUpRankPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/ArenaNewUpRankPanel.prefab @@ -116,17 +116,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 320883300106005206} - m_LocalRotation: {x: 0, y: 0, z: -0.42261827, w: 0.9063079} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 1} - m_Children: [] + m_Children: + - {fileID: 7154907859141553425} m_Father: {fileID: 4981232158901670091} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -50} + 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: -80, y: 170} - m_SizeDelta: {x: 481, y: 2221} + m_AnchoredPosition: {x: 0, y: 263} + m_SizeDelta: {x: 1080, y: 1437} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1351930385094129617 CanvasRenderer: @@ -156,7 +157,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: 88de81d49484c654a91775aa875b1f61, type: 3} + m_Sprite: {fileID: 21300000, guid: 48ba5c079bd402c419cdf58e718925c8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -356,8 +357,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5179453012663215030} - - {fileID: 7154907859141553425} - {fileID: 674164162391373396} + - {fileID: 5837999712431540988} - {fileID: 8540808081173573154} - {fileID: 6870885864619699372} - {fileID: 8621324086007213275} @@ -419,7 +420,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: -65.6} + m_AnchoredPosition: {x: 0, y: -106} m_SizeDelta: {x: 50.27, y: 42.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5695229420900866909 @@ -495,11 +496,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4981232158901670091} - m_RootOrder: 2 + 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.00000047684, y: -69.9} + m_AnchoredPosition: {x: -0.00000047684, y: -110} m_SizeDelta: {x: 436, y: 88.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &795575584434829986 @@ -573,7 +574,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.7, y: -155} + m_AnchoredPosition: {x: 3.7, y: -195} m_SizeDelta: {x: 380.1, y: 63.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8724839741809568108 @@ -727,7 +728,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: 0.0000076293945} + m_AnchoredPosition: {x: 0, y: -0.000015258789} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &5343069358979546458 @@ -848,7 +849,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: -38} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3407452979143846689 @@ -1004,7 +1005,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: 79.399414} + m_AnchoredPosition: {x: 0, y: 50} m_SizeDelta: {x: 380, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4803123704542731706 @@ -1276,7 +1277,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: 49.4} + m_AnchoredPosition: {x: 0, y: -20} m_SizeDelta: {x: 866, y: 131} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4212287869520167870 @@ -1341,17 +1342,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5823252064702621078} - m_LocalRotation: {x: 0, y: 0, z: 0.42261827, w: 0.9063079} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4981232158901670091} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 50} + m_Father: {fileID: 5179453012663215030} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 80, y: 170} - m_SizeDelta: {x: 596, y: 2200} + m_AnchoredPosition: {x: 0, y: 44} + m_SizeDelta: {x: 654, y: 662} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8254278458292324628 CanvasRenderer: @@ -1381,7 +1382,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: 811b396e013ac844f91d82dd5a847290, type: 3} + m_Sprite: {fileID: 21300000, guid: 10300825faf893e41975df36ff6c3711, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1497,7 +1498,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: -14, y: 158} + m_AnchoredPosition: {x: -14, y: 150} m_SizeDelta: {x: 533.1, y: 351.77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5060832832135225725 @@ -1543,7 +1544,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: 48.819, y: -129.32999} + m_AnchoredPosition: {x: 48.819, y: -169.72998} m_SizeDelta: {x: 728.7, y: 16.16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2536150484816039965 @@ -1989,7 +1990,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: -323.7, y: -127} + m_AnchoredPosition: {x: -323.7, y: -167.4} m_SizeDelta: {x: 50.27, y: 63.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2225135575382905989 @@ -2114,6 +2115,80 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6BB5\u4F4D\u91CD\u7F6E\u4E3A" +--- !u!1 &7672109402350462270 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5837999712431540988} + - component: {fileID: 2229999187003702215} + - component: {fileID: 8817446759072317377} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5837999712431540988 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7672109402350462270} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_Children: [] + m_Father: {fileID: 4981232158901670091} + m_RootOrder: 2 + 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.0059814, y: -305.9} + m_SizeDelta: {x: 2160, y: 774.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2229999187003702215 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7672109402350462270} + m_CullTransparentMesh: 0 +--- !u!114 &8817446759072317377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7672109402350462270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 21300000, guid: 3bb13f4dd8c732d43acc634533999089, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &8151856942951019960 GameObject: m_ObjectHideFlags: 0 From ab1ade6a5edfacdd3c42b7eee3e56143533a8e97 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Fri, 22 Mar 2024 17:16:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/WorldArena/ArenaNewUpRankPanel.prefab | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/ArenaNewUpRankPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/ArenaNewUpRankPanel.prefab index b585316c5e..ec1bdbe327 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/ArenaNewUpRankPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/ArenaNewUpRankPanel.prefab @@ -108,7 +108,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5179453012663215030 RectTransform: m_ObjectHideFlags: 0 @@ -122,7 +122,7 @@ RectTransform: m_Children: - {fileID: 7154907859141553425} m_Father: {fileID: 4981232158901670091} - 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} @@ -356,8 +356,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5179453012663215030} - {fileID: 674164162391373396} + - {fileID: 5179453012663215030} - {fileID: 5837999712431540988} - {fileID: 8540808081173573154} - {fileID: 6870885864619699372} @@ -444,7 +444,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.8353395, b: 0, a: 1} + m_Color: {r: 0.98765564, g: 1, b: 0, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -453,11 +453,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 42 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 50 + m_MaxSize: 60 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -493,15 +493,15 @@ RectTransform: m_GameObject: {fileID: 1659838153480597789} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.9, y: 0.9, z: 1} m_Children: [] m_Father: {fileID: 4981232158901670091} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.00000047684, y: -110} - m_SizeDelta: {x: 436, y: 88.7} + m_AnchoredPosition: {x: -0, y: 81} + m_SizeDelta: {x: 2160, y: 3839.9998} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &795575584434829986 CanvasRenderer: @@ -525,13 +525,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + 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: c2a64da00ff23684bbb798e3dc71ec22, type: 3} + m_Sprite: {fileID: 21300000, guid: f56ac90088d7ac44ea4718d740e54e7b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -574,7 +574,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.7, y: -195} + m_AnchoredPosition: {x: 3.7, y: -190} m_SizeDelta: {x: 380.1, y: 63.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8724839741809568108 @@ -849,7 +849,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: -38} + m_AnchoredPosition: {x: 0, y: -45} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3407452979143846689 @@ -1160,7 +1160,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: -576} + m_AnchoredPosition: {x: 0, y: -621} m_SizeDelta: {x: 258, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &147015256980523709 @@ -1544,7 +1544,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: 48.819, y: -169.72998} + m_AnchoredPosition: {x: 48.819, y: -164.72998} m_SizeDelta: {x: 728.7, y: 16.16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2536150484816039965 @@ -1990,7 +1990,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: -323.7, y: -167.4} + m_AnchoredPosition: {x: -323.7, y: -162.4} m_SizeDelta: {x: 50.27, y: 63.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2225135575382905989 @@ -2149,8 +2149,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.0059814, y: -305.9} - m_SizeDelta: {x: 2160, y: 774.6} + m_AnchoredPosition: {x: -0.0059814, y: -316.5} + m_SizeDelta: {x: 2160, y: 826.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2229999187003702215 CanvasRenderer: From dcd01eb9918b9f61ac5ed77651aa318d0215c5ab Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Fri, 22 Mar 2024 18:06:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=89=9B=E6=B0=94=E5=86=B2=E5=A4=A9?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NiuQiChongTian/NiuQiChongTianPanel.prefab | 408 ++++++++++++++++-- .../UI/WorldArena/ArenaNewUpRankPanel.prefab | 2 +- 2 files changed, 381 insertions(+), 29 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab index 3e4af6ae5e..a3d9359ba6 100644 --- a/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab @@ -112,7 +112,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.000012398, y: -756.2} + m_AnchoredPosition: {x: 0.000012398, y: -785} m_SizeDelta: {x: 502, y: 54.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3353661154713415312 @@ -186,8 +186,8 @@ 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: 0, y: -562.5} - m_SizeDelta: {x: 1068, y: 1226.7} + m_AnchoredPosition: {x: 0, y: -577.9} + m_SizeDelta: {x: 1068, y: 1257.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5046095925682704895 CanvasRenderer: @@ -311,12 +311,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3547643978346228541} - m_RootOrder: 0 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -277} - m_SizeDelta: {x: 1080, y: 554} + m_AnchoredPosition: {x: -14, y: -399} + m_SizeDelta: {x: 847, y: 655} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6629157739033899807 CanvasRenderer: @@ -333,7 +333,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 347151964723713458} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -346,7 +346,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: a30cf0ba0c0f8f342af465df00d34ab6, type: 3} + m_Sprite: {fileID: 21300000, guid: dff7fa7b8eb735342adb9c43f0079550, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -425,7 +425,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -218.92, y: 50} - m_SizeDelta: {x: 232.37, y: 100} + m_SizeDelta: {x: 230, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6573501347890279480 CanvasRenderer: @@ -1269,14 +1269,17 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 532821355694529675} + - {fileID: 366869140261592055} + - {fileID: 5465283240346558740} - {fileID: 6684140351592508948} m_Father: {fileID: 3026942363793877950} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 542, y: 955} + m_SizeDelta: {x: 1446, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2176579432021712289 CanvasRenderer: @@ -1306,7 +1309,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: 98e7a30f5ae0c7948a7ba31607829be1, type: 3} + m_Sprite: {fileID: 21300000, guid: 3534ae977d5a1894794a1f05660a4f85, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1349,8 +1352,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: -9.9, y: -469.3} - m_SizeDelta: {x: 986.4, y: 819.7} + m_AnchoredPosition: {x: -9.9, y: -482.1} + m_SizeDelta: {x: 986.4, y: 827} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9177181720887223299 CanvasRenderer: @@ -1721,7 +1724,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.3, y: 0.61} - m_SizeDelta: {x: 272, y: 121.34} + m_SizeDelta: {x: 230, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6993632569571917862 CanvasRenderer: @@ -1985,7 +1988,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 297} + m_AnchoredPosition: {x: 4.9000244, y: 297} m_SizeDelta: {x: 0, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3824647323492070119 @@ -2381,7 +2384,7 @@ RectTransform: m_GameObject: {fileID: 4395610403070120046} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.8, y: 0.8, z: 1} m_Children: - {fileID: 453597364146430693} m_Father: {fileID: 484504342669095539} @@ -2390,7 +2393,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -420, y: 18} - m_SizeDelta: {x: 148.85, y: 157.5} + m_SizeDelta: {x: 176, y: 216} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6493502476584871892 CanvasRenderer: @@ -2420,7 +2423,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: 8855df9cfe7949a4fbdd26dda02eb098, type: 3} + m_Sprite: {fileID: 21300000, guid: 094e34c42e661a748a0fa9dde0f808bf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2538,7 +2541,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: 5.3149} + m_AnchoredPosition: {x: 0, y: 2.6} m_SizeDelta: {x: 160, y: 31.37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7096228294599665147 @@ -2571,7 +2574,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 38 + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -2582,7 +2585,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: + m_Text: 9999 --- !u!1 &4689356545102374745 GameObject: m_ObjectHideFlags: 0 @@ -8091,8 +8094,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 50} - m_SizeDelta: {x: 0, y: 164} + m_AnchoredPosition: {x: 0, y: 51} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &357541952192552971 CanvasRenderer: @@ -8122,7 +8125,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: 2609ccd74e672d84c8e128abd8dc9428, type: 3} + m_Sprite: {fileID: 21300000, guid: d682dd116e9e29941a1993d28d20355f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9253,6 +9256,80 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 200 +--- !u!1 &7495059898286845315 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5465283240346558740} + - component: {fileID: 8025193007827405656} + - component: {fileID: 8819889101247503409} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5465283240346558740 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7495059898286845315} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3547643978346228541} + m_RootOrder: 2 + 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: -14, y: 532} + m_SizeDelta: {x: 520, y: 162} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8025193007827405656 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7495059898286845315} + m_CullTransparentMesh: 0 +--- !u!114 &8819889101247503409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7495059898286845315} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 21300000, guid: 5b8ba96f23e958147a367d6003140d48, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7658839227048513687 GameObject: m_ObjectHideFlags: 0 @@ -9733,7 +9810,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: -9.9, y: -634.23} + m_AnchoredPosition: {x: -5, y: -657} m_SizeDelta: {x: 986.4, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8778273487242550425 @@ -9845,7 +9922,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: -96} + m_AnchoredPosition: {x: 0, y: -108.7} m_SizeDelta: {x: 157, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6976397986984294231 @@ -10268,3 +10345,278 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1001 &1197578675730128497 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3547643978346228541} + m_Modifications: + - target: {fileID: 2703482157249238580, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_Name + value: live2d_c_0056 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 28 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -470 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalScale.x + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalScale.y + value: 0.8 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b8640cd662140234aaa12e809a61ca58, type: 3} +--- !u!224 &532821355694529675 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + m_PrefabInstance: {fileID: 1197578675730128497} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1363799918246385933 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3547643978346228541} + m_Modifications: + - target: {fileID: 2703482157249238580, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_Name + value: live2d_c_0056 (1) + objectReference: {fileID: 0} + - target: {fileID: 2703482157249238580, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -305 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -470 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalScale.x + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + propertyPath: m_LocalScale.y + value: 0.8 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b8640cd662140234aaa12e809a61ca58, type: 3} +--- !u!224 &366869140261592055 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1727782771756106490, guid: b8640cd662140234aaa12e809a61ca58, + type: 3} + m_PrefabInstance: {fileID: 1363799918246385933} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/ArenaNewUpRankPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/ArenaNewUpRankPanel.prefab index ec1bdbe327..3849c69548 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/ArenaNewUpRankPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/ArenaNewUpRankPanel.prefab @@ -525,7 +525,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: []