From 88ed7e74bd1763441ee15c488ab2b2341d025d6d Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Wed, 29 Nov 2023 18:28:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E5=AE=9D=E6=98=BE=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Popup/FaLingSingleShowPopup.prefab | 34 +++++++++---------- .../Prefabs/UI/Popup/FaLingStrongPopup.prefab | 2 +- .../Prefabs/UI/Popup/TalismanInfoPopup.prefab | 4 +-- .../Modules/Popup/FaLingSingleShowPopup.lua | 2 +- .../~Lua/Modules/Popup/FaLingStrongPopup.lua | 6 ++-- .../Popup/RewardEquipSingleShowPopup2.lua | 21 +++++++++--- .../~Lua/Modules/Popup/SkillInfoPopup.lua | 2 +- .../~Lua/Modules/Popup/TalismanInfoPopup.lua | 28 ++++++++++----- 8 files changed, 61 insertions(+), 38 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab index 12e877cae8..51918b0aeb 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab @@ -280,7 +280,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6117647, g: 0.36862746, b: 0.054901965, a: 1} + m_Color: {r: 0.92156863, g: 0.87058824, b: 0.78039217, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -5400,7 +5400,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &784908432595703674 RectTransform: m_ObjectHideFlags: 0 @@ -5417,10 +5417,10 @@ RectTransform: m_Father: {fileID: 4714743663163808378} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 434.95, y: -180.22499} - m_SizeDelta: {x: 905, y: 76.15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 434.95, y: 0} + m_SizeDelta: {x: 905, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6217477407285219874 MonoBehaviour: @@ -15914,7 +15914,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6117647, g: 0.36862746, b: 0.054901965, a: 1} + m_Color: {r: 0.92156863, g: 0.87058824, b: 0.78039217, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -20818,9 +20818,9 @@ RectTransform: m_Father: {fileID: 784908432595703674} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 110.84, y: -33.075} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 161.68, y: 66.15} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3799790185227221731 @@ -35840,7 +35840,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.990566, g: 0.9889774, b: 0.98589355, a: 1} + m_Color: {r: 1, g: 0.7607844, b: 0.5019608, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -36046,9 +36046,9 @@ RectTransform: m_Father: {fileID: 784908432595703674} 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: 442.9, y: -76.15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 442.9, y: 0} m_SizeDelta: {x: 825.8, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &8653047631559410116 @@ -62139,8 +62139,8 @@ RectTransform: m_Father: {fileID: 1812259653873324226} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 392.9, y: 0} m_SizeDelta: {x: 725.8, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -62165,7 +62165,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.86666673, b: 0.24705884, a: 1} + m_Color: {r: 0, g: 1, b: 0.4, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingStrongPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingStrongPopup.prefab index f3ca59f8f4..22e2316ed1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingStrongPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingStrongPopup.prefab @@ -45374,7 +45374,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8679245, g: 0.61485827, b: 0.25792095, a: 1} + m_Color: {r: 0.990566, g: 0.9809196, b: 0.9672036, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/TalismanInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/TalismanInfoPopup.prefab index ebcd234140..0dacf8d340 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/TalismanInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/TalismanInfoPopup.prefab @@ -2239,8 +2239,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\t \u653B\u51FB" LanguageIndex: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua index 28f7f3e7b9..4cc1192397 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua @@ -420,7 +420,7 @@ function FaLingSingleShowPopup:OnShow() if skillData.state==1 then info.text = string.format("%s","["..skillData.openLv.."级开启]:"..GetLanguageStrById(skillData.des)) else - info.text = string.format("%s","["..skillData.openLv.."级开启]:"..GetLanguageStrById(skillData.des)) + info.text = string.format("%s","["..skillData.openLv.."级开启]:"..GetLanguageStrById(skillData.des)) end end -- end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua index 896a125b43..1581cbb216 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua @@ -268,7 +268,7 @@ function FaLingStrongPopup:OnShow() if skillData.state==1 then info.text = string.format("%s","["..skillData.openLv.."级开启]:"..GetLanguageStrById(skillData.des)) else - info.text = string.format("%s","["..skillData.openLv.."级开启]:"..GetLanguageStrById(skillData.des)) + info.text = string.format("%s","["..skillData.openLv.."级开启]:"..GetLanguageStrById(skillData.des)) end end -- end @@ -340,7 +340,7 @@ function FaLingStrongPopup:ShowCostInfo() isEnough=false numTxt.text=string.format("%s", cost[i][2] .."/"..bagNum) else - numTxt.text=string.format("%s", cost[i][2].."/"..bagNum) + numTxt.text=string.format("%s", cost[i][2].."/"..bagNum) end self.itemViewList[grid]:OnOpen(false,{id,0}, 0.8, false, false, false, self.sortingOrder) self.itemViewList[grid].gameObject.transform:SetAsFirstSibling() @@ -361,7 +361,7 @@ function FaLingStrongPopup:ShowCostInfo() if coinNum>haveNum then self.coinTxt.text=string.format("%s", coinNum .."/"..haveNum) else - self.coinTxt.text=string.format("%s", coinNum .."/"..haveNum) + self.coinTxt.text=string.format("%s", coinNum .."/"..haveNum) end self.coinImg.sprite=self.spLoader:LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,14).ResourceID)) else diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index fa7f13b0aa..4e01fe5077 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -467,17 +467,21 @@ function RewardEquipSingleShowPopup2:OnShow() if self.curHeroData and (self.openType == 2 or self.openType == 5) then equipSuite = HeroManager.GetCurHeroEquipSuitPros(self.curHeroData.equipIdList) end + --LogError("equipConfigData.Id======"..equipConfigData.Id) local curProSuitConFig = suitConFig[equipConfigData.Star] if suitConFig[equipConfigData.Star] then - self.suitPro:SetActive(true) - if curProSuitConFig then - local suiteValue = curProSuitConFig.SuiteValue + + local suiteValue = curProSuitConFig.SuiteValue + if curProSuitConFig and #suiteValue>0 and tonumber(suiteValue[1][1])~=nil then + self.suitPro:SetActive(true) for i = 1, math.max(#suiteValue, #_suitProList) do if not _suitProList[i] then _suitProList[i] = newObjToParent(self.suitProPre, self.suitProGrid) end _suitProList[i].gameObject:SetActive(true) end + --LogError("suiteValue======================="..#suiteValue) + --PrintTable(suiteValue) for i = 1, #suiteValue do _suitProList[i].gameObject:SetActive(true) local name = Util.GetGameObject(_suitProList[i].transform, "proName"):GetComponent("Text") @@ -486,10 +490,17 @@ function RewardEquipSingleShowPopup2:OnShow() name.text = string.format("%s+ %s",GetLanguageStrById(propertyConfig[equipSuite[i][2][2]].Info),GetPropertyFormatStr(propertyConfig[equipSuite[i][2][2]].Style,equipSuite[i][2][3])) value.text = string.format("(%s)",GetEquipSuitStr2(equipSuite[i][1],equipSuite[i][2][1])) else - name.text = string.format("%s+ %s",GetLanguageStrById(propertyConfig[suiteValue[i][2]].Info),GetPropertyFormatStr(propertyConfig[suiteValue[i][2]].Style,suiteValue[i][3])) - value.text = string.format("(%s)",GetEquipSuitStr2(equipConfigData.Star,suiteValue[i][1])) + --LogError("[suiteValue[i][2]==="..suiteValue[i][2]) + --LogError("suiteValue[i][3]=================="..suiteValue[i][3]) + if suiteValue[i][2] and suiteValue[i][3] then + name.text = string.format("%s+ %s",GetLanguageStrById(propertyConfig[suiteValue[i][2]].Info),GetPropertyFormatStr(propertyConfig[suiteValue[i][2]].Style,suiteValue[i][3])) + value.text = string.format("(%s)",GetEquipSuitStr2(equipConfigData.Star,suiteValue[i][1])) + end + end end + else + self.suitPro:SetActive(false) end else self.suitPro:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua index 554b54de53..bba9559f29 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua @@ -58,7 +58,7 @@ function this:OnOpen(...) local dividend = args[3] and args[3] or 10 local maxLv=1--args[4] local skilltype =args[5] - nextCfg=args[6] + nextCfg=nil --args[6] local soulLv=args[7] local isFaBao = args[8] if openType == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua index 0e10108725..6306579851 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua @@ -101,9 +101,10 @@ function this.Show() local curTalismanConFig= ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",data[2],"Level",curLv) --标题 - this.title.text= string.format( "%s +%s",GetLanguageStrById(itemConfig[data[2]].Name),curLv) + this.title.text= string.format( "",GetLanguageStrById(itemConfig[data[2]].Name),curLv) this.talismanIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(itemConfig[data[2]].ResourceID)) this.power.text = TalismanManager.CalculateWarForceBase(curTalismanConFig,0)--法宝战力 + --显示核心特性(30级解锁) local skillLv= ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",data[2],"Level",30).OpenSkillRules[1] if skillLv then @@ -132,12 +133,13 @@ function this.Show() end local proName=proList[i]:GetComponent("Text") local proImage=Util.GetGameObject(proList[i],"Image"):GetComponent("Image") - + proImage.gameObject:SetActive(false) local skillId=curTalismanConFig.Property[i][1] local curValue=curTalismanConFig.Property[i][2] + --LogError("skillid===================="..skillId) proName.text= " "..GetLanguageStrById(propertyConfig[skillId].Info).."+"..curValue.."" - proImage.sprite=this.spLoader:LoadSprite(artResourcesConfig[propertyConfig[skillId].PropertyIcon].Name) - Util.GetGameObject(proImage.gameObject,"Image"):GetComponent("Image"):SetNativeSize() + --proImage.sprite=this.spLoader:LoadSprite(artResourcesConfig[propertyConfig[skillId].PropertyIcon].Name) + --Util.GetGameObject(proImage.gameObject,"Image"):GetComponent("Image"):SetNativeSize() end --显示法宝天赋 @@ -145,6 +147,7 @@ function this.Show() local dowerAllData={}--当前法宝全部天赋数据(天赋可能为空) dowerAllData= ConfigManager.GetAllConfigsDataByKey(ConfigName.EquipTalismana,"TalismanaId",data[2]) local dowerData={}--当前法宝全部技能数据(天赋不为空) + --LogError("#dowerAllData==================================="..#dowerAllData) for i=1,#dowerAllData do if dowerAllData[i].OpenSkillRules then table.insert( dowerData, dowerAllData[i]) @@ -153,21 +156,30 @@ function this.Show() table.sort(dowerData, function(a,b) return a.Level=dowerData[n].Level then - strTable[n]= string.format( Language[11534], dowerData[n].Level,GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),"\n") + --LogError("dowerData[n].OpenSkillRules[1]]=="..dowerData[n].OpenSkillRules[1]) + if passiveSkillConfig[dowerData[n].OpenSkillRules[1]] then + strTable[n]= string.format( Language[11534], dowerData[n].Level,GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),"\n") + end + else - strTable[n]=string.format( Language[11535],dowerData[n].Level,GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),"\n") + if passiveSkillConfig[dowerData[n].OpenSkillRules[1]] then + strTable[n]=string.format( Language[11535],dowerData[n].Level,GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),"\n") + end end - if dowerData[n].Level==30 or dowerData[n].Level==50 then + strTable[n]=string.gsub(strTable[n],"·","") strTable[n]=Language[11536]..strTable[n] + str=str..strTable[n] end end end - local str=table.concat(strTable)--将表里字符串拼接 + --str=table.concat(strTable)--将表里字符串拼接 --看这下面 是全角空格哦~ this.dowerText.text=string.sub(string.gsub(str," "," "),1,-2)--去除最后\n end