From 5dc0ea68ab74e5e214ae1f69d38fa013bed60f08 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 27 May 2021 15:35:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E5=89=AF=E6=9C=AC=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralBigPopup.prefab | 2 +- .../Prefabs/UI/Map/MapPanel.prefab | 75 ++++++++++++- .../Prefabs/UI/Popup/GeneralPopup.prefab | 8 +- .../~Lua/Modules/Map/View/EndLessMapView.lua | 104 +++++++++--------- .../Popup/View/GeneralPopup_EndlessPanel.lua | 2 +- .../Popup/View/GeneralPopup_Onhook.lua | 2 + 6 files changed, 134 insertions(+), 59 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index e52bf11ef6..fd8ac6d462 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -4617,7 +4617,7 @@ MonoBehaviour: m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_ChildControlHeight: 1 --- !u!1 &4338448511454091231 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab index 138f7a2f48..c93870642c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab @@ -1219,6 +1219,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 224017108475201074} + - component: {fileID: 1256568015606124665} + - component: {fileID: 7853770805229176358} + - component: {fileID: 2426259688454935488} m_Layer: 5 m_Name: TargetRoot m_TagString: Untagged @@ -1246,6 +1249,76 @@ RectTransform: m_AnchoredPosition: {x: 722, y: -1554} m_SizeDelta: {x: 534.92, y: 123} m_Pivot: {x: 0.52412736, y: 1.0000001} +--- !u!114 &1256568015606124665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232877084716578} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!222 &7853770805229176358 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232877084716578} + m_CullTransparentMesh: 0 +--- !u!114 &2426259688454935488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232877084716578} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 --- !u!1 &1248917441218548 GameObject: m_ObjectHideFlags: 0 @@ -28007,7 +28080,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 176, y: 176} + m_SizeDelta: {x: 127, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2746532898759778030 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 38df9c6988..dffdde9686 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -3052,9 +3052,9 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 1 + m_ChildAlignment: 4 m_Spacing: 0 - m_ChildForceExpandWidth: 1 + m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 @@ -16739,7 +16739,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u8DF3\u8FC7\u602A\u7269\u6218\u6597" + m_Text: "\u8DF3\u8FC7\u5C0F\u602A\u6218\u6597" LanguageIndex: 11267 --- !u!1 &3964356147264308643 GameObject: @@ -33696,7 +33696,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u4F7F \u7528" + m_Text: "\u786E \u5B9A" LanguageIndex: 11274 --- !u!1 &8377558704106998417 GameObject: diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index c5ff614264..0ae6fe7e47 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -436,58 +436,58 @@ function EndLessMapView:SetShiQiValue() this.shiQiLv.text = lv.."级" this.shiQifillAmount.fillAmount = (endlessMorale[id].Exp and endlessMorale[id].Exp[2] > 0) and itemCount/endlessMorale[id].Exp[2] or 1 - if isShow then - --士气等级提升 - isShow = false - local data = {} - data.title = "r_wujin_shiqitishengzi" --士气等级提升图片 - data.itemList = {} - data.type = 2 - local s = function(curId) - LogGreen("curId:"..curId) - local proPs = {} - for k,v in ConfigPairs(endlessMorale) do - if v.Id <= curId then - if v.Props then - for i = 1 ,#v.Props do - if not proPs[v.Props[i][1]] then - proPs[v.Props[i][1]] = 0 - end - proPs[v.Props[i][1]] = proPs[v.Props[i][1]] + v.Props[i][2] - end - end - end - end - return proPs - end - local upPro = s(id) - for k,v in pairs(upPro) do - LogGreen("k:"..k.." v:"..v) - end - for i = 1, #cursinglePro.Props do - if not upPro[cursinglePro.Props[i][1]] then - upPro[cursinglePro.Props[i][1]] = 0 - upPro[cursinglePro.Props[i][1]] = upPro[cursinglePro.Props[i][1]] + cursinglePro.Props[i][2] - end - local singleItem = {} - singleItem.icon = nil - singleItem.proName = string.format("全体神将%s",PropertyConfig[cursinglePro.Props[i][1]].Info) - LogGreen("k:"..cursinglePro.Props[i][1].." v:"..cursinglePro.Props[i][2]) - singleItem.proValue = GetEquipPropertyFormatStr(upPro[cursinglePro.Props[i][1]] - cursinglePro.Props[i][2],PropertyConfig[cursinglePro.Props[i][1]].Style) - singleItem.proValue1 = ""..GetEquipPropertyFormatStr(upPro[cursinglePro.Props[i][1]],PropertyConfig[cursinglePro.Props[i][1]].Style).."" - table.insert(data.itemList,singleItem) - end - if cursinglePro.Skill and cursinglePro.Skill > 0 then - local config = ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig,cursinglePro.Skill) - local singleItem = {} - singleItem.icon = nil - singleItem.proName = config.Desc - singleItem.proValue = nil - singleItem.proValue1 = nil - table.insert(data.itemList,singleItem) - end - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.Onhook,data) - end + -- if isShow then + -- --士气等级提升 + -- isShow = false + -- local data = {} + -- data.title = "r_wujin_shiqitishengzi" --士气等级提升图片 + -- data.itemList = {} + -- data.type = 2 + -- local s = function(curId) + -- LogGreen("curId:"..curId) + -- local proPs = {} + -- for k,v in ConfigPairs(endlessMorale) do + -- if v.Id <= curId then + -- if v.Props then + -- for i = 1 ,#v.Props do + -- if not proPs[v.Props[i][1]] then + -- proPs[v.Props[i][1]] = 0 + -- end + -- proPs[v.Props[i][1]] = proPs[v.Props[i][1]] + v.Props[i][2] + -- end + -- end + -- end + -- end + -- return proPs + -- end + -- local upPro = s(id) + -- for k,v in pairs(upPro) do + -- LogGreen("k:"..k.." v:"..v) + -- end + -- for i = 1, #cursinglePro.Props do + -- if not upPro[cursinglePro.Props[i][1]] then + -- upPro[cursinglePro.Props[i][1]] = 0 + -- upPro[cursinglePro.Props[i][1]] = upPro[cursinglePro.Props[i][1]] + cursinglePro.Props[i][2] + -- end + -- local singleItem = {} + -- singleItem.icon = nil + -- singleItem.proName = string.format("全体神将%s",PropertyConfig[cursinglePro.Props[i][1]].Info) + -- LogGreen("k:"..cursinglePro.Props[i][1].." v:"..cursinglePro.Props[i][2]) + -- singleItem.proValue = GetEquipPropertyFormatStr(upPro[cursinglePro.Props[i][1]] - cursinglePro.Props[i][2],PropertyConfig[cursinglePro.Props[i][1]].Style) + -- singleItem.proValue1 = ""..GetEquipPropertyFormatStr(upPro[cursinglePro.Props[i][1]],PropertyConfig[cursinglePro.Props[i][1]].Style).."" + -- table.insert(data.itemList,singleItem) + -- end + -- if cursinglePro.Skill and cursinglePro.Skill > 0 then + -- local config = ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig,cursinglePro.Skill) + -- local singleItem = {} + -- singleItem.icon = nil + -- singleItem.proName = config.Desc + -- singleItem.proValue = nil + -- singleItem.proValue1 = nil + -- table.insert(data.itemList,singleItem) + -- end + -- UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.Onhook,data) + -- end end function EndLessMapView:InitCompShow(carbonType) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EndlessPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EndlessPanel.lua index 79e85940d3..5a4a14abf9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EndlessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EndlessPanel.lua @@ -41,7 +41,7 @@ end function this:OnShow(_parent,...) parent=_parent sortingOrder = _parent.sortingOrder - this.rootText.text = "无尽秘宝中的怪物阵容搭配丰富,跳过战斗会降低游戏乐趣" + this.rootText.text = "无尽副本中的怪物阵容搭配丰富,跳过战斗会降低游戏乐趣" this.click = 0 if PlayerPrefs.HasKey(PlayerManager.uid.."GeneralPopup_EndlessSettingBtn") then local t = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_EndlessSettingBtn") diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua index 6e1b1b3397..453e5d3546 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua @@ -14,6 +14,7 @@ function this:InitComponent(gameObject) this.backBtn=Util.GetGameObject(gameObject,"bg/backBtn") this.Root=Util.GetGameObject(gameObject,"Root") this.proPre=Util.GetGameObject(gameObject,"proPre") + this.shengxingIma=Util.GetGameObject(gameObject,"bg/shengxing"):GetComponent("Image") itemList = {} end @@ -37,6 +38,7 @@ function this:OnShow(_parent,...) local _args = {...} local data = _args[1] fun = _args[2] + this.shengxingIma = Util.LoadSprite(data.title) --itemList if data then for i = 1, math.max(#itemList, #data.itemList) do