diff --git a/Assets/ManagedResources/Prefabs/UI/Guide/GuidePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guide/GuidePanel.prefab index a503ec725f..738a05bb46 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guide/GuidePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guide/GuidePanel.prefab @@ -761,7 +761,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 293.99, y: -155} + m_AnchoredPosition: {x: 242.05, y: -155} m_SizeDelta: {x: 380, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &241999028642526116 @@ -835,8 +835,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 180.07, y: -15.200027} - m_SizeDelta: {x: 607.85, y: 143.5} + m_AnchoredPosition: {x: 135.8, y: -25} + m_SizeDelta: {x: 599, y: 211.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &379799289798725747 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index c03ea9b703..0343987627 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -52,8 +52,8 @@ end function this.UpdateFormation(msg) Log("#msg.TeamPosInfo : " .. #msg.TeamPosInfo) this.formationList = {} - this.curFormationIndex = this.SetCurFormationIndex() - + -- this.curFormationIndex = this.SetCurFormationIndex() + this.curFormationIndex = 1 for i, team in ipairs(msg.TeamPosInfo) do local oTeam = this.MakeAEmptyTeam(team.teamId) @@ -86,16 +86,16 @@ function this.UpdateFormation(msg) this.CheckGuildFightDefendFormation() end -function this.SetCurFormationIndex() - local curIndex = 1 - local curMapId = PlayerManager.curMapId - local carbonType = 1 - if curMapId and curMapId > 0 then - carbonType = ChallengeData[curMapId].Type - end - curIndex = carbonType == 4 and 401 or 1 - return curIndex -end +-- function this.SetCurFormationIndex() +-- local curIndex = 1 +-- local curMapId = PlayerManager.curMapId +-- local carbonType = 1 +-- if curMapId and curMapId > 0 then +-- carbonType = ChallengeData[curMapId].Type +-- end +-- curIndex = carbonType == 4 and 401 or 1 +-- return curIndex +-- end function this.RefreshFormation(index, roleList, pokemonList,isDiffmonster) local curFormation = this.formationList[index] diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua index f350686fb0..0e0fbd81b7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua @@ -32,7 +32,7 @@ function this:InitComponent() self.handPoint = Util.GetGameObject(self.buttonIcon,"GameObject") - poolManager:LoadLive("live2d_c_yff_0048", self.dialogRoot.transform, Vector3.one * 0.36, Vector3.New(-313, 100)) + poolManager:LoadLive("live2d_c_yff_0048", self.dialogRoot.transform, Vector3.one * 0.36, Vector3.New(-330, 100)) end --绑定事件(用于子类重写)