diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab index c8f9c741e8..2ddd74edc3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/FaLingSingleShowPopup.prefab @@ -10835,7 +10835,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.97647065, g: 1, b: 0.76470596, a: 1} + m_Color: {r: 0.9806693, g: 0.9811321, b: 0.9765041, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -62044,7 +62044,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &828772382340725980 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua index 89309fcbf2..fa755d8b2a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua @@ -104,7 +104,7 @@ end function this.SwitchView(index) type=_TabData[index].type --LogError("btnList==========="..#this.btnList.." index=="..index) - + isCan=true curTabIndex=index --ConfigManager.getcon config=ConfigManager.TryGetConfigDataByKey(ConfigName.PotentialNewConfig,"Type",type) @@ -206,7 +206,6 @@ function this:BindEvent() local costNum=0 local costList={} local targetLv=0 - local isMax=true for k=1,#list do local v=list[k] if v.Level>=lv then @@ -222,17 +221,19 @@ function this:BindEvent() if BagManager.GetItemCountById(key) >= costList[key] then targetLv = v.Level else - isMax=false break end end + else + break end end end --是否直接升到最大 - if isMax then + --if isMax==false then targetLv=targetLv+1 - end + --end + LogError("targeylv============"..targetLv.." lv===="..lv) NetManager.PotentialUpLvRequest(dynamicId,type,targetLv-lv,function() PopupTipPanel.ShowTip("升级成功") this.TabCtrl:Init(this.tabBox, _TabData,curTabIndex) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyOpenPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyOpenPopup.lua index aa4394f6a5..f3b3113099 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyOpenPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyOpenPopup.lua @@ -64,7 +64,6 @@ end function HeroPotencyOpenPopup:OnDestroy() - SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idleFunc end return HeroPotencyOpenPopup \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/PotencyManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/PotencyManager.lua index 99ee3e7f2a..8e6968a54f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/PotencyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/PotencyManager.lua @@ -1,7 +1,7 @@ --新的命格管理 PotencyManager = {} local this = PotencyManager -local giftConfig=ConfigManager.GetConfig(ConfigName.PotentialNewConfig) +--local giftConfig=ConfigManager.GetConfig(ConfigName.PotentialNewConfig) local equipConfig=ConfigManager.GetConfig(ConfigName.EquipConfig) function this.Initialize() this.allEquipData={} diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index e21359cea7..14ef28aa05 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -7438,6 +7438,7 @@ function NetManager.BaublesWearRequest(_heroId,_eid,_downId, _func) local data=HeroInfoProto_pb.BaublesWearRequest() data.heroId = _heroId data.baublesId = _eid + local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) LogError("_heroid==================".._heroId.." baublesod======".._eid) local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.BaublesWearRequest,MessageTypeProto_pb.BaublesWearResponse,msg,function(buffer) @@ -7454,6 +7455,14 @@ function NetManager.BaublesWearRequest(_heroId,_eid,_downId, _func) _func() end + HeroPropManager.SetDirtyByType(_heroId,Hero_Prop_Type.Talisman) + --获取新战力 + NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL) + local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) + LogError("oldWarPower=="..oldWarPower.." tempPower=="..tempPower) + if oldWarPower ~= tempPower then + UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower}) + end end) end @@ -7468,9 +7477,10 @@ function NetManager.BaublesStrengthenRequest(_eid,_lv,_list, _func) LogError("cost lsit=====".._list[i]) table.insert(data.costBaubles,_list[i]) end + local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.BaublesStrengthenRequest,MessageTypeProto_pb.BaublesStrengthenResponse,msg,function(buffer) - local data = buffer:DataByte() + --local data = buffer:DataByte() --msg:ParseFromString(data) if _list and #_list>0 then for i=1,#_list do @@ -7483,6 +7493,14 @@ function NetManager.BaublesStrengthenRequest(_eid,_lv,_list, _func) if _func then _func() end + HeroPropManager.SetDirtyByType(data.belongHero,Hero_Prop_Type.Talisman) + --获取新战力 + NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL) + local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) + LogError("oldWarPower=="..oldWarPower.." tempPower=="..tempPower) + if oldWarPower ~= tempPower then + UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower}) + end end) end @@ -7491,15 +7509,23 @@ function NetManager.BaublesBlessRequest(_eid,_bid,_func) local data=HeroInfoProto_pb.BaublesBlessRequest() data.baublesId = _eid data.blessBaublesId = _bid - + local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.BaublesBlessRequest,MessageTypeProto_pb.BaublesBlessResponse,msg,function(buffer) - local data = buffer:DataByte() + --local data = buffer:DataByte() FaLingManager.SetEquipBlessEquip(_eid,_bid) if _func then _func() end - + local equip=FaLingManager.GetEquipDataByDid(_eid) + HeroPropManager.SetDirtyByType(equip.belongHero,Hero_Prop_Type.Talisman) + --获取新战力 + NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL) + local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) + LogError("oldWarPower=="..oldWarPower.." tempPower=="..tempPower) + if oldWarPower ~= tempPower then + UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower}) + end end) end --法灵卸下庇佑 @@ -7510,6 +7536,7 @@ function NetManager.BaublesDownBlessRequest(_eid,_list,_func) LogError("cost lsit=====".._list[i]) table.insert(data.blessBaubles,_list[i]) end + local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.BaublesDownBlessRequest,MessageTypeProto_pb.BaublesDownBlessResponse,msg,function(buffer) local data = buffer:DataByte() @@ -7521,7 +7548,15 @@ function NetManager.BaublesDownBlessRequest(_eid,_list,_func) if _func then _func() end - + local equip=FaLingManager.GetEquipDataByDid(_eid) + HeroPropManager.SetDirtyByType(equip.belongHero,Hero_Prop_Type.Talisman) + --获取新战力 + NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL) + local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) + LogError("oldWarPower=="..oldWarPower.." tempPower=="..tempPower) + if oldWarPower ~= tempPower then + UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower}) + end end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua index 7de4118c4b..01590edad0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingSingleShowPopup.lua @@ -91,7 +91,7 @@ function FaLingSingleShowPopup:BindEvent() end) Util.AddClick(self.btnStrong, function() - UIManager.OpenPanel(UIName.FaLingStrongPopup,self.equipData) + UIManager.OpenPanel(UIName.FaLingStrongPopup,self.equipData,self) end) Util.AddClick(self.btnAdd, function() NetManager.BaublesWearRequest(self.curHeroData.dynamicId,self.equipData.did,nil,function() @@ -203,8 +203,8 @@ function FaLingSingleShowPopup:OnShow() local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig,self.equipData.staticId) local aaa=equipConfigData.Quantity self.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("Bg_hz_beibao_pinjise_0"..aaa) - self.equipQuaText.text=GetStringByEquipQua(equipConfigData.Quantity,GetQuaStringByEquipQua(equipConfigData.Quantity)) - self.eqiopName.text=GetStringByEquipQua(equipConfigData.Quantity,GetLanguageStrById(equipConfigData.Name)) + self.equipQuaText.text= GetQuaStringByEquipQua(equipConfigData.Quantity) --GetStringByEquipQua(equipConfigData.Quantity,GetQuaStringByEquipQua(equipConfigData.Quantity)) + self.eqiopName.text= equipConfigData.Name --GetStringByEquipQua(equipConfigData.Quantity,GetLanguageStrById(equipConfigData.Name)) self.c_ui_qinyan_duan:SetActive(equipConfigData.Quantity==8) self.UI_effect_WuCai_Kuang:SetActive(equipConfigData.Quantity==7) self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(equipConfigData.Quantity)) @@ -278,7 +278,7 @@ function FaLingSingleShowPopup:OnShow() end) end local args={} - args[1]="是否卸下当前护佑法灵?" + args[1]="是否卸下当前护佑法宝?" args[2]="卸下" args[3]="取消" args[4]=sureFunc @@ -371,6 +371,7 @@ function FaLingSingleShowPopup:OnShow() local lvList=ConfigManager.TryGetAllConfigsDataByKey(ConfigName.EquipTalismana,"TalismanaId",self.equipData.staticId) local skillList={} + local curStar=0 for i=1,#lvList do if lvList[i].ShowSkill and #lvList[i].ShowSkill>0 and tonumber(lvList[i].ShowSkill[1])~=nil then LogError("lvList[i].id======"..lvList[i].ShowSkill[3]) @@ -378,6 +379,7 @@ function FaLingSingleShowPopup:OnShow() skillData.id=lvList[i].ShowSkill[3] skillData.state=0 skillData.des=passiveSkillConfig[skillData.id].Desc + skillData.openLv =lvList[i].Level local type=lvList[i].ShowSkill[1] if type==0 then if lv>=lvList[i].Level then @@ -416,9 +418,9 @@ function FaLingSingleShowPopup:OnShow() local info = go:GetComponent("Text") local skillData=goldSuiteSkill[i] if skillData.state==1 then - info.text = string.format("%s",i.."星天赋:"..GetLanguageStrById(skillData.des)) + info.text = string.format("%s","["..skillData.openLv.."级开启]:"..GetLanguageStrById(skillData.des)) else - info.text = string.format("%s",i.."星天赋:"..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 c0fe6a4126..896a125b43 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/FaLingStrongPopup.lua @@ -109,15 +109,16 @@ function FaLingStrongPopup:OnSortingOrderChange() SetParticleSortLayer(self.c_ui_qinyan_duan,self.sortingOrder + 1) SetParticleSortLayer(self.UI_effect_WuCai_Kuang,self.sortingOrder + 1) end - +local openPanel=nil --界面打开时调用(用于子类重写) -function FaLingStrongPopup:OnOpen(_equipData,_func) +function FaLingStrongPopup:OnOpen(_equipData,_openPanel) if not _equipData then return end --父界面 + openPanel=_openPanel self.equipData = _equipData --当前装备数据 --0不显示按钮、1背包、2已穿戴(显示卸下)、3未穿戴(显示穿戴)、4未穿戴(显示替换)、5自己或其他人穿戴(非装备界面但需要显示套装属性) - self.func = _func + --self.func = _func end function FaLingStrongPopup:ChangeSelectMat(_list) @@ -225,6 +226,7 @@ function FaLingStrongPopup:OnShow() skillData.id=lvList[i].ShowSkill[3] skillData.state=0 skillData.des=passiveSkillConfig[skillData.id].Desc + skillData.openLv =lvList[i].Level local type=lvList[i].ShowSkill[1] if type==0 then if lv>=lvList[i].Level then @@ -262,10 +264,11 @@ function FaLingStrongPopup:OnShow() local info = go:GetComponent("Text") local skillData=goldSuiteSkill[i] + if skillData.state==1 then - info.text = string.format("%s",i.."星天赋:"..GetLanguageStrById(skillData.des)) + info.text = string.format("%s","["..skillData.openLv.."级开启]:"..GetLanguageStrById(skillData.des)) else - info.text = string.format("%s",i.."星天赋:"..GetLanguageStrById(skillData.des)) + info.text = string.format("%s","["..skillData.openLv.."级开启]:"..GetLanguageStrById(skillData.des)) end end -- end @@ -337,9 +340,9 @@ 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, sortingOrder) + self.itemViewList[grid]:OnOpen(false,{id,0}, 0.8, false, false, false, self.sortingOrder) self.itemViewList[grid].gameObject.transform:SetAsFirstSibling() Util.AddOnceClick(btn,function () LogError("id========================="..id) @@ -374,7 +377,9 @@ end --界面关闭时调用(用于子类重写) function FaLingStrongPopup:OnClose() - + if openPanel then + openPanel:OnShow() + end end --界面销毁时调用(用于子类重写)