From 59c2caaedeb733cbbe33ea0d51e740d1d1311968 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 3 Mar 2021 15:51:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=80=81=E7=A5=9E=E7=A5=A0=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E5=8C=96=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/GeneralPopup.prefab | 12 ++++---- .../Prefabs/UI/Recruit/RecruitPanel.prefab | 28 +++++++++---------- .../Prefabs/UI/Resolve/ResolvePanel.prefab | 20 ++++++------- .../~Lua/Modules/Resolve/ResolvePanel.lua | 2 +- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index f1ae2a30fd..09b6a2f2fe 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -31521,7 +31521,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: 47.9, y: 9.1} + m_AnchoredPosition: {x: 1, y: 9.1} m_SizeDelta: {x: 289.1, y: 64.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8396400340186174006 @@ -31559,12 +31559,12 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 50 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u91CD\u7F6E\u540E\u83B7\u5F97" LanguageIndex: 11253 --- !u!1 &8396400340256539901 @@ -31985,7 +31985,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: -237.2, y: 0} + m_AnchoredPosition: {x: -275, y: 0} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8396400340969577150 @@ -32278,7 +32278,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 136.3, y: 0.000024795532} + m_AnchoredPosition: {x: 278.3, y: 0.000024795532} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8396400341234915389 diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab index 2cd288154f..c3d43b3564 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab @@ -5620,7 +5620,7 @@ ParticleSystem: --- !u!199 &6259170830804911733 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10345,7 +10345,7 @@ ParticleSystem: --- !u!199 &7663224388703278961 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15733,7 +15733,7 @@ ParticleSystem: --- !u!199 &8731954686797860230 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20458,7 +20458,7 @@ ParticleSystem: --- !u!199 &8433999198031367376 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25219,7 +25219,7 @@ ParticleSystem: --- !u!199 &3108859455760721518 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25609,16 +25609,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3962025299537141362} - m_LocalRotation: {x: -0.029347772, y: 0.99956924, z: -0, w: 0} + m_LocalRotation: {x: 0.0026179885, y: 0.9999966, z: -4.902275e-10, w: -0.00000018725288} m_LocalPosition: {x: 0, y: 0, z: -5740.3} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2376853810968510760} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180.00002, z: -3.3630002} + m_LocalEulerAnglesHint: {x: 0, y: 180.00002, z: 0.3} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 179, y: -32} + m_AnchoredPosition: {x: 179, y: -40} m_SizeDelta: {x: 418.9, y: 94.2} m_Pivot: {x: 0, y: 0} --- !u!222 &4244644069300043371 @@ -30481,7 +30481,7 @@ ParticleSystem: --- !u!199 &8993958049925528917 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35677,7 +35677,7 @@ ParticleSystem: --- !u!199 &6352028774183577065 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -40380,7 +40380,7 @@ ParticleSystem: --- !u!199 &6341223334757385390 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -45638,7 +45638,7 @@ ParticleSystem: --- !u!199 &1364151743088453039 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -50590,7 +50590,7 @@ ParticleSystem: --- !u!199 &8405279735407594183 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55519,7 +55519,7 @@ ParticleSystem: --- !u!199 &1786108631160810919 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab index 48a9061ef3..4606233dc4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab @@ -574,9 +574,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u53D6\u6D88\u9009\u62E9" LanguageIndex: 11518 --- !u!1 &456371450814405358 @@ -5052,7 +5052,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.00003862381, y: -0} + m_AnchoredPosition: {x: 0.00003862381, y: 0} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1431152599248779388 @@ -7200,7 +7200,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: 281.05, y: -63.65} + m_AnchoredPosition: {x: 184.52998, y: -63.65} m_SizeDelta: {x: 190, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5004630570938477890 @@ -11407,7 +11407,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.000011444, y: -0.0000048876} + m_AnchoredPosition: {x: -4, y: -0.0000048876} m_SizeDelta: {x: 450, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1331333474934079865 @@ -15018,7 +15018,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &911264942551820820 RectTransform: m_ObjectHideFlags: 0 @@ -15418,11 +15418,11 @@ RectTransform: m_Father: {fileID: 2822836076449748321} m_RootOrder: 1 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: 224, y: 797} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -96, y: -52} m_SizeDelta: {x: 341, y: 120} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 1} --- !u!222 &749525681463256778 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua index 5a1d98c7f6..d1c113a4c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua @@ -58,7 +58,7 @@ function ResolvePanel:InitComponent() this.selectHeroBtn = Util.GetGameObject(this.panel, "endTabs/selectBtn") for i = 1, 5 do heroEndBtns[i]=Util.GetGameObject(this.panel, "endTabs/btnHeroGrid/btnHeroGrid/Btn"..i-1) - Util.GetGameObject(heroEndBtns[i],"Image"):GetComponent("Image").sprite = Util.LoadSprite(PropertyIcon[i]) + Util.GetGameObject(heroEndBtns[i],"Image"):GetComponent("Image").sprite = Util.LoadSprite(PropertyIcon[i-1]) end for i = 1, #this.contents do this.contents[i].view:InitComponent(this.panel)