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

dev_chengFeng
ZhangBiao 2020-08-03 16:11:21 +08:00
commit a9f8f39280
4 changed files with 1957 additions and 1799 deletions

File diff suppressed because it is too large Load Diff

View File

@ -798,7 +798,7 @@ function RoleView:OnSkillCast(skill)
-- 立绘位置剧中
if self.rlgTween3 then self.rlgTween3:Kill() end
self.rlgTween3 = self.RoleLiveGO.transform:DOLocalMove(Vector3.New(self.outOffset[1], self.outOffset[2] - 220, 0), 0.3, false):SetEase(Ease.OutSine)
if self.liveRender.transform then
if self.liveRender then
self.liveRender.transform:SetParent(Util.GetGameObject(self.GameObject, "Mask2").transform)
end
local cardRenderMat = self.liveRender.material

View File

@ -119,7 +119,7 @@ function this.RefreshFormation(index, roleList, pokemonList,isDiffmonster)
Game.GlobalEvent:DispatchEvent(GameEvent.Formation.OnFormationChange,isDiffmonster)
end)
this.UserPowerChanged()
this.CheckHeroIdExist()
end
@ -209,13 +209,18 @@ end
--某个妖灵师战力发生变化检查是否在任何一个编队
function this.CheckHeroIdExist(heroId)
for _, formationData in pairs(this.formationList) do
table.walk(formationData.teamHeroInfos, function(teamInfo)
if heroId == teamInfo.heroId then
this.UserPowerChanged()
if not heroId then
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
return
end
-- for _, formationData in pairs(this.formationList) do
table.walk(this.formationList[FormationTypeDef.FORMATION_NORMAL].teamHeroInfos, function(teamInfo)
if heroId == teamInfo.heroId then
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
end
end)
end
-- end
end
function this.UserPowerChanged()

View File

@ -22,8 +22,12 @@ function this.Show()
this.content.text = this.config.Question
this.liveNode = poolManager:LoadLive("live2d_c_yj_00040", this.liveRoot.transform, Vector3.one, Vector3.New(0,57, 0))
for _, item in pairs(_itemsList) do
item:SetActive(false)
for index, item in pairs(_itemsList) do
if item then
item:SetActive(false)
else
_itemsList[index] = nil
end
end
local aIdList = string.split(this.config.Answer, "#")--id列表
--设置按钮和图片