diff --git a/Assets/Effect.meta b/Assets/Effect.meta new file mode 100644 index 0000000000..ed67cca2cb --- /dev/null +++ b/Assets/Effect.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 023d70b98b45c3745a91a5102d1e2117 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Effect/Animation.meta b/Assets/Effect/Animation.meta new file mode 100644 index 0000000000..f552eee2e1 --- /dev/null +++ b/Assets/Effect/Animation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30ec9ad22f181654b81d8aa34d997868 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Effect/Materials.meta b/Assets/Effect/Materials.meta new file mode 100644 index 0000000000..65ebb3ffe7 --- /dev/null +++ b/Assets/Effect/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1213879cc7c0b4d46a8d793b939a06e3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Effect/Prefab.meta b/Assets/Effect/Prefab.meta new file mode 100644 index 0000000000..900e50ab30 --- /dev/null +++ b/Assets/Effect/Prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4dc38530a3ad8af47b2f065ccc50ea54 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Effect/Prefab/UI.meta b/Assets/Effect/Prefab/UI.meta new file mode 100644 index 0000000000..90b8b3bbb6 --- /dev/null +++ b/Assets/Effect/Prefab/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c43dca7af2907d4c913828dbe5b27b4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Effect/Texture.meta b/Assets/Effect/Texture.meta new file mode 100644 index 0000000000..e0d58d2d10 --- /dev/null +++ b/Assets/Effect/Texture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e2a124da35999014cb86e0aa5187e8a8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/PublicArtRes/Models/Materials.meta b/Assets/ManagedResources/PublicArtRes/Models/Materials.meta new file mode 100644 index 0000000000..23d98edb0e --- /dev/null +++ b/Assets/ManagedResources/PublicArtRes/Models/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6088b24b13ed31d4cb512d1068724d3f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index a78e743ad3..92778e6bd7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -180,7 +180,6 @@ function this.GetFormationPower(formationId) ExpeditionManager.ExpeditionRrefreshFormation()--刷新编队 end local formationList = this.GetFormationByID(formationId) - local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(formationList.teamHeroInfos) --for i, v in pairs(allHeroTeamAddProVal) do -- LogError("团队加成 "..i .." " .. v) --end @@ -189,6 +188,7 @@ function this.GetFormationPower(formationId) 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] end diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index c9fb722647..31c4ceccbf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -283,9 +283,8 @@ function this.SetCardsData() this.ElementalResonanceView:GetElementalType(this.choosedList,1) this.ElementalResonanceView:SetPosition(1) - local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(this.choosedList) this.InitArmPos() - this.InitArmData(allHeroTeamAddProVal) + this.InitArmData() -- LogRed(#this.choosedList) --编队为0显示0战力 @@ -337,9 +336,10 @@ function this.InitArmPos() end end -- 设置编队上阵数据 -function this.InitArmData(allHeroTeamAddProVal) +function this.InitArmData() --为每个英雄添加拖动组件 for n = 1, #this.choosedList do + local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(this.choosedList,this.choosedList[n].heroId) --已上阵操作 local pos=this.choosedList[n].position diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index cabb7b9ec9..5b21ceb35f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -821,7 +821,7 @@ local function CalculateHeroUpEquipsProAddVal(_heroId) return addAllProVal end --计算所有法宝加成的属性值 -local function CalculateHeroUpTalismanProAddVal(_heroId, _breakId, _upStarId) +local function CalculateHeroUpTalismanProAddVal(_heroId, _breakId, _upStarId,teamCurPropertyName) local addAllProVal = {} local singleHeroProVal, lvProVal, allHeroProVal, specialProVal local curHeroData = HeroManager.GetSingleHeroData(_heroId) @@ -883,7 +883,7 @@ local function CalculateHeroUpTalismanProAddVal(_heroId, _breakId, _upStarId) if skillIds and #skillIds > 0 then --talismanConFig.OpenSkillRules and #talismanConFig.OpenSkillRules > 0 then --单体加成 --单体等级限制加成 --团体加成 --减乘 singleHeroProVal, lvProVal, allHeroProVal, specialProVal = - this.CalculatePassiveSkillsValList(WarPowerType.Talisman, skillIds) + this.CalculatePassiveSkillsValList(WarPowerType.Talisman, skillIds,teamCurPropertyName) end end end @@ -1078,7 +1078,7 @@ local function CalculateEquipTreaSureAddVal(_heroId) end --计算所有英雄被动技能的属性值 -local function CalculateHeroPassiveSkillProAddVal(_type, _heroId, _breakId, _upStarId) +local function CalculateHeroPassiveSkillProAddVal(_type, _heroId, _breakId, _upStarId,teamCurPropertyName) local singleHeroProVal, lvProVal, allHeroProVal, specialProVal local curHeroData = HeroManager.GetSingleHeroData(_heroId) if curHeroData then @@ -1091,7 +1091,7 @@ local function CalculateHeroPassiveSkillProAddVal(_type, _heroId, _breakId, _upS end --单体加成 --单体等级限制加成 --团体加成 --减乘 singleHeroProVal, lvProVal, allHeroProVal, specialProVal = - this.CalculatePassiveSkillsValList(WarPowerType.Hero, allOpenPassiveSkillIds) + this.CalculatePassiveSkillsValList(WarPowerType.Hero, allOpenPassiveSkillIds,teamCurPropertyName) end return singleHeroProVal, lvProVal, allHeroProVal, specialProVal end @@ -1247,7 +1247,7 @@ end --- --- -function this.CalculatePassiveSkillsValList(index, skillids) +function this.CalculatePassiveSkillsValList(index, skillids,teamCurPropertyName) for k, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.PropertyConfig)) do this.allProVal[index].singleHeroProVal[k] = 0 this.allProVal[index].lvProVal[k] = 0 @@ -1301,15 +1301,28 @@ function this.CalculatePassiveSkillsValList(index, skillids) curSkillData.Value[1], curSkillData.Value[3] ) - -- elseif curSkillData.Type == 129 then - -- this.GetProAndValByFormula( - -- this.allProVal[index].allHeroProVal, - -- this.allProVal[index].specialProVal, - -- curSkillData.Value[3], - -- curSkillData.Value[2], - -- curSkillData.Value[4], - -- curSkillData.Value[1] - -- ) + elseif curSkillData.Type == 129 then + if teamCurPropertyName and teamCurPropertyName == curSkillData.Value[1] then + -- LogGreen("teamCurPropertyName "..teamCurPropertyName .." "..curSkillData.Value[1]) + this.GetProAndValByFormula( + this.allProVal[index].allHeroProVal, + this.allProVal[index].specialProVal, + curSkillData.Value[3], + curSkillData.Value[2], + curSkillData.Value[4], + curSkillData.Value[1] + ) + elseif not teamCurPropertyName then + -- LogGreen("not teamCurPropertyName") + this.GetProAndValByFormula( + this.allProVal[index].allHeroProVal, + this.allProVal[index].specialProVal, + curSkillData.Value[3], + curSkillData.Value[2], + curSkillData.Value[4], + curSkillData.Value[1] + ) + end elseif curSkillData.Type == 171 then --目前没有 --this.GetProAndValByFormula(lvProVal,curSkillData,specialProVal) @@ -1393,15 +1406,15 @@ function this.GetProAndValByFormula(proTable, specialProVal, curProId, curProVal end end --团队加成 -function this.GetAllHeroTeamAddProVal(teamHeroInfos) +function this.GetAllHeroTeamAddProVal(teamHeroInfos,curteamHeroDid) local teamProVal = {} --英雄 法宝 魂印 被动技能 for i = 1, 6 do if teamHeroInfos[i] then local heroSkillSingleHeroProVal, heroSkillLvProVal, heroSkillAllHeroProVal, heroSkillSpecialProVal = - CalculateHeroPassiveSkillProAddVal(1, teamHeroInfos[i].heroId) + CalculateHeroPassiveSkillProAddVal(1, teamHeroInfos[i].heroId,nil,nil, curteamHeroDid and HeroManager.GetSingleHeroData(curteamHeroDid).heroConfig.PropertyName or nil) local falismanSingleHeroProVal, falismanLvProVal, falismanAllHeroProVal, falismanSpecialProVal = - CalculateHeroUpTalismanProAddVal(teamHeroInfos[i].heroId) + CalculateHeroUpTalismanProAddVal(teamHeroInfos[i].heroId,nil,nil, curteamHeroDid and HeroManager.GetSingleHeroData(curteamHeroDid).heroConfig.PropertyName or nil) --local soulPrinSingleHeroProVal,soulPrinLvProVal,soulPrinAllHeroProVal,soulPrinSpecialProVal = CalculateSoulPrintAddVal(teamHeroInfos[i].heroId) this.DoubleTableCompound(teamProVal, heroSkillAllHeroProVal) this.DoubleTableCompound(teamProVal, falismanAllHeroProVal) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index e3f91f1ec9..0cfda105dd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -196,7 +196,7 @@ end --RoleInfo0 function this.RoleInfo0() - LogBlue(curHeroData.id) + LogBlue(curHeroData.id.." "..curHeroData.dynamicId) this.head_Frame.sprite = Util.LoadSprite(GetHeroQuantityImageByquality(curHeroData.heroConfig.Quality)) this.head_Icon.sprite = Util.LoadSprite(curHeroData.icon) this.head_Pro.sprite = Util.LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName)) @@ -210,7 +210,7 @@ function this.RoleInfo0() else if choosedList then --local formationList = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL) - local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(choosedList) + local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(choosedList,curHeroData.dynamicId) allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData, false,nil,nil,true,allHeroTeamAddProVal) else allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData, false) @@ -266,7 +266,7 @@ function this.RoleInfo1() else if choosedList then --local formationList = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL) - local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(choosedList) + 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) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 59dd1e0281..9204324a2c 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -528,7 +528,7 @@ function this:UpdateHeroInfoData() --计算面板属性 if isUpZhen then local formationList = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL) - local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(formationList.teamHeroInfos) + local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(formationList.teamHeroInfos,curHeroData.dynamicId) allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false,nil,nil,true,allHeroTeamAddProVal) else allAddProVal=HeroManager.CalculateHeroAllProValList(1,curHeroData.dynamicId,false) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua index cfbd8abbf4..34c34d6932 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua @@ -14,7 +14,7 @@ function RoleUpStarSuccessPanel:InitComponent() this.live2dRoot=Util.GetGameObject(self.transform,"live2dRoot") this.heroName = Util.GetGameObject(self.transform, "heroInfo/nameAndPossLayout/heroName"):GetComponent("Text") - -- this.profession = Util.GetGameObject(self.transform, "heroInfo/nameAndPossLayout/posImage/posImage/posImage"):GetComponent("Image") + this.profession = Util.GetGameObject(self.transform, "Pos/PosImage"):GetComponent("Image") this.proImage = Util.GetGameObject(self.transform, "heroInfo/nameAndPossLayout/proImage/proImage"):GetComponent("Image") --this.posText = Util.GetGameObject(self.transform, "heroInfo/nameAndPossLayout/posText/posText"):GetComponent("Text") this.starGrid = Util.GetGameObject(self.transform, "heroInfo/sartAndLvLayout/starGrid") @@ -96,8 +96,15 @@ function RoleUpStarSuccessPanel:OnOpen(...) this.LiveGO = poolManager:LoadLive(this.LiveName, this.live2dRoot.transform, Vector3.one * curHeroData.heroConfig.Scale, Vector3.New(curHeroData.heroConfig.Position[1],curHeroData.heroConfig.Position[2],0)) SetHeroStars(this.starGrid, curHeroData.star+1) - -- this.profession.sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(curHeroData.heroConfig.Profession)) + this.profession.sprite = Util.LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession)) + + LogPink("curHeroData.heroConfig.PropertyName"..curHeroData.heroConfig.PropertyName) this.proImage.sprite =Util.LoadSprite(GetProStrImageByProNum(curHeroData.heroConfig.PropertyName)) + + -- LogPurple("curHeroData.heroConfig.profession:"..curHeroData.heroConfig.Profession) + -- LogYellow(GetHeroPosStr(curHeroData.heroConfig.Profession)) + -- this.proImage.sprite =Util.LoadSprite(GetHeroPosStr(curHeroData.heroConfig.Profession)) + --this.posText.text = GetJobStrByJobNum(curHeroData.profession) this.heroName.text =curHeroData.heroConfig.ReadingName diff --git a/data_execl/base_data/ActivityRewardConfig.xlsx b/data_execl/base_data/ActivityRewardConfig.xlsx index ed098e7fd1..8b8577f4d0 100644 Binary files a/data_execl/base_data/ActivityRewardConfig.xlsx and b/data_execl/base_data/ActivityRewardConfig.xlsx differ diff --git a/data_execl/base_data/SpecialConfig.xlsx b/data_execl/base_data/SpecialConfig.xlsx index 27802e2165..1c9b5ab231 100644 Binary files a/data_execl/base_data/SpecialConfig.xlsx and b/data_execl/base_data/SpecialConfig.xlsx differ