diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index bcfed2951a..485eeeb380 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -23088,7 +23088,6 @@ GameObject: - component: {fileID: 3443075799931294300} - component: {fileID: 1221536551871023808} - component: {fileID: 8309594229264372520} - - component: {fileID: 5087427704777140632} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -23112,8 +23111,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: -30.88, y: -359.5} - m_SizeDelta: {x: 547.84, y: 77.3} + m_AnchoredPosition: {x: 4.899994, y: -366.7} + m_SizeDelta: {x: 554, y: 91.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1221536551871023808 CanvasRenderer: @@ -23150,26 +23149,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u89E3\u9501\u9AD8\u9636\u6218\u4EE4\uFF0C\u6FC0\u6D3B\u8FDB\u9636\u4E13\u5C5E\u5956\u52B1+\u76F4\u534715\u7EA7\u89E3\u9501\u7ACB\u83B7\u9650\u5B9A\u79F0\u53F7+\u9650\u5B9A\u6C14\u6CE1" ---- !u!114 &5087427704777140632 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7204302889340665110} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} - m_Name: - m_EditorClassIdentifier: - _textSpacing: 1.03 --- !u!1 &7211960488100845142 GameObject: m_ObjectHideFlags: 0 @@ -25414,7 +25400,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.58431375, g: 0.32156864, b: 0.23137257, a: 1} + m_Color: {r: 0.797, g: 0.2621656, b: 0.14210075, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index d3393a0674..ab862bc313 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2364,8 +2364,8 @@ [12363] = "即可激活30天月卡", [12364] = "是否消耗%s%s购买一次挑战次数?", [12365] = "天宫秘宝", - [12366] = "解锁秘宝,可以领取额外专属奖励,并直接获得200积分", - [12367] = "解锁高阶战令,激活进阶专属奖励+直升15级", + [12366] = "解锁秘宝,可以领取额外专属奖励,并直接获得200积分,可获取1980妖晶,邮件领取", + [12367] = "解锁高阶战令,激活进阶专属奖励+直升15级,可获取1980妖晶,邮件领取", [12368] = "等级购买成功", [12369] = "购买%s级,升至%s级", [12370] = "升至%s级,可立即解锁%s件奖励", diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureResonancePanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureResonancePanel.lua index 44d77fbfd2..e983a626db 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureResonancePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureResonancePanel.lua @@ -73,6 +73,7 @@ end function this.OnShowData() --获取穿戴宝物强化/精炼的最小等级 local minLv--最小等级 + local maxlv --最大等级 for i = 1, #curHeroData.jewels do local curEquipTreasureData = EquipTreasureManager.GetSingleEquipTreasreData(curHeroData.jewels[i]) if curTabIndex == 1 then @@ -83,6 +84,13 @@ function this.OnShowData() else minLv = curEquipTreasureData.lv end + if maxlv then + if curEquipTreasureData.maxLv < maxlv then + maxlv = curEquipTreasureData.maxLv + end + else + maxlv = curEquipTreasureData.maxLv + end this.hintInfo.text=Language[11799] elseif curTabIndex == 2 then if minLv then @@ -92,10 +100,18 @@ function this.OnShowData() else minLv = curEquipTreasureData.refineLv end + if maxlv then + if curEquipTreasureData.maxRefineLv < maxlv then + maxlv = curEquipTreasureData.maxRefineLv + end + else + maxlv = curEquipTreasureData.maxRefineLv + end this.hintInfo.text=Language[11800] end end LogBlue("minLv:"..minLv) + LogBlue("maxlv:"..maxlv) curJewelResonanceConfig = nil nextJewelResonanceConfig = nil local allCurTypeJewelResonanceConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.JewelResonanceConfig,"Type",curTabIndex) @@ -115,7 +131,7 @@ function this.OnShowData() end end --获取下一级强化/精炼 大师等级数据 - if allCurTypeJewelResonanceConfig[i].Level > minLv then + if allCurTypeJewelResonanceConfig[i].Level > minLv and allCurTypeJewelResonanceConfig[i].Level <= maxlv then if curJewelResonanceConfig then if nextJewelResonanceConfig==nil then if allCurTypeJewelResonanceConfig[i].SortId == curJewelResonanceConfig.SortId+1 then @@ -152,9 +168,15 @@ function this.OnShowSingleEquipTreasure(go,equipTreasureDid) Util.GetGameObject(go.transform,"progress"):GetComponent("Text").text = curEquipTreasureData.lv.."/"..nextJewelResonanceConfig.Level Util.GetGameObject(go.transform,"equip/proBar"):GetComponent("Image").fillAmount = curEquipTreasureData.lv/nextJewelResonanceConfig.Level else - Util.GetGameObject(go.transform,"progress"):GetComponent("Text").text = Language[11802] - Util.GetGameObject(go.transform,"btn/Text"):GetComponent("Text").text = Language[11089] - Util.GetGameObject(go.transform,"equip/proBar"):GetComponent("Image").fillAmount =1 + if curEquipTreasureData.lv >= curEquipTreasureData.maxLv then + Util.GetGameObject(go.transform,"progress"):GetComponent("Text").text = Language[11802] + Util.GetGameObject(go.transform,"btn/Text"):GetComponent("Text").text = Language[11089] + Util.GetGameObject(go.transform,"equip/proBar"):GetComponent("Image").fillAmount =1 + else + Util.GetGameObject(go.transform,"btn/Text"):GetComponent("Text").text = Language[11801] + Util.GetGameObject(go.transform,"progress"):GetComponent("Text").text = curEquipTreasureData.lv.."/"..curJewelResonanceConfig.Level + Util.GetGameObject(go.transform,"equip/proBar"):GetComponent("Image").fillAmount = curEquipTreasureData.lv/curJewelResonanceConfig.Level + end end --点击强化按钮 @@ -175,8 +197,14 @@ function this.OnShowSingleEquipTreasure(go,equipTreasureDid) Util.GetGameObject(go.transform,"progress"):GetComponent("Text").text = curEquipTreasureData.refineLv.."/"..nextJewelResonanceConfig.Level Util.GetGameObject(go.transform,"equip/proBar"):GetComponent("Image").fillAmount = curEquipTreasureData.refineLv/nextJewelResonanceConfig.Level else + if curEquipTreasureData.refineLv>=curEquipTreasureData.maxRefineLv then Util.GetGameObject(go.transform,"progress"):GetComponent("Text").text = Language[11802] Util.GetGameObject(go.transform,"btn/Text"):GetComponent("Text").text = Language[11089] + else + Util.GetGameObject(go.transform,"btn/Text"):GetComponent("Text").text = Language[11804] + Util.GetGameObject(go.transform,"progress"):GetComponent("Text").text = curEquipTreasureData.refineLv.."/"..curJewelResonanceConfig.Level + Util.GetGameObject(go.transform,"equip/proBar"):GetComponent("Image").fillAmount = curEquipTreasureData.refineLv/curJewelResonanceConfig.Level + end end --点击精炼按钮 Util.AddOnceClick(Util.GetGameObject(go.transform,"btn"), function()