From 41716e26504df646d100a798aa3c114dd17f00c7 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Wed, 6 Dec 2023 19:07:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E5=A5=96=E5=8A=B1=20=E9=98=B2=E5=AE=88=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=20=20=20=20=20=E7=AB=9E=E6=8A=80=E5=9C=BA?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=95=8C=E9=9D=A2=E5=B1=8F=E8=94=BD=E5=9B=9E?= =?UTF-8?q?=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Arena/ArenaMainPanel.prefab | 4 +-- .../Prefabs/UI/Arena/ArenaResultPopup.prefab | 30 +++++++++---------- .../Prefabs/UI/Arena/ArenaTypePanel.prefab | 6 ++-- .../Prefabs/UI/RoleInfo/RoleInfoPanel.prefab | 28 ++++++++--------- .../DynamicActivity/ActivityMainPanel.lua | 4 +-- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 2 +- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab index decb71be30..5931f5f37a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab @@ -472,7 +472,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &194317910 RectTransform: m_ObjectHideFlags: 0 @@ -33196,7 +33196,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1775644724898146084 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab index a5104ab6b6..0200f2fb4a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab @@ -19,7 +19,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &79220515 RectTransform: m_ObjectHideFlags: 0 @@ -9813,7 +9813,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8000001, g: 0.6431373, b: 0.30980393, a: 1} + m_Color: {r: 0.9622642, g: 0.9491919, b: 0.92141336, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -9821,7 +9821,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 42 m_FontStyle: 0 m_BestFit: 0 @@ -39340,7 +39340,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &224749122026685894 RectTransform: m_ObjectHideFlags: 0 @@ -39469,7 +39469,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 @@ -49333,7 +49333,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 42 m_FontStyle: 0 m_BestFit: 0 @@ -49429,7 +49429,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 @@ -54434,7 +54434,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 42 m_FontStyle: 0 m_BestFit: 0 @@ -64119,7 +64119,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 @@ -69189,7 +69189,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 42 m_FontStyle: 0 m_BestFit: 0 @@ -99067,7 +99067,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 42 m_FontStyle: 0 m_BestFit: 0 @@ -99209,7 +99209,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 @@ -99426,7 +99426,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -99622,7 +99622,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: -348, y: -179.5} + m_AnchoredPosition: {x: -348, y: -213.3} m_SizeDelta: {x: 162.1, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5704338257378356749 @@ -99699,7 +99699,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab index 03dd74a54a..9fc3c8893f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaTypePanel.prefab @@ -1178,7 +1178,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &925842822 RectTransform: m_ObjectHideFlags: 0 @@ -3364,7 +3364,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: -32.1, y: 429.6} + m_AnchoredPosition: {x: -32.1, y: 16} m_SizeDelta: {x: 884.1, y: 859.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &110786301129899403 @@ -4701,7 +4701,7 @@ MonoBehaviour: - initV3: {x: -1490, y: 366, z: 0} initFloat: 0 isInit: 1 - changeV3: {x: -32.1, y: 429.6, z: 0} + changeV3: {x: -32.1, y: 100, z: 0} changeFloat: 0 duration: 0.3 delay: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index 26c389415b..7d6c616512 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -548,12 +548,12 @@ RectTransform: - {fileID: 1318314100} - {fileID: 1777905881} - {fileID: 1411745461} - m_Father: {fileID: 224750236772289674} - m_RootOrder: 5 + m_Father: {fileID: 7086677512586395648} + 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: 187.68, y: -113.390015} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 126.41, y: 121.21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &706364569 @@ -1291,7 +1291,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1666888405 RectTransform: m_ObjectHideFlags: 0 @@ -1332,7 +1332,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8588236, g: 0.80392164, b: 0.60784316, a: 1} + m_Color: {r: 0.07119971, g: 0.6037736, b: 0.08793546, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1340,7 +1340,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 @@ -1511,7 +1511,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -146.29999, y: -148.70001} + m_AnchoredPosition: {x: -902.00006, y: -148.70001} m_SizeDelta: {x: 184, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1754900210 @@ -2205,7 +2205,6 @@ RectTransform: - {fileID: 8406032689104954205} - {fileID: 1663310713537604196} - {fileID: 6768597193923982555} - - {fileID: 706364568} - {fileID: 6791165304693114092} - {fileID: 7613643595609781893} m_Father: {fileID: 224287801546099592} @@ -56011,11 +56010,11 @@ RectTransform: - {fileID: 3373864472768766744} - {fileID: 8034032021706643642} m_Father: {fileID: 224750236772289674} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -103, y: -291} + m_AnchoredPosition: {x: -80.20001, y: -161.90002} m_SizeDelta: {x: 126.41, y: 121.21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7915203257762827595 @@ -61233,6 +61232,7 @@ RectTransform: - {fileID: 3948678353292142404} - {fileID: 1761062799490895474} - {fileID: 8909364254384106778} + - {fileID: 706364568} m_Father: {fileID: 224287801546099592} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -63363,11 +63363,11 @@ RectTransform: - {fileID: 1298169223546626708} - {fileID: 5450918087930767038} m_Father: {fileID: 224750236772289674} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -105, y: -430} + m_AnchoredPosition: {x: -82.2, y: -300.9} m_SizeDelta: {x: 126.41, y: 121.21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8720233126984017076 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index fe9e791717..66e7191b3f 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -227,7 +227,7 @@ function this.PageTabAdapter(tab, index, status) -- if not sprite then -- sprite = (status == "select" and tabs[index].Icon[2] or tabs[index].Icon[1]) -- end - --if sprite==nil or sprite=="" then + if sprite==nil or sprite=="" then local num=1 if index %4==0 then num=1 @@ -235,7 +235,7 @@ function this.PageTabAdapter(tab, index, status) num=index%4 end sprite="UI_hz_gonghui_3"..num - --end + end img.sprite = this.spLoader:LoadSprite(sprite) -- img:SetNativeSize() diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 2e52e14a17..cbd907f4f2 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -151,7 +151,7 @@ function RoleInfoPanel:InitComponent() this.btnMask = Util.GetGameObject(self.transform, "btnMask") this.btnMask.gameObject:SetActive(false) - this.tianfuBtn=Util.GetGameObject(self.transform,"rolePanel/tianfuBtn") --该按钮控制入口显隐 + this.tianfuBtn=Util.GetGameObject(self.transform,"rightGrid/tianfuBtn") --该按钮控制入口显隐 this.trainingBtn=Util.GetGameObject(self.transform,"rightGrid/trainingBtn") --该按钮控制入口显隐 this.trainingClick=Util.GetGameObject(self.transform,"rightGrid/trainingBtn/panel") --该按钮控制入口显隐 this.tianfuClick=Util.GetGameObject(this.tianfuBtn,"panel") --控制按钮的点击事件 置灰