diff --git a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsUpStarSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsUpStarSuccessPanel.lua index 9b5fbfe018..11f844dc1b 100644 --- a/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsUpStarSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonPartsUpStarSuccessPanel.lua @@ -174,7 +174,7 @@ function DemonPartsUpStarSuccessPanel:GetPropFormatStr(propId, heroInfo, extraVa if propConfig.TargetPropertyId ~= 0 then propId = propConfig.TargetPropertyId end - local allAddProVal = HeroManager.CalculateHeroAllProValList(1, heroInfo.dynamicId, false) + local allAddProVal = HeroPropManager.GetHeroProp(heroInfo.dynamicId) local result --if extraValue then -- if propConfig.Style == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua index 4216a6e0e9..73c87509c4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua @@ -115,8 +115,8 @@ function FormationEditPopup:BindEvent() heros = HeroManager.GetHeroDataByProperty(proId, _LimitLevel) end table.sort(heros,function(a,b) - local aWarPower = HeroManager.CalculateHeroAllProValList(1,a.dynamicId,false)[HeroProType.WarPower] - local bWarPower = HeroManager.CalculateHeroAllProValList(1,b.dynamicId,false)[HeroProType.WarPower] + local aWarPower = HeroPowerManager.GetHeroPower(a.dynamicId) + local bWarPower = HeroPowerManager.GetHeroPower(b.dynamicId) if aWarPower==bWarPower then return a.id>b.id else diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index 2c599c1f10..87612ded33 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -220,10 +220,7 @@ function this.GetFormationPower(formationId) for i = 1, 6 do if formationList.teamHeroInfos[i] then local heroData = HeroManager.GetSingleHeroData(formationList.teamHeroInfos[i].heroId) - --1, curHeroData.dynamicId, false,nil,nil,true,allHeroTeamAddProVal) - local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(formationList.teamHeroInfos,formationList.teamHeroInfos[i].heroId) - local allEquipAddProVal = HeroManager.CalculateHeroAllProValList(1, heroData.dynamicId,false,nil,nil,true,allHeroTeamAddProVal) - power = power + allEquipAddProVal[HeroProType.WarPower] + power = power + HeroPowerManager.GetHeroPower(heroData.dynamicId, formationId) end end LogRed("原方式战斗力:"..power) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanel.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanel.lua index 86d749d088..110e192cfc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanel.lua @@ -396,7 +396,7 @@ function this.RefreshFormation(isCome) heroListGo[i]:OnOpen(heroId, true, false) end heroListGo[i].gameObject:SetActive(true) - this.CalculateAllHeroPower(heroData,allHeroTeamAddProVal) + this.CalculateAllHeroPower(heroData, allHeroTeamAddProVal) -- ==================================================================== else heroListGo[i].gameObject:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua index 7594166abd..c21a258baf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua @@ -262,7 +262,7 @@ function GuildMainCityPanel:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.GuildFight.AttackStageDefendDataUpdate, this.RefreshGetStar) Game.GlobalEvent:RemoveEvent(GameEvent.GuildRedPacket.OnCloseRedPointClick, this.CloseRedPointClick) Game.GlobalEvent:RemoveEvent(GameEvent.Guild.RefreshDeathPosStatus, this.RefreshDeathPos) - Game.GlobalEvent:AddEvent(GameEvent.Player.OnChangeName, this.FreshPlayerInfo) + Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnChangeName, this.FreshPlayerInfo) end --界面打开时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index e0558f1c4b..e4097c40d1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -159,7 +159,7 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook) if isFindHandBook then --图鉴 PlayerManager.SetHeroHandBookListData(heroData.id, heroData.star) end - heroData.warPower = 0--this.CalculateHeroAllProValList(1, heroData.dynamicId, false)[HeroProType.WarPower] + heroData.warPower = HeroPowerManager.GetHeroPower(heroData.dynamicId) --远征初始化血量 --ExpeditionManager.InitHeroHpValue(heroData) end @@ -464,7 +464,7 @@ end --对比战力并更新战力值 function this.CompareWarPower(heroDId) local oldWarPowerValue = heroDatas[heroDId].warPower - local newWarPowerValue = this.CalculateHeroAllProValList(1, heroDId, false)[HeroProType.WarPower] + local newWarPowerValue = HeroPowerManager.GetHeroPower(heroDId) heroDatas[heroDId].warPower = newWarPowerValue if oldWarPowerValue and newWarPowerValue then if oldWarPowerValue ~= newWarPowerValue then @@ -786,7 +786,7 @@ function this.GetCurHeroStarLvEnd(getValType, curHeroData, _breakId, _upStarId) end function this.UpdateHeroPower() for _, v in pairs(heroDatas) do - v.warPower = this.CalculateHeroAllProValList(1, v.dynamicId, false)[HeroProType.WarPower] + v.warPower = HeroPowerManager.GetHeroPower(v.dynamicId) end end --获取同一类型的技能 @@ -1615,13 +1615,13 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt --编队光环加成 local teamAddPro = FormationManager.GetCurFormationElementAddByType(FormationTypeDef.FORMATION_NORMAL, curHeroData.dynamicId) - --if teamAddPro and LengthOfTable(teamAddPro) > 0 then - -- for i, v in pairs(teamAddPro) do - -- if v > 0 then - -- LogError("编队光环加成 "..i.." "..v) - -- end - -- end - --end + if teamAddPro and LengthOfTable(teamAddPro) > 0 then + for i, v in pairs(teamAddPro) do + if v > 0 then + LogError("编队光环加成 "..i.." "..v) + end + end + end -- Vip加成 local vipAddPro = VipManager.GetAddPro() --if vipAddPro and LengthOfTable(vipAddPro) > 0 then @@ -1659,7 +1659,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt -- end --4公式特殊(减乘)所有属性加成 this.DoubleTableCompound(specialProVal, falismanSpecialProVal) - this.DoubleTableCompound(specialProVal,specialSoulPrintProVal) + this.DoubleTableCompound(specialProVal, specialSoulPrintProVal) this.DoubleTableCompound(specialProVal, heroSkillSpecialProVal) --100等级所有属性合并 local forNum = curLvNum - 100 @@ -1786,7 +1786,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt -- LogError("最后allAddProVal 3 "..i.." "..v) -- end --end - + LogGreenTable(allAddProVal) LogRed("原方式:"..allAddProVal[HeroProType.WarPower]) local power = HeroPowerManager.GetHeroPower(_heroDid, _allHeroProVal and FormationTypeDef.FORMATION_NORMAL or nil) LogRed("新方式:"..power) @@ -1883,7 +1883,7 @@ end -- >火系伤害加成系数(%)>火系伤害减免系数(%)>冰系伤害加成系数(%)>冰系伤害减免系数(%)>雷系伤害加成系数(%)>雷系伤害减免系数(%)>风系伤害加成系数(%) -- >风系伤害减免系数(%)>地系伤害加成系数(%)>地系伤害减免系数(%)>暗系伤害加成系数(%)>暗系伤害减免系数(%) function this.CalculateWarAllProVal(heroDid) - local allEquipAddProVal = HeroManager.CalculateHeroAllProValList(1, heroDid, true) + local allEquipAddProVal = HeroPropManager.GetHeroProp(heroDid)--HeroManager.CalculateHeroAllProValList(1, heroDid, true) local allProVal = {} table.insert(allProVal, 1, HeroManager.GetSingleHeroData(heroDid).lv) --等级 diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroPowerManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroPowerManager.lua index f90fddeb26..bb708c1040 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroPowerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroPowerManager.lua @@ -94,6 +94,9 @@ function this.CalPower(heroData, propList) propList[tpId] = math.floor( propList[tpId] + propList[tpId] * propList[k] / 10000) end end + LogPinkTable(propList) + + return CalculateWarForce(propList) end @@ -105,7 +108,6 @@ function this.GetHeroPower(dId, formationId) -- 计算战斗力 local heroData = HeroManager.CreateHeroCountData(dId) local allPower = this.CalPower(heroData, propList) - -- local allPower = CalculateWarForce(propList) -- if not this.HeroPowerList[dId] then this.HeroPowerList[dId] = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 76135f3af6..dc34107cba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -420,6 +420,7 @@ function this.OnReceiveLogin(str) AppConst.UserId = data.uid AppConst.Token = data.token local openId = AppConst.isSDKLogin and AppConst.OpenId or PlayerPrefs.GetString(openIdkey) + Log("LoginRequest") NetManager.LoginRequest(openId, function() if not LoginManager.IsLogin then LoginManager.IsLogin = true @@ -559,6 +560,7 @@ end -- 请求连接socket function this.RequestSocketLogin() + Log(Language[11124]) RequestPanel.Show(Language[11124]) SocketManager.AddNetwork(SocketType.LOGIN, LoginManager.SocketAddress, LoginManager.SocketPort) SocketManager.TryConnect(SocketType.LOGIN) @@ -606,6 +608,7 @@ function this.OnConnect(network) .. "&version=" .. LoginRoot_PackageVersion, this.OnReceiveLogin, nil, nil, nil) else + Log("Http Login") networkMgr:SendGetHttp(LoginRoot_Url .. "jl_loginserver/getUserInfo?openId=" ..LoginManager.openId .. "&serverId=" .. LoginManager.ServerId diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index dd6c77371d..912d58f907 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -272,7 +272,13 @@ function GMPanel:BindEvent() local monsterId = 10101 Util.AddClick(this.btnBattleGo, function() if this.MonsterIdText.text == "" then - local data = {enemyData={{{camp=1,element=3,passivity={},position=1,professionId=2,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10085,skill={1131,0.05,0,1,{230002,{1,0.6,2}}},star=5,superSkill={1132,0.8,0,1,{200212,{2,2.12,2}},{400001,{101,1}}},type=1},{camp=1,element=2,passivity={},position=2,professionId=3,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10022,skill={1151,0.05,0,1,{220000,{1,0.44,2}}},star=5,superSkill={1152,0.05,0,1,{220000,{2,1.55,2},{3,0.45,1,1}}},type=1},{camp=1,element=2,passivity={},position=3,professionId=1,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10010,skill={1171,0.05,0,1,{400000,{1,0.9,1}}},star=5,superSkill={1172,0.35,0,1,{210003,{2,1.55,1}},{110003,{104,0.2,1}}},type=1},{camp=1,element=2,passivity={},position=4,professionId=4,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10089,skill={1181,0.05,0,1,{400000,{1,0.9,2}}},star=5,superSkill={1182,0.8,0,1,{230002,{2,2.12,2}},{300000,{100,1,1}}},type=1},{camp=1,element=2,passivity={},position=5,professionId=2,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10015,skill={1201,0.05,0,1,{400000,{1,0.9,1}}},star=5,superSkill={1202,0.01,0.5,3,{400000,{1,3.15,1}},{300000,{100,1,1}}},type=1},{camp=1,element=2,passivity={},position=6,professionId=2,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10086,skill={1261,0.05,0,1,{400000,{1,0.9,1}}},star=5,superSkill={1262,0.3,0,1,{230002,{2,2.12,1}},{400001,{101,1}}},type=1},teamPassive={},teamSkill={}}},playerData={{camp=0,element=3,passivity={},position=1,professionId=4,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10008,skill={1021,0.05,0,1,{210003,{1,0.47,1}}},star=5,superSkill={1022,1.2,0,1,{210003,{2,1.63,1}},{100000,{100,1,1}}},type=1},{camp=0,element=3,passivity={},position=2,professionId=4,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10006,skill={1041,0.05,0,1,{220801,{1,0.95,2}}},star=5,superSkill={1042,0.1,0.8,3,{220801,{1,3.33,2}},{300000,{100,1,1}}},type=1},{camp=0,element=3,passivity={},position=3,professionId=4,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10018,skill={1051,0.05,0,1,{100111,{24,1,1.03}}},star=5,superSkill={1052,0.05,0,1,{100113,{24,1,1.75}}},type=1},{camp=0,element=3,passivity={},position=4,professionId=3,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10005,skill={1071,0.05,0,1,{400000,{1,0.95,0.4}}},star=5,superSkill={1072,0.3,0,1,{210003,{2,1.63,2},{3,0.4,2,1}}},type=1},{camp=0,element=3,passivity={},position=5,professionId=3,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10020,skill={1081,0.05,0,1,{400000,{1,0.95,1}}},star=5,superSkill={1082,0.3,0,1,{230002,{2,2.23,1},{3,0.4,1,1}}},type=1},{camp=0,element=2,passivity={},position=6,professionId=2,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10012,skill={1121,0.05,0,1,{400000,{1,0.95,2}}},star=5,superSkill={1122,0.05,0,1,{400000,{103,3.33,2,0.3}}},type=1},teamPassive={},teamSkill={}}} + local data = + {enemyData={{{ai={0},camp=1,element=2,monsterId=810039,passivity={},position=1,professionId=1,property={67,78682,78682,13277,1430,1430,1,0.134,0.134,1.134,0.0268,0.134,0.067,0.134,0,0,0,0,0,0,0,0,0,0,0},quality=2,roleId=10034,skill={1221,0.05,0,1,{400000,{1,0.9,1}}},star=0,superSkill={1222,0.4,0,1,{210003,{2,1.55,1}},{300000,{100,1,1}}},type=1},{ai={0},camp=1,element=4,monsterId=820039,passivity={},position=2,professionId=1,property={67,78682,78682,13277,1430,1430,1,0.134,0.134,1.134,0.0268,0.134,0.067,0.134,0,0,0,0,0,0,0,0,0,0,0},quality=2,roleId=10037,skill={1491,0.05,0,1,{220801,{1,1,1}}},star=0,superSkill={1492,1.5,0,1,{220801,{1,3.5,1},{100,3,1}}},type=1},{ai={0},camp=1,element=1,monsterId=830039,passivity={},position=3,professionId=1,property={67,78682,78682,13277,1430,1430,1,0.134,0.134,1.134,0.0268,0.134,0.067,0.134,0,0,0,0,0,0,0,0,0,0,0},quality=2,roleId=10004,skill={1291,0.05,0,1,{100211,{24,1,1.03}}},star=0,superSkill={1292,1.4,0,1,{100000,{24,1,0.9}}},type=1},{ai={0},camp=1,element=1,monsterId=840039,passivity={},position=4,professionId=1,property={67,78682,78682,13277,1430,1430,1,0.134,0.134,1.134,0.0268,0.134,0.067,0.134,0,0,0,0,0,0,0,0,0,0,0},quality=2,roleId=10009,skill={1311,0.05,0,1,{400000,{1,0.9,2}}},star=0,superSkill={1312,2.5,0,1,{210003,{113,1.55,2,1,0.4,7,1}}},type=1},{ai={0},camp=1,element=4,monsterId=850039,passivity={},position=5,professionId=1,property={67,78682,78682,13277,1430,1430,1,0.134,0.134,1.134,0.0268,0.134,0.067,0.134,0,0,0,0,0,0,0,0,0,0,0},quality=2,roleId=10013,skill={1461,0.05,0,1,{400000,{1,1,1}}},star=0,superSkill={1462,0.1,0,3,{200000,{1,1.02,1},{3,0.3,7,1}}},type=1},{ai={0},camp=1,element=4,monsterId=860039,passivity={},position=6,professionId=1,property={67,78682,78682,13277,1430,1430,1,0.134,0.134,1.134,0.0268,0.134,0.067,0.134,0,0,0,0,0,0,0,0,0,0,0},quality=2,roleId=10090,skill={1521,0.05,0,1,{400000,{1,0.95,2}}},star=0,superSkill={1522,3.1,0,1,{200113,{1,1.4,2},{110,0.4,2}}},type=1},firstCamp=0,outData="",teamPassive={},teamSkill={}}},playerData={{camp=0,element=2,passivity={{93,0.25,2},{121,1},{90,16,2,1},{120,0.12}},position=6,professionId=4,property={255,1695725,1695725,286008,13743,13743,0,0,0.05,1,0,0,0,0.08,1,1,0,0,0,0,0,0,0,0,0},quality=0,roleId=10007,skill={1161,0.05,0,1,{100211,{24,1,1.03}}},star=10,superSkill={1162,2,0,1,{100000,{24,1,0.9}}},type=1},{camp=0,element=1,passivity={{90,16,2,1},{102,1},{95,1},{131,3,1,2,0.15}},position=1,professionId=2,property={255,1438146,1438146,305203,13743,13743,0,0,0.05,1.12,0,0.1,0,0,1,1,0,0,0,0,0,0,0,0,0},quality=0,roleId=10001,skill={1271,0.05,0,1,{220000,{1,0.44,1}}},star=10,superSkill={1272,1.2,0,1,{220000,{105,1.55,1,1,0.6}}},type=1},{camp=0,element=3,passivity={{105,1},{90,16,2,1},{104,2}},position=2,professionId=4,property={255,1438146,1438146,286008,13743,13743,0,0,0.15,1,0.08,0,0,0.06,1,1,0,0,0,0,0,0,0,0,0},quality=0,roleId=10006,skill={1041,0.05,0,1,{220801,{1,0.95,2}}},star=10,superSkill={1042,0.1,0.8,3,{220801,{1,3.33,2}},{300000,{100,1,1}}},type=1},{camp=0,element=3,passivity={{90,16,2,1},{108,0.8}},position=3,professionId=1,property={255,1845979,1845979,286008,13743,13743,0,0,0.05,1.08,0,0,0,0,1,1.1,0,0,0,0,0,0,0,0,0},quality=0,roleId=10003,skill={1061,0.05,0,1,{400000,{1,0.95,1}}},star=10,superSkill={1062,1.7,0,1,{230002,{10,2.23,1,0.3}}},type=1},{camp=0,element=3,passivity={{132,0.16,2},{102,1},{90,16,2,1},{91,0.25,2}},position=4,professionId=2,property={255,1438146,1438146,301364,13743,13743,0,0,0.05,1.1,0,0.08,0,0,1,1,0,0,0,0,0,0,0,0,0},quality=0,roleId=10002,skill={1031,0.05,0,1,{230002,{1,0.65,1}}},star=10,superSkill={1032,0.3,0,1,{220003,{1,1.63,1}},{300000,{100,1,1}}},type=1},{camp=0,element=3,passivity={{98,0.3},{90,16,2,1},{107,1},{101,2,1,0.25}},position=5,professionId=3,property={255,1438146,1438146,286008,13743,13743,0,0,0.05,1.08,0.06,0,0,0.1,1,1,0,0,0,0,0,0,0,0,0},quality=0,roleId=10005,skill={1071,0.05,0,1,{400000,{1,0.95,0.4}}},star=10,superSkill={1072,0.3,0,1,{210003,{2,1.63,2},{3,0.4,2,1}}},type=1},firstCamp=0,outData="",teamPassive={{}},teamSkill={}}} + + + + + local testFightData = { fightData = data, fightSeed = 1589533697, diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua index 84f05e08f1..ca1965b3b7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua @@ -1002,7 +1002,7 @@ function this.GetMapTeamPower() if curFormation[i].allProVal[2] > 0 then local allEquipAddProVal = 0 - allEquipAddProVal = HeroManager.CalculateHeroAllProValList(1, heroData.dynamicId, false) + allEquipAddProVal = HeroPowerManager.GetHeroPower(heroData.dynamicId) powerNum = powerNum + allEquipAddProVal[HeroProType.WarPower] end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/MapFormationInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/MapFormationInfoPopup.lua index 9376559a11..4fa6297477 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/MapFormationInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/MapFormationInfoPopup.lua @@ -84,7 +84,7 @@ end local allEquipAddProVal function this.CalculateAllHeroPower(curHeroData) - allEquipAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false) + allEquipAddProVal = HeroPowerManager.GetHeroPower(curHeroData.dynamicId) powerNum = powerNum + allEquipAddProVal[HeroProType.WarPower] end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua index 7679d305ae..fedae9880c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua @@ -56,22 +56,11 @@ function MapRoleInfoPopup:OnOpen(...) SetHeroStars(this.starGrid, curHeroData.star) - --计算面板属性 - --this.xingDongExp.text = curHeroData.actionPower - --local allAddProVal=HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId) - --this.atk.text=allAddProVal[HeroProType.Attack] - --this.hp.text=allAddProVal[HeroProType.Hp] - --this.phyDef.text=allAddProVal[HeroProType.PhysicalDefence] - --this.magDef.text=allAddProVal[HeroProType.MagicDefence] - --this.speed.text= allAddProVal[HeroProType.Speed] - --计算战斗力 生命*0.7+(护甲+魔抗)*5+攻击*10+(暴击率+命中效果+效果抵抗率)*5+(属性攻击率+属性防御率)*30 - --this.power.text ="战斗力:"..allAddProVal[HeroProType.WarPower] - --显示队伍的属性数据 - local allAddProVal=HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId,false) - --计算战斗力 生命*0.7+(护甲+魔抗)*5+攻击*10+(暴击率+命中效果+效果抵抗率)*5+(属性攻击率+属性防御率)*30 - this.power.text =Language[10105]..allAddProVal[HeroProType.WarPower] - + --计算战斗力 + this.power.text =Language[10105] .. HeroPowerManager.GetHeroPower(curHeroData.dynamicId) -- 计算属性 + --显示队伍的属性数据 + local allAddProVal=HeroPropManager.GetHeroProp(curHeroData.dynamicId) local propList = FoodBuffManager.CalBuffPropValue(allPropValue) this.atk.text = propList[4] this.hp.text = propList[2] diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua index 203c7a42b3..3115a32683 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua @@ -241,7 +241,7 @@ function this.GetShowPanelData() --星级 SetHeroStars(this.starGrid, heroBackData.star,2,Vector2.New(60,60),-11.92,Vector2.New(0.5,0.5)) --属性 - local allAddProVal=HeroManager.CalculateHeroAllProValList(1,heroBackData.id,false) + local allAddProVal=HeroPropManager.GetHeroProp(heroBackData.id) this.atk.text=allAddProVal[HeroProType.Attack] this.hp.text=allAddProVal[HeroProType.Hp] this.phyDef.text=allAddProVal[HeroProType.PhysicalDefence] diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 0d1cf19774..5be68c1c9b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -10,7 +10,7 @@ local equipConfig = ConfigManager.GetConfig(ConfigName.EquipConfig) local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local heroRankupConfig=ConfigManager.GetConfig(ConfigName.HeroRankupConfig) local jewelConfig=ConfigManager.GetConfig(ConfigName.JewelConfig) -local choosedList +local formationId local pinjieImage={"r_hero_pinjiebiao_01","r_hero_pinjiebiao_02"} --该死的品阶图片 1是未激活 2是激活 local orginLayer2 = 0 @@ -150,7 +150,7 @@ function RoleInfoPopup:OnOpen(...) local arg = { ... } curHeroData = arg[1] this.isOther = arg[2] - choosedList = arg[3] or nil + formationId = arg[3] or nil end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) @@ -208,14 +208,7 @@ function this.RoleInfo0() if this.isOther then this.power.text = curHeroData.actionPower else - if choosedList then - --local formationList = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL) - local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(choosedList,curHeroData.dynamicId) - allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData, false,nil,nil,true,allHeroTeamAddProVal) - else - allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData, false) - end - this.power.text = allAddProVal[HeroProType.WarPower] + this.power.text = HeroPowerManager.GetHeroPower(curHeroData.dynamicId, formationId) end this.radar:SetEdges({ curHeroData.heroConfig.AttackScale / 100, curHeroData.heroConfig.DefenseScale / 100, curHeroData.heroConfig.AssistScale / 100 }) @@ -264,13 +257,7 @@ function this.RoleInfo1() --this.magDef.text = curHeroData.mDef allAddProVal = curHeroData.allAddProVal else - if choosedList then - --local formationList = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL) - local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(choosedList,curHeroData.dynamicId) - allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false,nil,nil,true,allHeroTeamAddProVal) - else - allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false) - end + allAddProVal = HeroPropManager.GetHeroProp(curHeroData.dynamicId, formationId) end this.atk.text = allAddProVal[HeroProType.Attack] this.hp.text = allAddProVal[HeroProType.Hp] diff --git a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua index 84de3d9cde..78433f8af4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua @@ -186,7 +186,6 @@ end -- 刷新英雄列表显示 function this.RefreshHeroPanelShow() -- - local power = 0 local formationData = FormationManager.GetFormationByID(FormationManager.curFormationIndex) for i = 1, 6 do @@ -200,8 +199,6 @@ function this.RefreshHeroPanelShow() local heroDId = hero.heroId - local allEquipAddProVal = HeroManager.CalculateHeroAllProValList(1, heroDId, false) - power = power + allEquipAddProVal[HeroProType.WarPower] local heroData = HeroManager.GetSingleHeroData(heroDId) this.SingleHeroDataShow(this.groupBox[pos], heroData, pos) @@ -210,7 +207,7 @@ function this.RefreshHeroPanelShow() this.ChooseHero(this.groupBox[pos], heroData, pos) end end - this.forceValue.text = power + this.forceValue.text = FormationManager.GetFormationPower(FormationManager.curFormationIndex) end -- 刷新成长选项 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 636141f547..83c044942b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -629,8 +629,7 @@ function this.ShowHeroEquip() end ) end - local allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false) - this.force.text = allAddProVal[HeroProType.WarPower] + this.force.text = HeroPowerManager.GetHeroPower(curHeroData.dynamicId) end function this:SetSelectBtn() diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index a3d4a6d232..f63603e2dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -548,11 +548,9 @@ function this:UpdateHeroInfoData(isNeedLoadLive) -- self.infoText.text =curHeroData.heroConfig.HeroLocation --计算面板属性 if isUpZhen then - local formationList = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL) - local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(formationList.teamHeroInfos,curHeroData.dynamicId) - allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false,nil,nil,true,allHeroTeamAddProVal) + allAddProVal = HeroPropManager.GetHeroProp(curHeroData.dynamicId, FormationTypeDef.FORMATION_NORMAL) else - allAddProVal=HeroManager.CalculateHeroAllProValList(1,curHeroData.dynamicId,false) + allAddProVal = HeroPropManager.GetHeroProp(curHeroData.dynamicId) end this:ProShow(this.atkPro,allAddProVal,HeroProType.Attack) this:ProShow(this.hpPro,allAddProVal,HeroProType.Hp) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpLvBreakSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpLvBreakSuccessPanel.lua index 014aa87988..79d66e892b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpLvBreakSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpLvBreakSuccessPanel.lua @@ -50,7 +50,7 @@ function RoleUpLvBreakSuccessPanel:OnOpen(...) --计算面板属性old - local oldLvAllAddProVal=HeroManager.CalculateHeroAllProValList(1,curHeroData.dynamicId,false) + local oldLvAllAddProVal= HeroPropManager.GetHeroProp(curHeroData.dynamicId) this.upLvMaskPanleProAtk.text=oldLvAllAddProVal[HeroProType.Attack] this.upLvMaskPanleProHp.text=oldLvAllAddProVal[HeroProType.Hp] this.upLvMaskPanleProPhyDef.text=oldLvAllAddProVal[HeroProType.PhysicalDefence] diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua index 0a3db532fe..299affa386 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua @@ -130,7 +130,7 @@ function RoleUpStarSuccessPanel:OnOpen(...) this.lvEndInfo.text=string.format(Language[11867],curHeroRankUpConfigOpenLevel) --计算面板属性old - local oldLvAllAddProVal=HeroManager.CalculateHeroAllProValList(1,curHeroData.dynamicId,false) + local oldLvAllAddProVal= HeroPropManager.GetHeroProp(curHeroData.dynamicId) this.upLvMaskPanleProAtk.text=oldLvAllAddProVal[HeroProType.Attack] this.upLvMaskPanleProHp.text=oldLvAllAddProVal[HeroProType.Hp] this.upLvMaskPanleProPhyDef.text=oldLvAllAddProVal[HeroProType.PhysicalDefence] diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua index b5f3ebdd2f..2845e6b927 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua @@ -186,9 +186,7 @@ function this.RefreshShow() this.SetScrollData() --对比战力并更新战力值 播放战力变更动画 HeroManager.CompareWarPower(curHeroData.dynamicId) - local allPro = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false) - this.power.text = allPro[HeroProType.WarPower] -end + this.power.text = HeroPowerManager.GetHeroPower(curHeroData.dynamicId) --设置环形布局 function this.SetLoopUI() @@ -296,8 +294,7 @@ end --设置英雄 function this.SetHero() this.heroIcon.sprite=Util.LoadSprite(GetResourcePath(curHeroData.heroConfig.Icon)) - local allPro = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false) - this.power.text = allPro[HeroProType.WarPower] + this.power.text = HeroPowerManager.GetHeroPower(curHeroData.dynamicId) end