【灵兽系统】 修改bug

zhangqiang 2020-10-30 17:48:49 +08:00
parent b50f468e33
commit 4f25b8cc98
8 changed files with 39 additions and 23 deletions

View File

@ -333,7 +333,7 @@ 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: 0.2, y: -184.99994}
m_AnchoredPosition: {x: 5, y: -184.99994}
m_SizeDelta: {x: 185.08, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3369565443776889168
@ -3777,7 +3777,7 @@ 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: 0.2, y: -184.99994}
m_AnchoredPosition: {x: 5, y: -184.99994}
m_SizeDelta: {x: 185.08, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7130605405241923690
@ -6744,7 +6744,7 @@ 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: 0.2, y: -184.99994}
m_AnchoredPosition: {x: 5, y: -184.99994}
m_SizeDelta: {x: 185.08, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8296586281184876696
@ -13238,7 +13238,7 @@ 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: 0.2, y: -184.99994}
m_AnchoredPosition: {x: 5, y: -184.99994}
m_SizeDelta: {x: 185.08, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6756917967416439555
@ -17604,7 +17604,7 @@ 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: 0.2, y: -184.99994}
m_AnchoredPosition: {x: 5, y: -184.99994}
m_SizeDelta: {x: 185.08, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3165357243875478739
@ -25165,7 +25165,7 @@ 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: 0.2, y: -184.99994}
m_AnchoredPosition: {x: 5, y: -184.99994}
m_SizeDelta: {x: 185.08, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1619032463511438548

View File

@ -921,6 +921,7 @@ JumpType = {
GuildCarDelay=73 , --车迟斗法
XuanYuanMirror=74 , --车迟斗法
CompoundHero = 78,--神将合成、置换
Pokemon = 79,--灵兽山
BuyVigor = 10000, --体力购买
BuyGold = 10001, --金币购买

View File

@ -1544,7 +1544,7 @@ function this.GetAllHeroTeamAddProVal(teamHeroInfos,curteamHeroDid)
end
--计算英雄身上所有属性加成(包括装备就、异妖的加成)
--_type==1 计算当前英雄的所有属性 _type==2 根据_heroDid之后_breakId传过来的值进行计算 _isAllHeroProVal==true 团体加成综合 用字段_allHeroProVal
function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upStarId, _isAllHeroProVal, _allHeroProVal)
function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upStarId, _isAllHeroProVal, _allHeroProVal,formationHeroNum)
local curHeroData = this.GetSingleHeroData(_heroDid) or _heroDid
local curLvNum = curHeroData.lv -- heroLevelConfig[curHeroData.lv].CharacterLevelPara
--local speedNum = heroLevelConfig[curHeroData.lv].SpeedLevelPara
@ -1694,7 +1694,10 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
-- end
--end
--灵兽 现在只在编队战力中计算 因为单个英雄可以上多个编队
-- local pokemonFormationAllHeroProVal = PokemonManager.GetPokemonFormationTeamAddPro(heroAllNum)
local pokemonFormationAllHeroProVal = {}
if formationHeroNum and formationHeroNum > 0 then
pokemonFormationAllHeroProVal = PokemonManager.GetPokemonFormationTeamAddPro(formationHeroNum)
end
--if pokemonFormationAllHeroProVal and LengthOfTable(pokemonFormationAllHeroProVal) > 0 then
-- for i, v in pairs(pokemonFormationAllHeroProVal) do
-- if v > 0 then
@ -1736,7 +1739,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
this.DoubleTableCompound(allHeroProVal, heroSkillAllHeroProVal)
this.DoubleTableCompound(allHeroProVal, teamAddPro)
this.DoubleTableCompound(allHeroProVal, pokemonFetterAddPro)
-- this.DoubleTableCompound(allHeroProVal, pokemonFormationAllHeroProVal)
this.DoubleTableCompound(allHeroProVal, pokemonFormationAllHeroProVal)
end
-- for index, value in pairs(allHeroProVal) do
-- if value > 0 then

View File

@ -543,14 +543,17 @@ local jumpDic = {
end
UIManager.OpenPanel(UIName.MainShopPanel,13)
end,
--Compound=66, --锻造炉
--DailyCarbon_Gold=67, --每日金币副本
--DailyCarbon_Exp=68, --每日经验副本
--DailyCarbon_Hero=69, --每日角色碎片副本
--DailyCarbon_Transure=70, --每日法宝副本
--DailyCarbon_SoulPrint=71, --每日魂印副本
--DeathPos=71, --十绝阵
--GuildCarDelay=71, --车迟斗法
[JumpType.EndlessShop] = function()--无尽商店
local isActive, tips = ShopManager.IsActive(13)
if not isActive then
PopupTipPanel.ShowTip(tips or Language[10528])
return
end
UIManager.OpenPanel(UIName.MainShopPanel,13)
end,
[JumpType.Pokemon] = function()--灵兽山(驭兽斋)
UIManager.OpenPanel(UIName.PokemonSummonPanel)
end,
}
function this.CheckJump(_jumpId)

View File

@ -172,6 +172,10 @@ function PokemonInfoPanel:BindEvent()
local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
--飘战力
PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower)
pokemonDatas = {curPokemonData}
isHideLeftRihtBtn = true
this.leftBtn.transform.parent.gameObject:SetActive(false)
this.rightBtn.transform.parent.gameObject:SetActive(false)
end)
this.OnShowData()
-- this.OnShowRedPoint()

View File

@ -293,11 +293,11 @@ function this.GetAllPokemonFetterDatas()
local singPokemonFetterData = {}
singPokemonFetterData.id = v.Id
if pokemonFetter and pokemonFetter[singPokemonFetterData.id] then
singPokemonFetterData.enabled = 1
singPokemonFetterData.enabled = 1--已经激活的
elseif this.IsCompound(v.Teamers,curPokemonSidList) then
singPokemonFetterData.enabled = 0
singPokemonFetterData.enabled = 0--可以激活的
else
singPokemonFetterData.enabled = -1
singPokemonFetterData.enabled = -1--不能激活的
end
table.insert(SpiritAnimalBookList,singPokemonFetterData)
end

View File

@ -18,6 +18,11 @@ function this:InitComponent(gameObject)
Util.GetGameObject(gameObject, "PokemonListPanel_Fetter/name"):GetComponent("Text").text = "灵兽羁绊"
end
local sortList = {
[1] = 0,
[0] = 1,
[-1] = -1
}
function this:BindEvent()
end
@ -44,10 +49,10 @@ function this.ShowPokemonFetterData()
curPokemonSidList = PokemonManager.GetAllPokemonGetDatas()
LogGreen("#curPokemonSidList:"..LengthOfTable(curPokemonSidList))
table.sort(curGetAllPokemonFetter, function(a,b)
if a.enabled == b.enabled then
if sortList[a.enabled] == sortList[b.enabled] then
return a.id < b.id
else
return a.enabled > b.enabled
return sortList[a.enabled] > sortList[b.enabled]
end
end)
this.sv:SetData(curGetAllPokemonFetter, function(dataIndex, go)

View File

@ -165,7 +165,7 @@ function RewardItemSingleShowPopup:OnShow()
this.armorLanTuNum:GetComponent("Text").text = Language[11595] .. BagManager.GetItemCountById(itemSid)
this.armorInfo.text = string.gsub(itemConfigData.ItemDescribe, "\\n", "")
this.frameMask:SetActive(false)
if itemConfigData.ItemType == 2 then
if itemConfigData.ItemType == 2 or itemConfigData.ItemType == 22 then
this.frameMask:SetActive(true)
this.frameMask:GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfigData.Quantity))
local propertyName=itemConfig[itemConfigData.Id].PropertyName