From 412616ff78b2c6cba53f545803bd2c2c8ac9b5ff Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 12 Apr 2021 18:29:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E5=B1=8F=E8=94=BD=E7=A7=B0?= =?UTF-8?q?=E5=8F=B7=E9=A1=B5=E7=AD=BE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua index 6353f66070..0f780fb3bb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPanel.lua @@ -8,7 +8,7 @@ local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12266] , rpType = RedPointType.Setting_Head}, -- [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "称号" }, [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12267] , rpType = RedPointType.Setting_Ride}, - [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "称号",rpType = RedPointType.Setting_Title }, + -- [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "称号",rpType = RedPointType.Setting_Title }, } local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)} @@ -22,7 +22,7 @@ this.contents = { [2] = {view = require("Modules/Setting/SettingPlayerRide"), panelName = "settingPlayerRide"}, --坐骑 -- [4] = {view = require("Modules/Setting/SettingPlayerSkin"), panelName = "settingPlayerSkin"}, - [3] = {view = require("Modules/Setting/SettingPlayerTitle"), panelName = "settingPlayerTitle"}, + -- [3] = {view = require("Modules/Setting/SettingPlayerTitle"), panelName = "settingPlayerTitle"}, } --子模块预设 this.prefabs={} From 93da11a3b71709319e6dcae05335a74ccf7429ed Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 12 Apr 2021 18:56:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E5=BC=95=E5=AF=BC=E3=80=91?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=81=87=E6=88=98=E6=96=97=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9sdk=E8=8E=B7=E5=8F=96=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 9191858991..45fb1228d5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -470,9 +470,9 @@ function this.ExecuteLoading() -- 新的引导 -- StoryManager.EventTrigger(300001) --创号阶段先进入剧情对话,进入假战斗,然后对话起名,最后进入主界面 - StoryManager.EventTrigger(300001) + -- StoryManager.EventTrigger(300001) -- 新的引导 - -- StoryManager.EventTrigger(100001) + StoryManager.EventTrigger(100001) else PatFaceManager.isLogin = true UIManager.OpenPanel(UIName.FightPointPassMainPanel) @@ -556,7 +556,7 @@ function this.RequestHttpLogin() local url = "" if IsSDKLogin then url = LoginRoot_Url - .. "jl_loginserver/getHwUserInfo?openId=" .. AppConst.OpenId + .. "jl_loginserver/getUserInfo?openId=" .. AppConst.OpenId .. "&serverId=" .. LoginManager.ServerId .. "&token=" .. AppConst.TokenStr .. "&platform=" .. 1 From 2a94f1127f0ec771845f25d1f0bf4ad9e256fe3c Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 12 Apr 2021 19:17:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E5=AF=BB=E5=AE=9D=E3=80=91?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab index 24c6c10773..bf6dd95880 100644 --- a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab @@ -7626,7 +7626,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3679961288471251120} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -8052,7 +8052,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &9207170478563030241 RectTransform: m_ObjectHideFlags: 0