Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
d43d4970e7
|
@ -240,6 +240,11 @@ end
|
||||||
|
|
||||||
--打开面板
|
--打开面板
|
||||||
function UIManager.OpenPanel(id, ...)
|
function UIManager.OpenPanel(id, ...)
|
||||||
|
-- 如果是
|
||||||
|
if id == UIName.BattlePanel and this.IsOpen(UIName.BattlePanel) then
|
||||||
|
LogError("战斗界面重复打开!!")
|
||||||
|
return
|
||||||
|
end
|
||||||
return UIManager.GetPanel(id, true, nil, ...)
|
return UIManager.GetPanel(id, true, nil, ...)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -204,7 +204,7 @@ function RoleView.New(go, role, position, root)
|
||||||
instance.rageSlider = Util.GetGameObject(go, "rageProgress/rage"):GetComponent("Image")
|
instance.rageSlider = Util.GetGameObject(go, "rageProgress/rage"):GetComponent("Image")
|
||||||
instance.rageText = Util.GetGameObject(go, "rageProgress/Text"):GetComponent("Text")
|
instance.rageText = Util.GetGameObject(go, "rageProgress/Text"):GetComponent("Text")
|
||||||
instance.effect_rage = Util.GetGameObject(go, "rageProgress/effect")
|
instance.effect_rage = Util.GetGameObject(go, "rageProgress/effect")
|
||||||
instance.effect_dead:SetActive(instance.role.Rage >= 4)
|
instance.effect_rage:SetActive(instance.role.Rage >= 4)
|
||||||
instance.rageSlider.fillAmount = instance.role.Rage / 4
|
instance.rageSlider.fillAmount = instance.role.Rage / 4
|
||||||
instance.rageText.gameObject:SetActive(false)
|
instance.rageText.gameObject:SetActive(false)
|
||||||
instance.rageText.text = ""
|
instance.rageText.text = ""
|
||||||
|
@ -800,7 +800,10 @@ function RoleView:OnSkillCast(skill)
|
||||||
if self.rlgTween3 then self.rlgTween3:Kill() end
|
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)
|
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 then
|
if self.liveRender then
|
||||||
self.liveRender.transform:SetParent(Util.GetGameObject(self.GameObject, "Mask2").transform)
|
local mask2 = Util.GetGameObject(self.GameObject, "Mask2")
|
||||||
|
if mask2 then
|
||||||
|
self.liveRender.transform:SetParent(mask2.transform)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
local cardRenderMat = self.liveRender.material
|
local cardRenderMat = self.liveRender.material
|
||||||
cardRenderMat:SetInt("_IsMask", 0)
|
cardRenderMat:SetInt("_IsMask", 0)
|
||||||
|
|
|
@ -248,21 +248,21 @@ function this.SetData(root, data, ldata)
|
||||||
goBtnText.text=Language[10334]
|
goBtnText.text=Language[10334]
|
||||||
goBtnImage.sprite=Util.LoadSprite("s_slbz_1anniuhuangse")
|
goBtnImage.sprite=Util.LoadSprite("s_slbz_1anniuhuangse")
|
||||||
power.text = _power--string.format(Language[10335], _power)
|
power.text = _power--string.format(Language[10335], _power)
|
||||||
power.transform.gameObject:SetActive(true)
|
power.transform.parent.gameObject:SetActive(true)
|
||||||
if CarbonManager.IsDailyCarbonPass(data.Id) then
|
if CarbonManager.IsDailyCarbonPass(data.Id) then
|
||||||
type=2
|
type=2
|
||||||
goBtnText.text=Language[10336]
|
goBtnText.text=Language[10336]
|
||||||
goBtnImage.sprite=Util.LoadSprite("s_slbz_1anniuhuise")
|
goBtnImage.sprite=Util.LoadSprite("s_slbz_1anniuhuise")
|
||||||
tip.text=Language[10337]
|
tip.text=Language[10337]
|
||||||
tip.gameObject:SetActive(true)
|
tip.gameObject:SetActive(true)
|
||||||
power.transform.gameObject:SetActive(false)
|
power.transform.parent.gameObject:SetActive(false)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
type=0
|
type=0
|
||||||
power.text = _power --string.format(Language[10338], _power)
|
power.text = _power --string.format(Language[10338], _power)
|
||||||
goBtnText.text=Language[10339]
|
goBtnText.text=Language[10339]
|
||||||
tip.gameObject:SetActive(false)
|
tip.gameObject:SetActive(false)
|
||||||
power.transform.gameObject:SetActive(true)
|
power.transform.parent.gameObject:SetActive(true)
|
||||||
end
|
end
|
||||||
power.color = PlayerManager.maxForce >= _power and UIColor.WRITE or UIColor.RED
|
power.color = PlayerManager.maxForce >= _power and UIColor.WRITE or UIColor.RED
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,7 @@ function Expert:OnShowData(index)
|
||||||
if globalActive and globalActive.OpenRanking == 1 then
|
if globalActive and globalActive.OpenRanking == 1 then
|
||||||
this.rewardBtn:SetActive(true)
|
this.rewardBtn:SetActive(true)
|
||||||
this.sortBtn:SetActive(true)
|
this.sortBtn:SetActive(true)
|
||||||
Util.AddClick(this.sortBtn, function()
|
Util.AddOnceClick(this.sortBtn, function()
|
||||||
LogGreen("index "..index)
|
LogGreen("index "..index)
|
||||||
if index == 13 then
|
if index == 13 then
|
||||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[5])
|
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[5])
|
||||||
|
|
|
@ -23,7 +23,7 @@ function FirstRechargePanel:InitComponent()
|
||||||
self.frame = Util.GetGameObject(self.transform, "frame")
|
self.frame = Util.GetGameObject(self.transform, "frame")
|
||||||
self.closeBtn = Util.GetGameObject(self.transform, "closeBtn")
|
self.closeBtn = Util.GetGameObject(self.transform, "closeBtn")
|
||||||
self.heroPreviewBtn = Util.GetGameObject(self.transform, "frame/heroPreviewBtn")
|
self.heroPreviewBtn = Util.GetGameObject(self.transform, "frame/heroPreviewBtn")
|
||||||
self.tenProBtn = Util.GetGameObject(self.transform, "frame/tenProBtn")
|
self.tenProBtn = Util.GetGameObject(self.transform, "frame/bg_live/tenProBtn")
|
||||||
self.stageImage6 = Util.GetGameObject(self.transform, "frame/stageImage/Image")
|
self.stageImage6 = Util.GetGameObject(self.transform, "frame/stageImage/Image")
|
||||||
self.stageImage100 = Util.GetGameObject(self.transform, "frame/stageImage/Image (1)")
|
self.stageImage100 = Util.GetGameObject(self.transform, "frame/stageImage/Image (1)")
|
||||||
--topPart
|
--topPart
|
||||||
|
|
|
@ -59,9 +59,9 @@ function RoleTalismanPanelV2:BindEvent()
|
||||||
Util.AddClick(this.backBtn, function()
|
Util.AddClick(this.backBtn, function()
|
||||||
local teamHero=FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_NORMAL)
|
local teamHero=FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_NORMAL)
|
||||||
--PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
--PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||||
if RoleInfoPanel.RefreshHeroDatas then
|
-- if RoleInfoPanel.RefreshHeroDatas then
|
||||||
RoleInfoPanel:RefreshHeroDatas(curHeroData,HeroManager.GetAllHeroDatas(),teamHero[curHeroData.dynamicId]~=nil)
|
-- RoleInfoPanel:RefreshHeroDatas(curHeroData,HeroManager.GetAllHeroDatas(),teamHero[curHeroData.dynamicId]~=nil)
|
||||||
end
|
-- end
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
--帮助按钮
|
--帮助按钮
|
||||||
|
|
|
@ -13,10 +13,10 @@ this.curAreaID = 0
|
||||||
local lastResName
|
local lastResName
|
||||||
local lastLive2d
|
local lastLive2d
|
||||||
--- 男主立绘
|
--- 男主立绘
|
||||||
this.boyRes = "live2d_c_gt_0001"
|
this.boyRes = "live2d_npc_boy"
|
||||||
|
|
||||||
--- 女主立绘
|
--- 女主立绘
|
||||||
this.bitchRes = "live2d_c_bmf_0004"
|
this.bitchRes = "live2d_npc_girl"
|
||||||
|
|
||||||
|
|
||||||
function this.Initialize()
|
function this.Initialize()
|
||||||
|
|
Loading…
Reference in New Issue