公会副本入口提交

dev_chengFeng
zhangqiang 2020-08-25 11:18:20 +08:00
parent 714545c75d
commit 1ec1329fdf
3 changed files with 3035 additions and 3022 deletions

View File

@ -144,6 +144,8 @@ function GuildMainCityPanel:InitComponent()
end
end
end
--副本立绘
this.btntranscriptLive = Util.GetGameObject(self.gameObject, "Bg/btntranscript/live2d")
end
--绑定事件(用于子类重写)
@ -302,7 +304,9 @@ function GuildMainCityPanel:OnShow()
if not RECHARGEABLE then--(是否开启充值)
this.btnRedPacket:SetActive(false)
end
this.LiveName = "live2d_huyao"
this.LiveGO = poolManager:LoadLive(this.LiveName, this.btntranscriptLive.transform,
Vector3.one * 0.15, Vector3.New(0,0,0))
end
@ -581,6 +585,9 @@ function GuildMainCityPanel:OnDestroy()
ClearRedPointObject(RedPointType.VipPrivilege, this.vipRedPoint)
this.playerHead = nil
poolManager:UnLoadLive(this.LiveName,this.LiveGO )
this.LiveName= nil
end
return GuildMainCityPanel

View File

@ -241,10 +241,10 @@ function RoleInfoPanel:BindEvent()
end)
--升级
Util.AddClick(this.upLvBtn, function()
-- if Time.realtimeSinceStartup - RoleInfoPanel.timePressStarted <= 0.4 then
LogGreen("upLvBtn ")
if Time.realtimeSinceStartup - RoleInfoPanel.timePressStarted <= 0.4 then
-- LogGreen("upLvBtn ")
self:LvUpClick(true)
-- end
end
end)
--长按升级按下状态
this._onPointerDown = function(Pointgo, data)
@ -932,10 +932,10 @@ function RoleInfoPanel:AutoSelectUpStarHeroList(_curUpStarData)
local upStarHeroListData=HeroManager.GetUpStarHeroListData(curUpStarData[i].upStarMaterialsData.Id,curHeroData)
local curSelectHeroList = {}
if curUpStarData[i].upStarMaterialsData.Issame ==1
or curUpStarData[i].upStarMaterialsData.IsId > 0 then
-- or (curUpStarData[i].upStarMaterialsData.IsSameClan == 1
-- and curUpStarData[i].upStarMaterialsData.StarLimit == 3
-- and curHeroData.heroConfig.Qualiy ~= 3) then
or curUpStarData[i].upStarMaterialsData.IsId > 0
or (curUpStarData[i].upStarMaterialsData.IsSameClan == 1
and curUpStarData[i].upStarMaterialsData.StarLimit == 3
and curHeroData.heroConfig.Qualiy ~= 3) then
if LengthOfTable(upStarHeroListData.heroList) >= curUpStarData[i].upStarData[4] then
for i = 1, curUpStarData[i].upStarData[4] do
if upStarHeroListData.heroList[i].lockState == 0 and upStarHeroListData.heroList[i].isFormation == "" then
@ -1191,7 +1191,7 @@ end
--升级按钮点击事件处理
function RoleInfoPanel:LvUpClick(isSingleLvUp)
--是否为最大等级
LogGreen("isSingleLvUp "..tostring(isSingleLvUp))
-- LogGreen("isSingleLvUp "..tostring(isSingleLvUp))
if curHeroData.lv>=HeroManager.heroLvEnd[curHeroData.heroConfig.Id] then
PopupTipPanel.ShowTip(Language[11846])
_isClicked = false
@ -1243,7 +1243,7 @@ function RoleInfoPanel:LvUpClick(isSingleLvUp)
else
curUpLv = curHeroData.lv + 1
end
LogGreen("isSingleLvUp "..tostring(isSingleLvUp))
-- LogGreen("isSingleLvUp "..tostring(isSingleLvUp))
NetManager.HeroLvUpEvent(curHeroData.dynamicId,curUpLv,curHeroData.lv,function (msg)
self:DeleteLvUpMaterials(isSingleLvUp,msg)
end)