Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
880b52763f
|
@ -606,7 +606,7 @@ function MyGuildManager.CheckGuildFeteRedPoint()
|
|||
|
||||
local d={}--进度条可领取
|
||||
for i = 1, 3 do
|
||||
if this.MyFeteInfo.score>=guildSacrificeRewardConfig[i].Score and this.MyGuildInfo.id==this.MyFeteInfo.lastFeteGuildId then --有未领取 并且是当前公会 与上次祭祀公会相同
|
||||
if this.MyFeteInfo.score and this.MyFeteInfo.score>=guildSacrificeRewardConfig[i].Score and this.MyGuildInfo.id and this.MyGuildInfo.id==this.MyFeteInfo.lastFeteGuildId then --有未领取 并且是当前公会 与上次祭祀公会相同
|
||||
table.insert(d,i)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -174,7 +174,7 @@ function this.InitRedPointAllRelate()
|
|||
RPData:SetParent(RedPointType.GrowthGift, RedPointType.Operating)
|
||||
RPData:SetParent(RedPointType.CumulativeSignIn, RedPointType.Operating)
|
||||
RPData:SetParent(RedPointType.GiftPage, RedPointType.Operating)
|
||||
RPData:SetParent(RedPointType.MonthCard, RedPointType.Operating)
|
||||
--RPData:SetParent(RedPointType.MonthCard, RedPointType.Operating)
|
||||
--(24暂时关闭)放开这里就行
|
||||
RPData:SetParent(RedPointType.TimeLimited, RedPointType.DynamicActivity)
|
||||
RPData:SetParent(RedPointType.QianKunBox, RedPointType.DynamicActivity)
|
||||
|
|
|
@ -373,8 +373,12 @@ function RoleInfoPanel:OnShow()
|
|||
this.leftLiveObj = this:LoadHerolive(leftHeroData,self.leftObj)
|
||||
this.rightLiveObj = this:LoadHerolive(rightHeroData,self.rightObj)
|
||||
this.curLiveObj = this:LoadHerolive(curHeroData,self.curObj)
|
||||
|
||||
self.dragView:SetDragGO(this.curLiveObj)
|
||||
if this.curLiveObj then
|
||||
self.dragView.gameObject:SetActive(true)
|
||||
self.dragView:SetDragGO(this.curLiveObj)
|
||||
else
|
||||
self.dragView.gameObject:SetActive(false)
|
||||
end
|
||||
this:UpdatePanelData()--刷新界面方法
|
||||
RoleInfoPanel:OnClickBtnInfo()--初始化是默认显示详情
|
||||
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.RoleInfo })
|
||||
|
@ -468,7 +472,13 @@ function this:UpdateHeroInfoData(isNeedLoadLive)
|
|||
this.soulPrintBtn:SetActive(PlayerManager.level>=EquipSignUnlock[1][2] and curHeroData.heroConfig.Star >= EquipSignUnlock[2][2])
|
||||
end
|
||||
--情报
|
||||
self.dragView:SetDragGO(this.curLiveObj)
|
||||
--self.dragView:SetDragGO(this.curLiveObj)
|
||||
if this.curLiveObj then
|
||||
self.dragView.gameObject:SetActive(true)
|
||||
self.dragView:SetDragGO(this.curLiveObj)
|
||||
else
|
||||
self.dragView.gameObject:SetActive(false)
|
||||
end
|
||||
local starSize = Vector2.New(60,60)
|
||||
SetHeroStars(self.starGrid, curHeroData.star,2,starSize,-10,Vector2.New(0.5,0.5))
|
||||
--常规属性赋值
|
||||
|
@ -1431,7 +1441,12 @@ function RoleInfoPanel:DeleteUpStarMaterials()
|
|||
this.leftLiveObj = this:LoadHerolive(leftHeroData,self.leftObj)
|
||||
this.rightLiveObj = this:LoadHerolive(rightHeroData,self.rightObj)
|
||||
this.curLiveObj = this:LoadHerolive(curHeroData,self.curObj)
|
||||
self.dragView:SetDragGO(this.curLiveObj)
|
||||
if this.curLiveObj then
|
||||
self.dragView.gameObject:SetActive(true)
|
||||
self.dragView:SetDragGO(this.curLiveObj)
|
||||
else
|
||||
self.dragView.gameObject:SetActive(false)
|
||||
end
|
||||
this:UpdatePanelData()
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue