Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

jiaoyangna 2020-09-10 16:32:26 +08:00
commit a372dd7a5e
8 changed files with 35 additions and 15 deletions

View File

@ -193,7 +193,7 @@ RectTransform:
- {fileID: 7884662649454219735}
- {fileID: 8145920649029148756}
m_Father: {fileID: 8712558289116513251}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
@ -929,9 +929,9 @@ RectTransform:
- {fileID: 1973340433099576825}
- {fileID: 7558792082178260458}
- {fileID: 8753376728875445769}
- {fileID: 684744019952330289}
- {fileID: 6860502623395961762}
- {fileID: 2230115270592969187}
- {fileID: 684744019952330289}
- {fileID: 4436808920104979691}
- {fileID: 449125269785460153}
- {fileID: 7530251338354471463}
@ -1122,11 +1122,11 @@ RectTransform:
m_Children:
- {fileID: 3115831260180925785}
m_Father: {fileID: 8712558289116513251}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 997, y: -88.5}
m_AnchoredPosition: {x: 847, y: -53.1}
m_SizeDelta: {x: 68, y: 68}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7151780147543166197
@ -1348,7 +1348,7 @@ RectTransform:
m_Children:
- {fileID: 8400971261041822952}
m_Father: {fileID: 8712558289116513251}
m_RootOrder: 5
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}

View File

@ -110189,8 +110189,8 @@ 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: 157, y: -16}
m_SizeDelta: {x: 398.7, y: 30}
m_AnchoredPosition: {x: 354.4, y: -14}
m_SizeDelta: {x: 793.5, y: 119.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &329602736948110786
CanvasRenderer:
@ -110233,7 +110233,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 0
m_Text:
--- !u!114 &4656998361141670262
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@ -2261,7 +2261,7 @@
[12260] = "单日最大探宝次数:%s/%s",
[12261] = "不可超出最大探宝次数!",
[12262] = "高级探宝券不足!",
[12263] = "猎妖师全部死亡,无法进入战斗!",
[12263] = "神将全部死亡,无法进入战斗!",
[12264] = "次内必得金色魂印",
[12265] = "无此装备",
[12266] = "特殊",

View File

@ -2234,9 +2234,12 @@ local effectList = {
[116] = function(caster, target, args, interval, skill)
LogError("主动加一个普攻")
local i1 = args[1]
--如果身上有不灭效果就不会加普攻兼容金翅大鹏10星天赋 by王振兴
if not BattleLogic.BuffMgr:HasBuff(caster,BuffName.NoDead) then
BattleLogic.WaitForTrigger(0.5, function ()
caster:InsertSkill(BattleSkillType.Normal, false, false, nil)
end)
end
end,
}

View File

@ -165,6 +165,23 @@ function this.GetAllFormationHeroId()
end
return list
end
-- 获取主线所有正在编队的英雄id
function this.GetAllMainFormationHeroId()
local list = {}
local index = 1
for i, team in pairs(this.formationList) do
if i == FormationTypeDef.FORMATION_NORMAL then
for j = 1, #team.teamHeroInfos do
-- 加空判断避免不知名错误
if team and team.teamHeroInfos[j] then
list[team.teamHeroInfos[j].heroId] = index
index = index + 1
end
end
end
end
return list
end
--获取单个编队所有上阵英雄
function this.GetWuJinFormationHeroIds(index)
local forMationData = this.GetFormationByID(index).teamHeroInfos

View File

@ -151,7 +151,7 @@ function this.SetMyRank(data,curRankType)
this.mRNum.gameObject:SetActive(curRankType==RANK_TYPE.GUILD_DEATHPOS_ALLGUILD)
if curRankType==RANK_TYPE.GUILD_DEATHPOS_ALLGUILD then
this.mRName.text=guildData.name
this.mRNum.text= data.param2..Language[11057] --param2 人
this.mRNum.text= data.param2..Language[10218] --param2 个
elseif curRankType==RANK_TYPE.GUILD_DEATHPOS_ALLPERSON then
this.mRName.text=PlayerManager.nickName
end

View File

@ -236,7 +236,7 @@ function RoleEquipPanel:OnShow()
end
end
indexBtnNum = PosIdConst.All
teamHero = FormationManager.GetAllFormationHeroId()
teamHero = FormationManager.GetAllMainFormationHeroId()
this.ShowHeroEquip(true)
this:OnClickAllBtn()
this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})

View File

@ -182,7 +182,7 @@ end
--刷新显示
function this.RefreshShow()
--LogGreen(Language[11945])
teamHero = FormationManager.GetAllFormationHeroId()
teamHero = FormationManager.GetAllMainFormationHeroId()
isUpZhen = teamHero[curHeroData.dynamicId] and true or false
this.SetLoopUI()
this.SetHero()