From 1123d9dc2de4ac496dff1ed733f747fb7a89bf83 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 28 Jul 2021 11:52:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9D=E7=89=A9=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RewardTalismanSingleShowPopup.prefab | 643 +++++++++--------- .../RoleEquipTreasureChangePopup.prefab | 6 +- .../Popup/RewardTalismanSingleShowPopup.lua | 68 +- 3 files changed, 368 insertions(+), 349 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab index 363f0241f5..ca9cc0e5de 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab @@ -200,8 +200,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 396.415, y: 0} - m_SizeDelta: {x: 792.83, y: 0} + m_AnchoredPosition: {x: 412.9, y: 0} + m_SizeDelta: {x: 825.8, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &20288529025851301 MonoBehaviour: @@ -216,15 +216,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 170 m_Right: 0 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 301, y: 60} - m_Spacing: {x: 180, y: -6.3} + m_CellSize: {x: 293.6, y: 61.41} + m_Spacing: {x: 70, y: -17.59} m_Constraint: 1 m_ConstraintCount: 2 --- !u!114 &4343445286287209622 @@ -391,7 +391,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: 36.81, y: -0.000033393768} + m_AnchoredPosition: {x: 36.81, y: -0.0000004992083} m_SizeDelta: {x: 912.79004, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &7871582414776459346 @@ -417,44 +417,6 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 ---- !u!1 &133047354883971467 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 198528029882776495} - m_Layer: 5 - m_Name: proPre - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &198528029882776495 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133047354883971467} - 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: - - {fileID: 200087582420956373} - - {fileID: 199189022670928889} - - {fileID: 2301036647516652823} - m_Father: {fileID: 199198497822447983} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150.5, y: -30} - m_SizeDelta: {x: 301, y: 60} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &133081874894555725 GameObject: m_ObjectHideFlags: 0 @@ -862,13 +824,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 198528029882776495} + m_Father: {fileID: 6589268556982416204} 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: -39.64, y: 0.000080109} - m_SizeDelta: {x: 221.72, y: 60} + m_AnchoredPosition: {x: -51.26, y: 0} + m_SizeDelta: {x: 191.08, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &200596531582999795 CanvasRenderer: @@ -1774,12 +1736,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 198242514492665305} - m_RootOrder: 4 + m_RootOrder: 5 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: 178.4, y: -114} - m_SizeDelta: {x: 334.3, y: 101.6} + m_AnchoredPosition: {x: 260.4, y: 70} + m_SizeDelta: {x: 170.3, y: 101.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &201037513926260737 CanvasRenderer: @@ -1824,85 +1786,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "[\u4F20\u8BF4]" LanguageIndex: 0 ---- !u!1 &133973775097132399 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 199189022670928889} - - component: {fileID: 200470966952562323} - - component: {fileID: 19476083420492723} - m_Layer: 5 - m_Name: proVale - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &199189022670928889 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133973775097132399} - 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: 198528029882776495} - 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: 110.86002, y: 0.000012398} - m_SizeDelta: {x: 79.28, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &200470966952562323 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133973775097132399} - m_CullTransparentMesh: 0 ---- !u!114 &19476083420492723 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133973775097132399} - 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: 0.9882353, g: 0.92156863, b: 0.7921569, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 34 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 20 - m_MaxSize: 34 - m_Alignment: 5 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 4 --- !u!1 &134706595689304915 GameObject: m_ObjectHideFlags: 0 @@ -1914,7 +1797,7 @@ GameObject: - component: {fileID: 198620298042972713} - component: {fileID: 200641947934821997} - component: {fileID: 21139968249895199} - - component: {fileID: 20397554856219305} + - component: {fileID: 935123433453229773} m_Layer: 5 m_Name: powerNum m_TagString: Untagged @@ -1931,15 +1814,15 @@ RectTransform: m_GameObject: {fileID: 134706595689304915} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_LocalScale: {x: 0.8000001, y: 0.8000001, z: 0.8000001} m_Children: [] m_Father: {fileID: 198242514492665305} - m_RootOrder: 5 + m_RootOrder: 6 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: -173.79001, y: -118.10004} - m_SizeDelta: {x: 434.48, y: 30} + m_AnchoredPosition: {x: 304.3, y: -50.79987} + m_SizeDelta: {x: 209.2, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &200641947934821997 CanvasRenderer: @@ -1970,7 +1853,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: eef8582042a41b149b699b3180ce40fd, type: 2} + m_Font: {fileID: 12800000, guid: 634137158f07dff488d018d707aa403a, type: 2} m_FontSize: 0 m_FontStyle: 0 m_BestFit: 0 @@ -1982,8 +1865,8 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 38000 ---- !u!114 &20397554856219305 + m_Text: 86685 +--- !u!114 &935123433453229773 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1995,7 +1878,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} m_Name: m_EditorClassIdentifier: - _textSpacing: -15.18 + _textSpacing: -30.48 --- !u!1 &134730644470091095 GameObject: m_ObjectHideFlags: 0 @@ -2027,7 +1910,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 198690712392213173} - - {fileID: 198528029882776495} + - {fileID: 6589268556982416204} - {fileID: 8737735201863086632} - {fileID: 4273494743000231776} - {fileID: 198284821834981289} @@ -2222,13 +2105,14 @@ RectTransform: m_Children: - {fileID: 200099851122254037} - {fileID: 198293759803611469} + - {fileID: 4832213832411984816} - {fileID: 5432164890005914632} - {fileID: 7848059805440627922} - {fileID: 199225586368902825} - {fileID: 198620298042972713} - {fileID: 5121225715051253714} - {fileID: 8554891971767032946} - - {fileID: 4832213832411984816} + - {fileID: 222342139258190135} m_Father: {fileID: 198690712392213173} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2245,80 +2129,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 134751987924678563} m_CullTransparentMesh: 0 ---- !u!1 &144321700358671217 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8827924850371513130} - - component: {fileID: 1001276399137186970} - - component: {fileID: 2187555299661065358} - m_Layer: 5 - m_Name: warImage (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8827924850371513130 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 144321700358671217} - 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: 5121225715051253714} - 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: 50.8, y: 0.00008392334} - m_SizeDelta: {x: 62, y: 62} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1001276399137186970 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 144321700358671217} - m_CullTransparentMesh: 0 ---- !u!114 &2187555299661065358 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 144321700358671217} - 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: f1ab9c344dff9df42a1e0aeb010445c4, 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 &164668485964555967 GameObject: m_ObjectHideFlags: 0 @@ -2349,7 +2159,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 198242514492665305} - 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} @@ -2669,6 +2479,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &594836276974060159 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3391099069466158049} + - component: {fileID: 806391065344054917} + - component: {fileID: 1506689751431729167} + 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 &3391099069466158049 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 594836276974060159} + 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: 8737735201863086632} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 898.92, y: 4.4400024} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &806391065344054917 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 594836276974060159} + m_CullTransparentMesh: 0 +--- !u!114 &1506689751431729167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 594836276974060159} + 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: 19d5542f3ad36154883cfc2022d17e0a, 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 &759728753419975957 GameObject: m_ObjectHideFlags: 0 @@ -3072,7 +2956,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 198242514492665305} - m_RootOrder: 8 + 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} @@ -3459,15 +3343,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 170 m_Right: 0 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 301, y: 60} - m_Spacing: {x: 180, y: -6.3} + m_CellSize: {x: 293.6, y: 61.41} + m_Spacing: {x: 70, y: -17.59} m_Constraint: 1 m_ConstraintCount: 2 --- !u!114 &5227588078123427036 @@ -3718,80 +3602,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u65E0\u540D\u4E4B\u68EE" LanguageIndex: 0 ---- !u!1 &2086740049868450621 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2301036647516652823} - - component: {fileID: 2298671322187357319} - - component: {fileID: 2118149474780178723} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2301036647516652823 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2086740049868450621} - 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: 198528029882776495} - 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: 81.08, y: -31} - m_SizeDelta: {x: 803.47, y: 2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2298671322187357319 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2086740049868450621} - m_CullTransparentMesh: 0 ---- !u!114 &2118149474780178723 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2086740049868450621} - 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: 22dc874907edd324c8d9f3ab280cb5b5, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &2086765802012342393 GameObject: m_ObjectHideFlags: 0 @@ -4262,6 +4072,52 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &2345177506815158060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6589268556982416204} + - component: {fileID: 2996187623658887069} + m_Layer: 5 + m_Name: proPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6589268556982416204 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2345177506815158060} + 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: + - {fileID: 200087582420956373} + - {fileID: 6001790286033219964} + m_Father: {fileID: 199198497822447983} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 146.8, y: -30.705} + m_SizeDelta: {x: 293.6, y: 61.41} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2996187623658887069 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2345177506815158060} + m_CullTransparentMesh: 0 --- !u!1 &2386991811422994216 GameObject: m_ObjectHideFlags: 0 @@ -4570,6 +4426,85 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u65E0\u540D\u4E4B\u68EE" LanguageIndex: 0 +--- !u!1 &4142834099206575577 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6001790286033219964} + - component: {fileID: 1494751135061367023} + - component: {fileID: 7394542915489354148} + m_Layer: 5 + m_Name: proVale + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6001790286033219964 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4142834099206575577} + 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: 6589268556982416204} + 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: 95.54, y: 0} + m_SizeDelta: {x: 102.52, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1494751135061367023 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4142834099206575577} + m_CullTransparentMesh: 0 +--- !u!114 &7394542915489354148 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4142834099206575577} + 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: 0.7254902, g: 0.68235296, b: 0.5921569, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: +66 --- !u!1 &4383397681474610825 GameObject: m_ObjectHideFlags: 0 @@ -4600,12 +4535,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 198242514492665305} - m_RootOrder: 7 + m_RootOrder: 8 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: 58.25001, y: -25.9} - m_SizeDelta: {x: 574.6, y: 107.2} + m_AnchoredPosition: {x: -27.1, y: -122.7} + m_SizeDelta: {x: 820.6, y: 59.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3957510038944987859 CanvasRenderer: @@ -4628,7 +4563,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4637,18 +4572,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 30 + m_FontSize: 32 m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 20 - m_MaxSize: 30 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u8EAB\u968F\u5FC3\u52A8\uFF0C\u77AC\u606F\u5343\u91CC\u201D\u8EAB\u968F\u5FC3\u52A8\uFF0C\u77AC\u606F\u5343\u91CC\u201D\u8EAB\u968F\u5FC3\u52A8\uFF0C\u77AC\u606F\u5343\u91CC\u201D\u8EAB\u968F\u5FC3\u52A8\uFF0C\u77AC\u606F\u5343\u91CC\u201D\u8EAB\u968F\u5FC3\u52A8\uFF0C\u77AC\u606F\u5343\u91CC\u201D\u8EAB\u968F\u5FC3\u52A8\uFF0C\u77AC\u606F\u5343\u91CC\u201D" + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1.44 + m_Text: "\u8EAB\u968F\u5FC3\u52A8\uFF0C\u77AC\u606F\u5343\u91CC\u201D" LanguageIndex: 0 --- !u!1 &4736097268539619100 GameObject: @@ -4677,16 +4612,15 @@ RectTransform: m_GameObject: {fileID: 4736097268539619100} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 1} - m_Children: - - {fileID: 8827924850371513130} + m_LocalScale: {x: 0.6693334, y: 0.6693334, z: 0.6693334} + m_Children: [] m_Father: {fileID: 198242514492665305} - m_RootOrder: 6 + m_RootOrder: 7 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: -403.9, y: -119.5} - m_SizeDelta: {x: 70, y: 76} + m_AnchoredPosition: {x: 184, y: -50} + m_SizeDelta: {x: 138, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7424522467028013152 CanvasRenderer: @@ -4716,7 +4650,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: 48323a0121f515044a999ca5bfe2f6c3, type: 3} + m_Sprite: {fileID: 21300000, guid: 2afbd36bb3abea245896431bcb14b30c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4894,7 +4828,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 198242514492665305} - 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} @@ -5473,6 +5407,86 @@ RectTransform: m_AnchoredPosition: {x: -45, y: -160} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} +--- !u!1 &7184718765018466727 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 222342139258190135} + - component: {fileID: 3429475981671455000} + - component: {fileID: 1813982383028326734} + m_Layer: 5 + m_Name: equipType + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &222342139258190135 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7184718765018466727} + 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: 198242514492665305} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 274, y: -53.8} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3429475981671455000 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7184718765018466727} + m_CullTransparentMesh: 0 +--- !u!114 &1813982383028326734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7184718765018466727} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, 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: 34 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: + LanguageIndex: 0 --- !u!1 &7215787093242135902 GameObject: m_ObjectHideFlags: 0 @@ -5735,6 +5749,7 @@ RectTransform: - {fileID: 1984021733659165841} - {fileID: 198186606409137169} - {fileID: 5637872735719797130} + - {fileID: 3391099069466158049} m_Father: {fileID: 199198497822447983} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6103,5 +6118,5 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5F3A\u5316\u5C5E\u6027\uFF1A" + m_Text: "\u57FA\u7840\u5C5E\u6027\uFF1A" LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab index e9288eb193..d0e1d8e741 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab @@ -1182,7 +1182,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: -133.45003, y: -119.45} + m_AnchoredPosition: {x: -133.45003, y: -118.5} m_SizeDelta: {x: 433.9, y: 74.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222846619990290398 @@ -3849,7 +3849,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 376.5, y: 131.3} + m_SizeDelta: {x: 363.26, y: 131.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5721695707260531687 MonoBehaviour: @@ -5761,7 +5761,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 376.5, y: 131.3} + m_SizeDelta: {x: 363.05, y: 131.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5510520127624261212 MonoBehaviour: diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua index 3fb6dd3a15..cbe3872762 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua @@ -38,6 +38,8 @@ function RewardTalismanSingleShowPopup:InitComponent() --this.getTuPre=Util.GetGameObject(self.transform, "Content/bg/getTuPre") self.getTuGrid=Util.GetGameObject(self.transform, "Content/bg/scroll/grid") self.equipProGridCom = self.getTuGrid:GetComponent("VerticalLayoutGroup") + + self.equipType = Util.GetGameObject(self.transform, "Content/bg/armorInfo/equipType"):GetComponent("Text") end --绑定事件(用于子类重写) @@ -48,37 +50,38 @@ function RewardTalismanSingleShowPopup:BindEvent() self:ClosePanel() end) Util.AddClick(self.btnJump, function() - if itemConfig then - JumpManager.GoJump(itemConfig.UseJump) - end + -- if itemConfig then + -- JumpManager.GoJump(itemConfig.UseJump) + -- end + JumpManager.GoJump(22001) end) Util.AddClick(self.btnSure, function() - local curResolveAllItemList={} - table.insert(curResolveAllItemList,dId) - local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. "isTalismanShowSure") - local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) - local haveHighQuality=false - local data = TalismanManager.GetSingleTalismanData(dId) - local itemConfig = data.itemConfig - if(itemConfig.Quantity>=4) then - haveHighQuality=true - end - if (isPopUp ~= currentTime and haveHighQuality) then - MsgPanel.ShowTwo(Language[11522], nil, function(isShow) - if (isShow) then - local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) - RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .. "isTalismanShowSure", currentTime) - end - NetManager.UseAndPriceItemRequest(4,curResolveAllItemList,function (drop) - self:SendBackResolveReCallBack(drop) - end) - end, nil, nil, nil, true) - else - NetManager.UseAndPriceItemRequest(4,curResolveAllItemList,function (drop) - self:SendBackResolveReCallBack(drop) - end) - end - + -- local curResolveAllItemList={} + -- table.insert(curResolveAllItemList,dId) + -- local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. "isTalismanShowSure") + -- local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) + -- local haveHighQuality=false + -- local data = TalismanManager.GetSingleTalismanData(dId) + -- local itemConfig = data.itemConfig + -- if(itemConfig.Quantity>=4) then + -- haveHighQuality=true + -- end + -- if (isPopUp ~= currentTime and haveHighQuality) then + -- MsgPanel.ShowTwo(Language[11522], nil, function(isShow) + -- if (isShow) then + -- local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) + -- RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .. "isTalismanShowSure", currentTime) + -- end + -- NetManager.UseAndPriceItemRequest(4,curResolveAllItemList,function (drop) + -- self:SendBackResolveReCallBack(drop) + -- end) + -- end, nil, nil, nil, true) + -- else + -- NetManager.UseAndPriceItemRequest(4,curResolveAllItemList,function (drop) + -- self:SendBackResolveReCallBack(drop) + -- end) + -- end + JumpManager.GoJump(24005) end) end @@ -105,11 +108,12 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function RewardTalismanSingleShowPopup:OnShow() - - if type == 1 then + if BagManager.isBagPanel then self.btnSure:SetActive(true) + self.btnJump:SetActive(true) else self.btnSure:SetActive(false) + self.btnJump:SetActive(false) end self:OnShowPanelData() ForceRebuildLayout(self.curMainProscroll.transform) @@ -133,6 +137,7 @@ function RewardTalismanSingleShowPopup:OnShowPanelData() curEquipTreasureStrongFigData,curEquipTreasureSefineFigData = self:GetStrongAndRefineConFig(curEquipTreasureFigData,lv,refineLv) end self.curEquipDesc1.text=GetLanguageStrById(itemConfig.ItemDescribe) + self.equipType.text = string.format("宝物种类:%s",curEquipTreasureFigData.Location == 1 and "魂宝" or "灵宝") self.qualityText.text=GetStringByEquipQua(itemConfig.Quantity,GetQuaStringByEquipQua(itemConfig.Quantity)) self.curEquipName.text=GetStringByEquipQua(itemConfig.Quantity,GetLanguageStrById(itemConfig.Name)) if lv>0 then @@ -150,7 +155,6 @@ function RewardTalismanSingleShowPopup:OnShowPanelData() self.curEquipFrame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig.Quantity)) self.curEquipIcon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig.ResourceID)) self.proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(itemConfig.PropertyName)) - self.btnJump:SetActive(itemConfig.UseJump and itemConfig.UseJump > 0 and BagManager.isBagPanel) --强化属性 Util.ClearChild(self.curMainProGrid.transform) if #curEquipTreasureStrongFigData.Property>0 then --