From 8232879006811942e46efce3219533e32a43570e Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 4 Sep 2020 14:30:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BF=9F=E6=8E=92=E5=90=8D=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4=E3=80=81=E6=97=A5=E5=B8=B8=E6=9C=AC?= =?UTF-8?q?=E5=BA=95=E9=83=A8=E9=80=82=E9=85=8D=E3=80=81=E4=B8=87=E8=B1=A1?= =?UTF-8?q?=E5=A2=83=E2=80=9C=E6=96=B0=E2=80=9D=E5=AD=97bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Carbon/DailyCarbonPanel.prefab | 49 ++++++++++++++++--- .../CarDelay/GuildCarDelayMainPanel.prefab | 2 +- .../~Lua/Common/GlobalDefine.lua | 2 +- .../FunctionOpenMananger.lua | 4 +- .../~Lua/Modules/Main/MainPanel.lua | 3 +- 5 files changed, 47 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab index b1f3d01e54..dd80f511af 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab @@ -1056,7 +1056,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000022888184, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 66.8, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5726459732758174366 @@ -1593,11 +1593,11 @@ RectTransform: m_Father: {fileID: 426311262980600154} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 69.44, y: 50} - m_SizeDelta: {x: 941.13, y: 100} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0.000000018403833, y: 50} + m_SizeDelta: {x: 119.2, y: 100} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &4153919401695343612 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1611,11 +1611,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 150 m_Right: 0 m_Top: 0 m_Bottom: 80 - m_ChildAlignment: 5 + m_ChildAlignment: 3 m_Spacing: 30 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -1630,6 +1630,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 426311262980600154} + - component: {fileID: 1079964709111871156} m_Layer: 0 m_Name: TabBox m_TagString: Untagged @@ -1659,6 +1660,38 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 50} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1079964709111871156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6097502257844573580} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 7598740983930717330} + m_Horizontal: 1 + m_Vertical: 0 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &6123728693806646651 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab index 5c001404bd..1d4ad63f93 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab @@ -1612,7 +1612,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: 0, y: -594} + m_AnchoredPosition: {x: 0, y: -559} m_SizeDelta: {x: 1080, y: 532} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8766085350830876584 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 891d4dcaac..94e33521d0 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1193,7 +1193,7 @@ FUNCTION_OPEN_TYPE = { GUILD = 4, -- 公会 ADVENTURE=7, -- 秘境 ARENA = 8, -- 竞技场 - MISSIONDAILY = 12, -- 每日任务 + MISSIONDAILY = 12, -- 每日任务 CHAT = 14, -- 聊天 NORMALCARBON=17, -- 普通副本 SHOP = 20, -- 商店 diff --git a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua index d81dbce148..67a5cb4740 100644 --- a/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua +++ b/Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/FunctionOpenMananger.lua @@ -17,7 +17,7 @@ function this.Initialize() this.Insert(FUNCTION_OPEN_TYPE.HERO_RESOLVE, mainCity) -- this.Insert(FUNCTION_OPEN_TYPE.HAND_BOOK, mainCity) this.Insert(FUNCTION_OPEN_TYPE.ARENA, mainCity) - this.Insert(FUNCTION_OPEN_TYPE.TRIAL, mainCity) + this.Insert(FUNCTION_OPEN_TYPE.ENDLESS, mainCity) -- this.Insert(FUNCTION_OPEN_TYPE.GUILD, mainCity) -- this.Insert(FUNCTION_OPEN_TYPE.MONSTER_COMING, mainCity) this.Insert(FUNCTION_OPEN_TYPE.COMPOUND, mainCity) @@ -43,7 +43,7 @@ function this.GetModuleOpen(openId) local saveValue = PlayerPrefs.GetInt(PlayerManager.uid .. FUNC_OPEN_STR[openId]) local funcOpen = ActTimeCtrlManager.IsQualifiled(openId) isOpen = saveValue == 0 and funcOpen - --Log(string.format("解锁功能ID %s and 状态 %s", openId, tostring(isOpen))) + Log(string.format("解锁功能ID %s and 状态 %s", openId, tostring(isOpen))) return isOpen end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index b6dd09c9dc..629933bd32 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -268,7 +268,7 @@ function this:InitComponent() [FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:InsertNewText(this.btnFenjie), --[FUNCTION_OPEN_TYPE.HAND_BOOK] = this:InsertNewText(this.btnTujian), [FUNCTION_OPEN_TYPE.ARENA] = this:InsertNewText(this.btnJingjichang), - [FUNCTION_OPEN_TYPE.TRIAL] = this:InsertNewText(this.btnColorfulWorld), + [FUNCTION_OPEN_TYPE.ENDLESS] = this:InsertNewText(this.btnColorfulWorld), -- [FUNCTION_OPEN_TYPE.MONSTER_COMING] = this:InsertNewText(this.btnMonster), --[FUNCTION_OPEN_TYPE.EXPEDITION] = this:InsertNewText(this.btnExpedition), [FUNCTION_OPEN_TYPE.COMPOUND] = this:InsertNewText(this.btnEquipCompound), @@ -680,6 +680,7 @@ function this:BindEvent() local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.ENDLESS) PopupTipPanel.ShowTip(string.format(Language[12297],config.OpenRules[2])) end + this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ENDLESS) end) Util.AddClick(this.btnFenjie, function() JumpManager.GoJump(24001)