Merge branch 'china/dev' into 0活动开发聚集地/御剑行

dev_chengFeng
ZhangBiao 2021-10-18 16:30:27 +08:00
commit cb3803a413
3 changed files with 9 additions and 2 deletions

View File

@ -160,8 +160,10 @@ function TianShuMiJuanMainPanel:RefreshData()
end)
if not curData or #curData < 1 then
self.empty.gameObject:SetActive(true)
self.scroll.gameObject:SetActive(false)
else
self.empty.gameObject:SetActive(false)
self.scroll.gameObject:SetActive(true)
self.scroll:SetData(curData,function(index,go)
self:SetSingleData(go,curData[index],index)
end)

View File

@ -90,7 +90,7 @@ function XunBaoMiZongMap:OnShow()
self.btnBack.gameObject:GetComponent("Button").interactable = true
self.btnGet.sprite = self.spLoader:LoadSprite("x_xbmz_xunbaoanniu01")
self.effectBtnGet:SetActive(false)
self.liveNode = PlayerLiveView:New(self.roleRoot,1)
self.liveNode = PlayerLiveView:New(self.roleRoot,1,nil,nil,nil,true)
self.liveNode:OnOpen(300,Vector3.zero,WALK_DIR.IDLE_FRONT)
self.liveNode:SetTitleHide()
self:LoadMapData()

View File

@ -8,7 +8,7 @@ local settingValue = ServerConfigManager.GetSettingValue(ServerConfigManager.Set
-- designation = 80010
-- }
function PlayerLiveView:New(gameObject,_Type, PlayerLiveViewData,orginLayer,posType)
function PlayerLiveView:New(gameObject,_Type, PlayerLiveViewData,orginLayer,posType,_hideRide)
-- Type = _Type
-- local b = {}
-- b.gameObject = gameObject
@ -29,6 +29,11 @@ function PlayerLiveView:New(gameObject,_Type, PlayerLiveViewData,orginLayer,posT
designation = PlayerManager.GetPlayerDesignation()
}
end
LogRed("instance.PlayerLiveViewData.ride:"..tostring(instance.PlayerLiveViewData.ride)..tostring(_hideRide))
if _hideRide then
instance.PlayerLiveViewData.ride = nil
end
LogRed("instance.PlayerLiveViewData.ride:"..tostring(instance.PlayerLiveViewData.ride))
instance.orginLayer = orginLayer
instance.transform = gameObject.transform
instance.leader:SetActive(true)