Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
commit
671ddf1c10
|
@ -603,7 +603,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &3346197970643441062
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1869,7 +1869,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 99, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2545760152514230900
|
||||
|
|
|
@ -63,7 +63,7 @@ function FestevalPanel:OnShow()
|
|||
local data = ConfigManager.GetConfigData(ConfigName.HeroConfig,GlobalActivityConfig[self.actId].ShowArt)
|
||||
|
||||
self.live = poolManager:LoadLive(GetResourcePath(data.Painting), self.liveRoot.transform,
|
||||
Vector3.one * data.Scale, Vector3.New(data.Position[1], data.Position[2], 0))
|
||||
Vector3.one * data.Scale, Vector3.New(data.Position[1], data.Position[2]+130, 0))
|
||||
local SkeletonGraphic = self.live:GetComponent("SkeletonGraphic")
|
||||
SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
|
||||
end
|
||||
|
|
|
@ -129,7 +129,7 @@ end
|
|||
|
||||
-- 刷新竞技场显示
|
||||
function this.RefreshArenaShow()
|
||||
this.Arena_Name.text = ArenaManager.GetArenaName()
|
||||
this.Arena_Name.text = "斗牛竞技场"--ArenaManager.GetArenaName()
|
||||
local baseData = ArenaManager.GetArenaBaseData()
|
||||
this.Arena_Score.text = baseData.score
|
||||
local _, myRankInfo = ArenaManager.GetRankInfo()
|
||||
|
|
Loading…
Reference in New Issue