From d5cf1c53959efac16aa5af2bb2813f985b92d28d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 26 Oct 2021 17:55:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E5=BD=92=E5=85=83=E3=80=81=E6=8A=80=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/GeneralPopup.prefab | 98 +++++++++++++++++-- .../Prefabs/UI/Popup/SkillInfoPopup.prefab | 6 +- .../Popup/View/GeneralPopup_ResolveRecall.lua | 7 +- 3 files changed, 95 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 726b4a6b89..12ae4d349d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -36,8 +36,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 821.5, y: 141.08} + m_AnchoredPosition: {x: 110, y: -40} + m_SizeDelta: {x: 610, y: 141.08} m_Pivot: {x: 0, y: 1} --- !u!222 &2225956 CanvasRenderer: @@ -203,7 +203,7 @@ RectTransform: - {fileID: 8785181975461239140} - {fileID: 836304210998669291} m_Father: {fileID: 8315664656186209665} - 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} @@ -340,7 +340,7 @@ RectTransform: m_Children: - {fileID: 2225953} m_Father: {fileID: 8315664656186209665} - 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} @@ -673,17 +673,17 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 36 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 50 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 1.5 m_Text: --- !u!1 &487726974 GameObject: @@ -792,7 +792,7 @@ RectTransform: m_Children: - {fileID: 105217687} m_Father: {fileID: 8315664656186209665} - 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} @@ -1013,7 +1013,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.000056896224, y: 0} + m_AnchoredPosition: {x: -0.0000013375753, y: 0} m_SizeDelta: {x: 0, y: 141.1} m_Pivot: {x: 0, y: 1} --- !u!114 &659946817 @@ -21313,6 +21313,85 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u82F1\u96C4\u4E94\u4E2A\u5B57" LanguageIndex: 11520 +--- !u!1 &3816454599248552653 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2739633927642626448} + - component: {fileID: 4459360218703565509} + - component: {fileID: 1030182022087064311} + m_Layer: 5 + m_Name: BodyText (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2739633927642626448 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3816454599248552653} + 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: 8315664656186209665} + 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: -275, y: 40} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4459360218703565509 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3816454599248552653} + m_CullTransparentMesh: 0 +--- !u!114 &1030182022087064311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3816454599248552653} + 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.92549026, g: 0.8588236, b: 0.74509805, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5F52\u5143\u540E\u83B7\u5F97\uFF1A" --- !u!1 &3824595028836445608 GameObject: m_ObjectHideFlags: 0 @@ -48852,6 +48931,7 @@ RectTransform: m_Children: - {fileID: 147624193} - {fileID: 431991881} + - {fileID: 2739633927642626448} - {fileID: 615065670} - {fileID: 123376724} - {fileID: 134824311} diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab index 77e2f0da20..1131a09ab5 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab @@ -425,7 +425,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 350, y: 0} - m_SizeDelta: {x: 466.6, y: 0} + m_SizeDelta: {x: 400, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7773822478194374651 CanvasRenderer: @@ -602,7 +602,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 466.6, y: 0} + m_SizeDelta: {x: 400, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &7774014260785595563 CanvasRenderer: @@ -684,7 +684,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: 59.5, y: -140} + m_AnchoredPosition: {x: 80, y: -100} m_SizeDelta: {x: 90.28, y: 90.28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7773945753414332579 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua index c41a08a520..b88e0baa6b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua @@ -71,7 +71,6 @@ function this:RemoveListener() end function this:OnShow(_parent,...) - LogBlue("sssssssssssssssssssssssssssss") parent=_parent sortingOrder =_parent.sortingOrder local args = {...} @@ -82,7 +81,7 @@ function this:OnShow(_parent,...) this.titleText.text=Language[11609] --返还比 local num=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,34).Value)/100 - this.bodyText.text = Language[11610]--string.format(Language[11610], num, "%") + this.bodyText.text = string.format("归元神将会返还所有的升级材料,神将重置为1级,\n 此操作不可逆,是否确认归元?") local _data={} for i=1,#dropList do @@ -117,7 +116,7 @@ function this:OnShow(_parent,...) end local heroReturnConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroReturn,"HeroId",curHeroData.id,"Star",pId) if not heroReturnConfig then - LogRed("HeroId"..curHeroData.id.." Star"..pId.." curHeroData.breakId"..curHeroData.breakId) + -- LogRed("HeroId"..curHeroData.id.." Star"..pId.." curHeroData.breakId"..curHeroData.breakId) heroUseCount= 50 heroUseItemId = 16 else @@ -125,7 +124,7 @@ function this:OnShow(_parent,...) heroUseItemId = heroReturnConfig.ReturnConsume[1][1] end itemNum = BagManager.GetItemCountById(heroUseItemId) - LogBlue("heroUseItemId "..heroUseItemId.." itemNum "..itemNum.." heroUseCount "..heroUseCount) +-- LogBlue("heroUseItemId "..heroUseItemId.." itemNum "..itemNum.." heroUseCount "..heroUseCount) if itemNum >= heroUseCount then this.itemImageText.text = string.format("×%s", heroUseCount) else