diff --git a/Assets/Content/Prefabs/UI/UIBattle/UIBattleReward.prefab b/Assets/Content/Prefabs/UI/UIBattle/UIBattleReward.prefab index d7e0921db..f3ccd9755 100644 --- a/Assets/Content/Prefabs/UI/UIBattle/UIBattleReward.prefab +++ b/Assets/Content/Prefabs/UI/UIBattle/UIBattleReward.prefab @@ -766,7 +766,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -616} + m_AnchoredPosition: {x: 540, y: -716} m_SizeDelta: {x: 880, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2631867708256911785 @@ -1279,10 +1279,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5627026387844594168} 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_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -450, y: 300} + m_SizeDelta: {x: 900, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7224443419376303978 CanvasRenderer: @@ -1314,10 +1314,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3} - m_FontSize: 48 + m_FontSize: 32 m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 20 + m_BestFit: 0 + m_MinSize: 3 m_MaxSize: 48 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1349,13 +1349,17 @@ GameObject: m_Component: - component: {fileID: 5627026387844594168} - component: {fileID: 2502120407193850266} + - component: {fileID: 4844575418508060336} + - component: {fileID: 6734164661960996315} + - component: {fileID: 7221255689977739052} + - component: {fileID: 2567971111499435727} m_Layer: 5 - m_Name: PressAny + m_Name: AnyCloseBtn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5627026387844594168 RectTransform: m_ObjectHideFlags: 0 @@ -1369,12 +1373,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3191347402599377861} - m_Father: {fileID: 6394027410645606284} + m_Father: {fileID: 3641245365362796326} 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: -50} - m_SizeDelta: {x: 900, y: 50} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2502120407193850266 MonoBehaviour: @@ -1396,6 +1400,111 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &4844575418508060336 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1217193642757979579} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &6734164661960996315 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1217193642757979579} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3} + m_Name: + m_EditorClassIdentifier: + UIName: + keys: + - UnityEngine.RectTransform + - UnityEngine.UI.LayoutElement + - UnityEngine.UI.Button + - UINode + - UnityEngine.CanvasRenderer + - UnityEngine.UI.Image + values: 000001000000 + depObjs: [] + activeType: 0 +--- !u!222 &7221255689977739052 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1217193642757979579} + m_CullTransparentMesh: 1 +--- !u!114 &2567971111499435727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1217193642757979579} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1282728446302823530 GameObject: m_ObjectHideFlags: 0 @@ -2151,7 +2260,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: -315, y: -22} + m_AnchoredPosition: {x: -298, y: -75} m_SizeDelta: {x: 292, y: 313} m_Pivot: {x: 0.5, y: 0} --- !u!222 &8314406259457100983 @@ -2212,150 +2321,6 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &2082241043623157877 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6397110873763373322} - - component: {fileID: 8320504065962196559} - - component: {fileID: 1909938511819770367} - - component: {fileID: 5992644912652644754} - - component: {fileID: 183885688736297431} - m_Layer: 5 - m_Name: BtnReceive - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6397110873763373322 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2082241043623157877} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3350342264238783384} - m_Father: {fileID: 6394027410645606284} - 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: 894, y: 157} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8320504065962196559 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2082241043623157877} - m_CullTransparentMesh: 1 ---- !u!114 &1909938511819770367 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2082241043623157877} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3} - m_Name: - m_EditorClassIdentifier: - UIName: - keys: - - UnityEngine.RectTransform - - UnityEngine.CanvasRenderer - - UnityEngine.UI.Image - - UnityEngine.UI.Button - - UINode - values: 0000000100 - depObjs: [] - activeType: 0 ---- !u!114 &5992644912652644754 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2082241043623157877} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c5fc094d5b14942479dbc22d4eaec204, 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 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &183885688736297431 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2082241043623157877} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 5992644912652644754} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &2116767857888039626 GameObject: m_ObjectHideFlags: 0 @@ -4148,7 +4113,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5692821874018682072 RectTransform: m_ObjectHideFlags: 0 @@ -4166,9 +4131,9 @@ RectTransform: - {fileID: 419689520419077660} m_Father: {fileID: 6394027410645606284} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -1241} m_SizeDelta: {x: 950, y: 500} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8253681069410933163 @@ -5664,10 +5629,10 @@ RectTransform: - {fileID: 5770691934356163999} m_Father: {fileID: 419689520419077660} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 475, y: 0} + m_SizeDelta: {x: 950, y: 420} m_Pivot: {x: 0.5, y: 1} --- !u!114 &5809466927386934048 MonoBehaviour: @@ -5826,8 +5791,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 24.840027} + m_SizeDelta: {x: 0, y: 1349.64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1835706692899676071 CanvasRenderer: @@ -5850,7 +5815,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} + m_Color: {r: 0.4509804, g: 0.29803923, b: 0.29803923, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6417,10 +6382,10 @@ RectTransform: - {fileID: 5725169687280374793} m_Father: {fileID: 5692821874018682072} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 475, y: -40} + m_SizeDelta: {x: 950, y: 420} m_Pivot: {x: 0.5, y: 1} --- !u!114 &136639542432129108 MonoBehaviour: @@ -6626,140 +6591,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5114369339822383229 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3350342264238783384} - - component: {fileID: 6773605015020846762} - - component: {fileID: 6434978141136580812} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3350342264238783384 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5114369339822383229} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6397110873763373322} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -5.5, y: 6.5} - m_SizeDelta: {x: -11, y: -13} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6773605015020846762 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5114369339822383229} - m_CullTransparentMesh: 1 ---- !u!114 &6434978141136580812 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5114369339822383229} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\u6536\u83B7\u5956\u52B1" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 857b942b171b9494aa6335a348f13084, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 60 - m_fontSizeBase: 60 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5183821994843810211 GameObject: m_ObjectHideFlags: 0 @@ -7823,9 +7654,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6394027410645606284} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -55.5} m_SizeDelta: {x: 449, y: 111} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6247387714315233529 @@ -10114,9 +9945,9 @@ RectTransform: - {fileID: 5983926089127815387} m_Father: {fileID: 6394027410645606284} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -301} m_SizeDelta: {x: 1000, y: 280} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7665413490182459590 @@ -11579,7 +11410,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 5288672762107757947} - {fileID: 7344988030207130250} @@ -11588,14 +11419,12 @@ RectTransform: - {fileID: 3194213931498842859} - {fileID: 1041555979902955363} - {fileID: 5692821874018682072} - - {fileID: 5627026387844594168} - - {fileID: 6397110873763373322} m_Father: {fileID: 6082491743932111837} 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_SizeDelta: {x: 1080, y: 0} + m_AnchoredPosition: {x: 0, y: 150} + m_SizeDelta: {x: 1080, y: 1024} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6504222864831705447 MonoBehaviour: @@ -11604,7 +11433,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8778105067249942215} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} m_Name: @@ -11615,7 +11444,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: 0 + m_Spacing: 50 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -11630,13 +11459,13 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8778105067249942215} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: m_EditorClassIdentifier: m_HorizontalFit: 0 - m_VerticalFit: 2 + m_VerticalFit: 0 --- !u!114 &7173334803090220231 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12193,6 +12022,7 @@ RectTransform: m_Children: - {fileID: 62890737375129533} - {fileID: 6082491743932111837} + - {fileID: 5627026387844594168} m_Father: {fileID: 4877994425569905487} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/Assets/Content/Prefabs/UI/UIPOPGot/UIPOPGot.prefab b/Assets/Content/Prefabs/UI/UIPOPGot/UIPOPGot.prefab index 5ce9a210d..ba14f06a5 100644 --- a/Assets/Content/Prefabs/UI/UIPOPGot/UIPOPGot.prefab +++ b/Assets/Content/Prefabs/UI/UIPOPGot/UIPOPGot.prefab @@ -102,8 +102,8 @@ RectTransform: m_GameObject: {fileID: 206945093960222391} 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_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 3629529456388949976} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -181,6 +181,7 @@ RectTransform: - {fileID: 6415446040652523598} - {fileID: 9221302068524740653} - {fileID: 3927585472209163814} + - {fileID: 3629529456388949976} - {fileID: 779895885088305182} m_Father: {fileID: 6236232753617596728} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -317,12 +318,12 @@ RectTransform: m_Children: - {fileID: 3433986376884543539} - {fileID: 3752869311086775339} - m_Father: {fileID: 779895885088305182} + m_Father: {fileID: 412796129520565422} 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: 800} + m_AnchoredPosition: {x: 0, y: 302} + m_SizeDelta: {x: 0, y: -1120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8931880435357933178 CanvasRenderer: @@ -923,7 +924,7 @@ RectTransform: 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_SizeDelta: {x: 0, y: 1400} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3200143449064856508 CanvasRenderer: @@ -946,7 +947,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} + m_Color: {r: 0.4509804, g: 0.29803923, b: 0.29803923, a: 0.78431374} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -997,13 +998,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4955693343173275615} - - {fileID: 3629529456388949976} - {fileID: 6112202591964001055} m_Father: {fileID: 412796129520565422} 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: -100} + m_AnchoredPosition: {x: 0, y: 200} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3612252297787311093 diff --git a/Assets/Lua/UI/UIBattle/UIBattleRewardView.lua b/Assets/Lua/UI/UIBattle/UIBattleRewardView.lua index f0b1e6eba..f7e97da37 100644 --- a/Assets/Lua/UI/UIBattle/UIBattleRewardView.lua +++ b/Assets/Lua/UI/UIBattle/UIBattleRewardView.lua @@ -46,8 +46,7 @@ function UIBattleRewardView:RemoveEventListener() end function UIBattleRewardView:AddUIEventListener() - self.uiBase:AddButtonEventListener(self.AnyBtn.button,self, self.OnClickClose) - self.uiBase:AddButtonEventListener(self.btnReceive.button, self, self.OnClickClose) + self.uiBase:AddButtonEventListener(self.anyCloseBtn.button,self, self.OnClickClose) end diff --git a/Assets/Lua/UI/UIBattle/UIBattleRewardView_Generate.lua b/Assets/Lua/UI/UIBattle/UIBattleRewardView_Generate.lua index 96d346adc..92170c866 100644 --- a/Assets/Lua/UI/UIBattle/UIBattleRewardView_Generate.lua +++ b/Assets/Lua/UI/UIBattle/UIBattleRewardView_Generate.lua @@ -1,4 +1,4 @@ ----@class UIBattleReward__Generate_btnReceive +---@class UIBattleReward__Generate_anyCloseBtn ---@field public gameObject UnityEngine.GameObject ---@field public button UnityEngine.UI.Button @@ -213,7 +213,7 @@ ---@field private ItemScrollView UIBattleReward__Generate_ItemScrollView ---@field private ItemContent UIBattleReward__Generate_ItemContent ---@field private None UnityEngine.GameObject ----@field private btnReceive UIBattleReward__Generate_btnReceive +---@field private anyCloseBtn UIBattleReward__Generate_anyCloseBtn local UIBattleRewardView = class("UIBattleRewardView", require("UIViewBase")) function UIBattleRewardView:ctor() @@ -955,13 +955,13 @@ end ---@private function UIBattleRewardView:InitGenerate__51(Root, data) --[[ - UIAnimator/Window/BG/BtnReceive + UIAnimator/AnyCloseBtn --]] - local tmp = Root:Find("UIAnimator/Window/BG/BtnReceive").gameObject + local tmp = Root:Find("UIAnimator/AnyCloseBtn").gameObject if tolua.getpeer(tmp) == nil then tolua.setpeer(tmp, {}) end - self.btnReceive = tmp + self.anyCloseBtn = tmp tmp.button = tmp:GetComponent(Enum.TypeInfo.Button) end @@ -1146,10 +1146,10 @@ function UIBattleRewardView:GenerateDestroy() tolua.setpeer(self.None, nil) end self.None = nil - if tolua.getpeer(self.btnReceive) ~= nil then - tolua.setpeer(self.btnReceive, nil) + if tolua.getpeer(self.anyCloseBtn) ~= nil then + tolua.setpeer(self.anyCloseBtn, nil) end - self.btnReceive = nil + self.anyCloseBtn = nil self.transform = nil self.gameObject = nil self.inited = false diff --git a/Assets/Lua/UI/UIPOPGot/UIPOPGotView_Generate.lua b/Assets/Lua/UI/UIPOPGot/UIPOPGotView_Generate.lua index e8a294d23..d9e20a847 100644 --- a/Assets/Lua/UI/UIPOPGot/UIPOPGotView_Generate.lua +++ b/Assets/Lua/UI/UIPOPGot/UIPOPGotView_Generate.lua @@ -3,15 +3,15 @@ ---@field public rectTransform UnityEngine.RectTransform ---@field public layoutElement UnityEngine.UI.LayoutElement +---@class UIPOPGot__Generate_scrollView +---@field public gameObject UnityEngine.GameObject +---@field public loopVerticalScrollRect UnityEngine.UI.LoopVerticalScrollRect + ---@class UIPOPGot__Generate_titleNode ---@field public gameObject UnityEngine.GameObject ---@field public text TMPro.TextMeshProUGUI ---@field public uILocalizeScript UILocalizeScript ----@class UIPOPGot__Generate_scrollView ----@field public gameObject UnityEngine.GameObject ----@field public loopVerticalScrollRect UnityEngine.UI.LoopVerticalScrollRect - ---@class UIPOPGot__Generate_AnyBtn ---@field public gameObject UnityEngine.GameObject ---@field public button UnityEngine.UI.Button @@ -25,8 +25,8 @@ ---@field private transform UnityEngine.Transform ---@field private uIAnimator UIPOPGot__Generate_uIAnimator ---@field private AnyBtn UIPOPGot__Generate_AnyBtn ----@field private scrollView UIPOPGot__Generate_scrollView ---@field private titleNode UIPOPGot__Generate_titleNode +---@field private scrollView UIPOPGot__Generate_scrollView ---@field private iconItem UIPOPGot__Generate_iconItem local UIPOPGotView = class("UIPOPGotView", require("UIViewBase")) @@ -87,6 +87,22 @@ end ---@private function UIPOPGotView:InitGenerate__3(Root, data) +--[[ + UIAnimator/Window/Bg/Title/Image/Text +--]] + local tmp = Root:Find("UIAnimator/Window/Bg/Title/Image/Text").gameObject + if tolua.getpeer(tmp) == nil then + tolua.setpeer(tmp, {}) + end + self.titleNode = tmp + + tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI) + + tmp.uILocalizeScript = tmp:GetComponent(Enum.TypeInfo.UILocalizeScript) +end + +---@private +function UIPOPGotView:InitGenerate__4(Root, data) --[[ UIAnimator/Window/ScrollView --]] @@ -99,22 +115,6 @@ function UIPOPGotView:InitGenerate__3(Root, data) tmp.loopVerticalScrollRect = tmp:GetComponent(Enum.TypeInfo.LoopVerticalScrollRect) end ----@private -function UIPOPGotView:InitGenerate__4(Root, data) ---[[ - UIAnimator/Window/ScrollView/Bg/Title/Image/Text ---]] - local tmp = Root:Find("UIAnimator/Window/ScrollView/Bg/Title/Image/Text").gameObject - if tolua.getpeer(tmp) == nil then - tolua.setpeer(tmp, {}) - end - self.titleNode = tmp - - tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI) - - tmp.uILocalizeScript = tmp:GetComponent(Enum.TypeInfo.UILocalizeScript) -end - ---@private function UIPOPGotView:InitGenerate__5(Root, data) --[[ @@ -142,14 +142,14 @@ function UIPOPGotView:GenerateDestroy() tolua.setpeer(self.AnyBtn, nil) end self.AnyBtn = nil - if tolua.getpeer(self.scrollView) ~= nil then - tolua.setpeer(self.scrollView, nil) - end - self.scrollView = nil if tolua.getpeer(self.titleNode) ~= nil then tolua.setpeer(self.titleNode, nil) end self.titleNode = nil + if tolua.getpeer(self.scrollView) ~= nil then + tolua.setpeer(self.scrollView, nil) + end + self.scrollView = nil if self.iconItem.GenerateDestroy ~= nil then self.iconItem:GenerateDestroy() end