From 104aeb9078fd0f30c0804bec17f7c23803cf2d90 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 31 Mar 2021 20:09:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90=E9=80=82=E9=85=8D=E3=80=91?= =?UTF-8?q?=E4=B8=89=E7=95=8C=E9=99=A4=E9=AD=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab index 043384dc14..5a3061fb8f 100644 --- a/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DemonSlayer/DemonSlayerPanel.prefab @@ -612,9 +612,9 @@ RectTransform: m_Father: {fileID: 482684183697153721} m_RootOrder: 3 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: 449, y: 763} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -91, y: 763} m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9085481190610419044 From afa120434167b2f9215150869616ec73ac149246 Mon Sep 17 00:00:00 2001 From: "DESKTOP-98AVA47\\Administrator" Date: Mon, 29 Mar 2021 00:09:21 +0700 Subject: [PATCH 2/6] =?UTF-8?q?=E3=80=90=E7=A7=B0=E5=8F=B7=E5=9D=90?= =?UTF-8?q?=E9=AA=91=E6=97=B6=E8=A3=85=E3=80=91=E4=B8=89=E7=95=8C=E9=99=8D?= =?UTF-8?q?=E9=AD=94=E4=BF=AE=E6=94=B9=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua index 6463ff54a2..31464f9d63 100644 --- a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua @@ -151,7 +151,7 @@ function DemonSlayerPanel:SetRank(ActInfo) designation = allRankData[i].userTitle } npcList[i] = PlayerLiveView:New(livePrefab.transform,2, curPlayerLiveViewData) - npcList[i]:OnOpen(GetPlayerRoleSingleConFig().Scale11,Vector3.New(0,-132.73,0),WALK_DIR.IDLE_LEFT) + npcList[i]:OnOpen(GetPlayerRoleSingleConFig().Scale11,Vector3.New(0,-102.73,0),WALK_DIR.IDLE_LEFT) else image.enabled = true item.text = Language[10423] From 8c2a1c9a5b6274b0e1673df2a2611eec4733053a Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 31 Mar 2021 20:03:21 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90=E5=BC=95=E5=AF=BC=E3=80=91?= =?UTF-8?q?=E5=BC=95=E5=AF=BCGM=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guide/GuideManager.lua | 16 ++++++++++++++++ .../~Lua/Modules/Main/MainPanel.lua | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index 8992b375e0..732217840a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -692,6 +692,22 @@ function this.RefreshTriggerListen(id, openType, openArgs) Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger) end end +--gm 用 +function this.AddFuncGuide(funcId) + if not funcId then return end + LogGreen(funcId.."funcId") + if not AppConst.isGuide then + LogGreen("不在引导内") + return + end + local guideId = GlobalSystemConfig[funcId].GuideId + -- if guideId and guideId ~= 0 then + -- table.insert(_FuncGuideList, guideId) + -- end + LogGreen("guideId:"..guideId) + GuideManager.ShowGuide(guideId) +end + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 901fa6ffb1..8c43efa6c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -135,7 +135,7 @@ function this:InitComponent() this.btnTianShuMiJuan = Util.GetGameObject(this.gameObject, "scene/layer7/btnTianShuMiJuan") this.operateIcon = { [FUNCTION_OPEN_TYPE.SHOP] = this:AddFuncItem(this.btnShangdian, 50), - [FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -200), + [FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -1100), [FUNCTION_OPEN_TYPE.ARENA] = this:AddFuncItem(this.btnJingjichang, -200), [FUNCTION_OPEN_TYPE.ENDLESS] = this:AddFuncItem(this.btnColorfulWorld, -1500), [FUNCTION_OPEN_TYPE.COMPOUND] = this:AddFuncItem(this.btnEquipCompound, -200), From 591af306cd25e08c3b273d41959f584db5a1c3a9 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 31 Mar 2021 21:14:44 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E3=80=90version=E3=80=91b=E7=89=88?= =?UTF-8?q?=E6=B5=8B=E8=AF=95version=E6=96=87=E4=BB=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Version/国内-先遣-B.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Version/国内-先遣-B.txt diff --git a/Version/国内-先遣-B.txt b/Version/国内-先遣-B.txt new file mode 100644 index 0000000000..79b89ff72c --- /dev/null +++ b/Version/国内-先遣-B.txt @@ -0,0 +1 @@ +{"subChannel":"3000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_china/xq/", "packageVersion":"0.1", "version":"0.1.1", "serverUrl":"http://106.52.122.168:8080/"} \ No newline at end of file From 957aff00a5cf938abb7a7c3ce24ac97bafb1b4a3 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 31 Mar 2021 21:19:56 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=90=E6=94=BE=E7=94=9F=E7=81=B5?= =?UTF-8?q?=E5=85=BD=E7=99=BD=E7=89=87=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua index 55e98269c8..2f2baebd0c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua @@ -199,7 +199,7 @@ function this.SwitchView(index,isNotTop,isNotAni) this.shaiBtn:SetActive(false) this.upView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.HeroReturn}) this.bgIma.sprite=Util.LoadSprite(bgImageName[3]) - this.title.sprite=Util.LoadSprite(titleImageName[4]) + this.title.sprite=Util.LoadSprite(titleImageName[3]) end this.title:SetNativeSize() From 3675c7322e4a9541b407a39c2ffa7bd901d0976f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 31 Mar 2021 21:20:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=90version=E3=80=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?b=E6=B5=8B=E7=83=AD=E6=9B=B4=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Version/国内-先遣-B.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Version/国内-先遣-B.txt b/Version/国内-先遣-B.txt index 79b89ff72c..0b7194f09c 100644 --- a/Version/国内-先遣-B.txt +++ b/Version/国内-先遣-B.txt @@ -1 +1 @@ -{"subChannel":"3000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_china/xq/", "packageVersion":"0.1", "version":"0.1.1", "serverUrl":"http://106.52.122.168:8080/"} \ No newline at end of file +{"subChannel":"3000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_china/xq_b/", "packageVersion":"0.1", "version":"0.1.1", "serverUrl":"http://106.52.122.168:8080/"} \ No newline at end of file