diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 3c11ad2823..0edcc36123 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -8384,18 +8384,18 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 998994106207310902} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 8.981068} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8271367050774912013} - {fileID: 374681534325176530} - m_Father: {fileID: 1470640894515440942} - m_RootOrder: 4 + m_Father: {fileID: 761919767455012465} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -29, y: -321} - m_SizeDelta: {x: 320.8, y: 83.2} + m_AnchoredPosition: {x: 411.8, y: -33} + m_SizeDelta: {x: 137.2, y: 52.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3397655281057628550 CanvasRenderer: @@ -21962,7 +21962,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: 420.4, y: 290.3} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 125.25, y: 72.82} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &2943735797091566516 @@ -22261,7 +22261,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &374681534325176530 RectTransform: m_ObjectHideFlags: 0 @@ -22276,11 +22276,11 @@ RectTransform: m_Father: {fileID: 772749619619315188} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 354.29996, y: 354.8} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 51, y: 19} m_SizeDelta: {x: 26, y: 26} - m_Pivot: {x: 1.7797618, y: 0.68819666} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3822070334950067397 CanvasRenderer: m_ObjectHideFlags: 0 @@ -23433,7 +23433,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -80.00004, y: -126} - m_SizeDelta: {x: 160, y: 0} + m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0, y: 1} --- !u!222 &3137880424192743195 CanvasRenderer: @@ -23614,16 +23614,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2776193053574990675} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 8.981068} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1470640894515440942} + m_Father: {fileID: 761919767455012465} m_RootOrder: 0 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: -92.1, y: 141.4} + m_AnchoredPosition: {x: -469.6, y: -15.600006} m_SizeDelta: {x: 166, y: 162} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3327170245683651299 @@ -24025,16 +24025,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2915950993045325880} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 8.981068} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2215879582004718398} - m_Father: {fileID: 1470640894515440942} + m_Father: {fileID: 761919767455012465} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 216.7, y: -104.2} + m_AnchoredPosition: {x: 218.59996, y: -107.750046} m_SizeDelta: {x: 218, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &696698095495310382 @@ -45273,13 +45273,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7187647761999659129} - - {fileID: 4998246820548927141} - - {fileID: 6825316960939884882} - {fileID: 9158673223480268760} - - {fileID: 772749619619315188} m_Father: {fileID: 986452627335843391} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -55309,7 +55305,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5034612710644007650 RectTransform: m_ObjectHideFlags: 0 @@ -55324,12 +55320,12 @@ RectTransform: - {fileID: 2143439897358225204} - {fileID: 5403756415749798728} - {fileID: 4196182477682311981} - m_Father: {fileID: 986452627335843391} - m_RootOrder: 6 + m_Father: {fileID: 1612271237950830011} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1680, y: 2086} + m_AnchoredPosition: {x: 692, y: 2172} m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.49999973, y: 0.50000036} --- !u!222 &4883613866719607552 @@ -67199,7 +67195,8 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 5034612710644007650} m_Father: {fileID: 986452627335843391} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -74554,7 +74551,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6084588643388886236} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 8.981068} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7931078687530562384} @@ -74563,12 +74560,12 @@ RectTransform: - {fileID: 6344674214210519577} - {fileID: 647437164561264364} - {fileID: 1848489891166427785} - m_Father: {fileID: 1470640894515440942} + m_Father: {fileID: 761919767455012465} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -72} + m_AnchoredPosition: {x: 81.899994, y: -75.55005} m_SizeDelta: {x: 137, y: 137} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1680107606584974350 @@ -77101,8 +77098,8 @@ RectTransform: - {fileID: 7094943317510879996} - {fileID: 1508767087665272957} - {fileID: 173960748325300965} + - {fileID: 761919767455012465} - {fileID: 1470640894515440942} - - {fileID: 5034612710644007650} - {fileID: 1612271237950830011} - {fileID: 8831099743542526053} - {fileID: 7019400324678272696} @@ -88632,10 +88629,10 @@ RectTransform: m_Father: {fileID: 4196182477682311981} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 0} + m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0, y: 1} --- !u!222 &8027968061220517403 CanvasRenderer: @@ -88717,6 +88714,45 @@ RectTransform: m_AnchoredPosition: {x: -1003.2, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8181657184753742378 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 761919767455012465} + m_Layer: 0 + m_Name: Up + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &761919767455012465 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8181657184753742378} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -8.981068} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7187647761999659129} + - {fileID: 4998246820548927141} + - {fileID: 6825316960939884882} + - {fileID: 772749619619315188} + m_Father: {fileID: 986452627335843391} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000015258789, y: -50} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8190177820551321418 GameObject: m_ObjectHideFlags: 0 @@ -93789,7 +93825,7 @@ RectTransform: - {fileID: 4261057833087068731} - {fileID: 918793633740857750} m_Father: {fileID: 1470640894515440942} - m_RootOrder: 3 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index a028b3f817..d62cf12738 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -69,19 +69,19 @@ function this:InitComponent() this.decorateRoot = Util.GetGameObject(self.gameObject, "bg/decorate") self.ctrl = Util.GetGameObject(self.gameObject, "scene/ctrl") - this.heroTeamPowerBtn = Util.GetGameObject(self.gameObject, "LeftUp/powerBtn") - this.heroTeamPower = Util.GetGameObject(self.gameObject, "LeftUp/powerBtn/value"):GetComponent("Text") + this.heroTeamPowerBtn = Util.GetGameObject(self.gameObject, "Up/powerBtn") + this.heroTeamPower = Util.GetGameObject(self.gameObject, "Up/powerBtn/value"):GetComponent("Text") ---------------topLeftPart---------------- --headBox - this.level = Util.GetGameObject(self.gameObject, "LeftUp/headBox/lvFrame/lv"):GetComponent("Text") - this.playName = Util.GetGameObject(self.gameObject, "LeftUp/headBox/name"):GetComponent("Text") - this.expSliderValue = Util.GetGameObject(self.gameObject, "LeftUp/headBox/exp"):GetComponent("Slider") + this.level = Util.GetGameObject(self.gameObject, "Up/headBox/lvFrame/lv"):GetComponent("Text") + this.playName = Util.GetGameObject(self.gameObject, "Up/headBox/name"):GetComponent("Text") + this.expSliderValue = Util.GetGameObject(self.gameObject, "Up/headBox/exp"):GetComponent("Slider") this.expSliderValue.transform.localScale = Vector3.New(UIManager.adapterScale, 1, 1) - this.headBox = Util.GetGameObject(self.gameObject, "LeftUp/headBox") - this.headPos = Util.GetGameObject(self.gameObject, "LeftUp/headBox/headpos") - this.headRedpot = Util.GetGameObject(self.gameObject, "LeftUp/headBox/redpot") + this.headBox = Util.GetGameObject(self.gameObject, "Up/headBox") + this.headPos = Util.GetGameObject(self.gameObject, "Up/headBox/headpos") + this.headRedpot = Util.GetGameObject(self.gameObject, "Up/headBox/redpot") -- 七日登陆奖励预览入口 this.sgBtn=Util.GetGameObject(self.gameObject,"LeftUp/sevenGift") @@ -97,9 +97,9 @@ function this:InitComponent() effectAdapte(Util.GetGameObject(this.sgEffect[2], "ziti mask (1)")) -- 特权 - this.vipPrivilegeBtn = Util.GetGameObject(self.gameObject, "LeftUp/vipPrivilege/vipPrivilegeBtn") + this.vipPrivilegeBtn = Util.GetGameObject(self.gameObject, "Up/vipPrivilege/vipPrivilegeBtn") this.vipLevelText = Util.GetGameObject(this.vipPrivilegeBtn, "bg/vip"):GetComponent("Image") - this.vipRedPoint = Util.GetGameObject(self.gameObject, "LeftUp/vipPrivilege/redPoint") + this.vipRedPoint = Util.GetGameObject(self.gameObject, "Up/vipPrivilege/redPoint") screenAdapte(this.vipPrivilegeBtn) ---------------topRightPart---------------- -- 邮件 @@ -228,7 +228,7 @@ function this:InitComponent() this.battleUpLvTip = Util.GetGameObject(self.gameObject, "LeftDown/battleUpLvTip") Util.GetGameObject(self.gameObject, "LeftDown/battleUpLvTip/Text"):GetComponent("Text").text = Language[10610] - this.activityTabPrefab = Util.GetGameObject(self.gameObject, "activityTabPrefab") + this.activityTabPrefab = Util.GetGameObject(self.gameObject, "RightUp/activityTabPrefab") this.RightUp = Util.GetGameObject(self.gameObject, "RightUp") end