From f580db9af8bb026b3de5d774ad06d21a2c255fca Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Sat, 11 Nov 2023 16:13:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E9=89=B4=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/HandBook/HandBookHeroInfoPanel.prefab | 357 +++++++++--------- .../HandBook/HandBookHeroInfoPanel.lua | 11 +- .../~Lua/Modules/Main/MainPanel.lua | 4 +- 3 files changed, 189 insertions(+), 183 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index 2791360b1e..c682122797 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -1002,8 +1002,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 296, y: 100} + m_AnchoredPosition: {x: 0.00012207031, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0, y: 0.5} --- !u!114 &8613212963809518708 MonoBehaviour: @@ -1058,7 +1058,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4524858250337138629 RectTransform: m_ObjectHideFlags: 0 @@ -1077,7 +1077,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0.004638672, y: -3.1762695} + m_AnchoredPosition: {x: 0.004638672, y: 159} m_SizeDelta: {x: 1092.623, y: 226.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4748971746950800508 @@ -1908,8 +1908,8 @@ 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: -1944, y: -811} - m_SizeDelta: {x: 185, y: 126} + m_AnchoredPosition: {x: -1944, y: -688} + m_SizeDelta: {x: 185, y: 170} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1976477765329352060 CanvasRenderer: @@ -1939,7 +1939,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 0e97e3866623faa4fa4a58ebb054267c, type: 3} + m_Sprite: {fileID: 21300000, guid: 70880bb948d704640910d7f25d8c5294, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2027,7 +2027,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 102.700195} + m_AnchoredPosition: {x: 0, y: 134} m_SizeDelta: {x: 0, y: 263.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8152786365041841647 @@ -2887,7 +2887,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f2393ce2d23f490409ca62cfa0b8f917, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3103,7 +3103,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -3201,7 +3201,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &151153828115915859 RectTransform: m_ObjectHideFlags: 0 @@ -4072,7 +4072,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: 62.5, y: 51.7} + m_AnchoredPosition: {x: 72, y: 74} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2456957697074920809 @@ -5238,7 +5238,6 @@ GameObject: m_Component: - component: {fileID: 8085008652633923446} - component: {fileID: 9216315025926875413} - - component: {fileID: 8641692091279887183} m_Layer: 0 m_Name: BG m_TagString: Untagged @@ -5273,35 +5272,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7729263943990716201} m_CullTransparentMesh: 0 ---- !u!114 &8641692091279887183 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7729263943990716201} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: fefc7ad231e7d6c44885c22982f15ec5, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &7845940882236901331 GameObject: m_ObjectHideFlags: 0 @@ -5937,6 +5907,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 288459095529088211, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 50 + objectReference: {fileID: 0} - target: {fileID: 288459095529088211, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.y @@ -6135,7 +6110,7 @@ PrefabInstance: - target: {fileID: 6649761076695134487, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_SizeDelta.x - value: 725 + value: 829 objectReference: {fileID: 0} - target: {fileID: 7424580891832051221, guid: 468617cab16b1b247861a34c84c17093, type: 3} @@ -6147,10 +6122,15 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 7424580891832051221, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 58 + objectReference: {fileID: 0} - target: {fileID: 7424580891832051221, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.y - value: -71.2 + value: -72.8 objectReference: {fileID: 0} - target: {fileID: 7425260733858837201, guid: 468617cab16b1b247861a34c84c17093, type: 3} @@ -6165,12 +6145,12 @@ PrefabInstance: - target: {fileID: 7425260733858837201, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.x - value: 280.3 + value: 281.8 objectReference: {fileID: 0} - target: {fileID: 7425260733858837201, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.y - value: -71.2 + value: -72.8 objectReference: {fileID: 0} - target: {fileID: 7470497926375016518, guid: 468617cab16b1b247861a34c84c17093, type: 3} @@ -6225,7 +6205,7 @@ PrefabInstance: - target: {fileID: 2181723802121226830, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.x - value: 68.5 + value: 172.5 objectReference: {fileID: 0} - target: {fileID: 2181723802121226830, guid: 468617cab16b1b247861a34c84c17093, type: 3} @@ -6245,7 +6225,7 @@ PrefabInstance: - target: {fileID: 2688983579222302947, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.x - value: 254.5 + value: 358.5 objectReference: {fileID: 0} - target: {fileID: 2688983579222302947, guid: 468617cab16b1b247861a34c84c17093, type: 3} @@ -6265,7 +6245,7 @@ PrefabInstance: - target: {fileID: 3627422791913238524, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.x - value: 434.5 + value: 538.5 objectReference: {fileID: 0} - target: {fileID: 3627422791913238524, guid: 468617cab16b1b247861a34c84c17093, type: 3} @@ -6285,7 +6265,7 @@ PrefabInstance: - target: {fileID: 4818989176614590151, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.x - value: 556.5 + value: 660.5 objectReference: {fileID: 0} - target: {fileID: 4818989176614590151, guid: 468617cab16b1b247861a34c84c17093, type: 3} @@ -6310,7 +6290,7 @@ PrefabInstance: - target: {fileID: 4819007058318505781, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.x - value: 161.5 + value: 265.5 objectReference: {fileID: 0} - target: {fileID: 4819007058318505781, guid: 468617cab16b1b247861a34c84c17093, type: 3} @@ -6335,7 +6315,7 @@ PrefabInstance: - target: {fileID: 4819109994795866467, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.x - value: 344.5 + value: 448.5 objectReference: {fileID: 0} - target: {fileID: 4819109994795866467, guid: 468617cab16b1b247861a34c84c17093, type: 3} @@ -6360,7 +6340,7 @@ PrefabInstance: - target: {fileID: 4819477450374255893, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.x - value: 725 + value: 829 objectReference: {fileID: 0} - target: {fileID: 4819477450374255893, guid: 468617cab16b1b247861a34c84c17093, type: 3} @@ -6380,7 +6360,7 @@ PrefabInstance: - target: {fileID: 4819684952267538129, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.x - value: 33 + value: 85 objectReference: {fileID: 0} - target: {fileID: 4819684952267538129, guid: 468617cab16b1b247861a34c84c17093, type: 3} @@ -6412,6 +6392,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 234773552175970050, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 66 + objectReference: {fileID: 0} - target: {fileID: 234773552175970050, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.y @@ -6432,6 +6417,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 795023335143010707, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 77 + objectReference: {fileID: 0} - target: {fileID: 795023335143010707, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.y @@ -6507,11 +6497,21 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 5008758593417663298, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 77 + objectReference: {fileID: 0} - target: {fileID: 5008758593417663298, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.y value: -23.6125 objectReference: {fileID: 0} + - target: {fileID: 5008758593417663298, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + propertyPath: m_SizeDelta.x + value: 104 + objectReference: {fileID: 0} - target: {fileID: 5283497588684384598, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_TargetGraphic @@ -6537,6 +6537,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 6999188819516963148, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 71 + objectReference: {fileID: 0} - target: {fileID: 6999188819516963148, guid: 468617cab16b1b247861a34c84c17093, type: 3} propertyPath: m_AnchoredPosition.y @@ -6639,42 +6644,6 @@ PrefabInstance: objectReference: {fileID: 3212677601990559794} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 468617cab16b1b247861a34c84c17093, type: 3} ---- !u!114 &5801667295543234053 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5801667296641823765, guid: 468617cab16b1b247861a34c84c17093, - type: 3} - m_PrefabInstance: {fileID: 1586313744} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &3567789177352917364 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3567789178250308452, guid: 468617cab16b1b247861a34c84c17093, - type: 3} - m_PrefabInstance: {fileID: 1586313744} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &745258826316257641 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 745258827095679865, guid: 468617cab16b1b247861a34c84c17093, - type: 3} - m_PrefabInstance: {fileID: 1586313744} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &415305660951919013 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 415305659516601269, guid: 468617cab16b1b247861a34c84c17093, @@ -6687,12 +6656,60 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1626957794317592051 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1626957793134600163, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + m_PrefabInstance: {fileID: 1586313744} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5648199679115404159 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5648199678352365935, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + m_PrefabInstance: {fileID: 1586313744} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &793571998940186964 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 793571997959058244, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + m_PrefabInstance: {fileID: 1586313744} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &4078578892595093581 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4078578892015950429, guid: 468617cab16b1b247861a34c84c17093, type: 3} m_PrefabInstance: {fileID: 1586313744} m_PrefabAsset: {fileID: 0} +--- !u!114 &9210540043962569155 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 9210540042713000915, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + m_PrefabInstance: {fileID: 1586313744} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &341222316883591154 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 341222318133282274, guid: 468617cab16b1b247861a34c84c17093, @@ -6705,9 +6722,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &2121817464057637238 stripped +--- !u!224 &1850157548528732598 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1850157547883672486, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + m_PrefabInstance: {fileID: 1586313744} + m_PrefabAsset: {fileID: 0} +--- !u!114 &48726414869426410 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2121817462489813862, guid: 468617cab16b1b247861a34c84c17093, + m_CorrespondingSourceObject: {fileID: 48726416186231546, guid: 468617cab16b1b247861a34c84c17093, type: 3} m_PrefabInstance: {fileID: 1586313744} m_PrefabAsset: {fileID: 0} @@ -6717,9 +6740,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &793571998940186964 stripped +--- !u!114 &5799327458374448959 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 793571997959058244, guid: 468617cab16b1b247861a34c84c17093, + m_CorrespondingSourceObject: {fileID: 5799327457662127407, guid: 468617cab16b1b247861a34c84c17093, type: 3} m_PrefabInstance: {fileID: 1586313744} m_PrefabAsset: {fileID: 0} @@ -6741,18 +6764,6 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &5799327458374448959 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5799327457662127407, guid: 468617cab16b1b247861a34c84c17093, - type: 3} - m_PrefabInstance: {fileID: 1586313744} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &5202931909340412864 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5202931908023583184, guid: 468617cab16b1b247861a34c84c17093, @@ -6777,30 +6788,12 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &5648199679115404159 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5648199678352365935, guid: 468617cab16b1b247861a34c84c17093, +--- !u!224 &3770994322754615037 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3770994322174938349, guid: 468617cab16b1b247861a34c84c17093, type: 3} m_PrefabInstance: {fileID: 1586313744} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1626957794317592051 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1626957793134600163, guid: 468617cab16b1b247861a34c84c17093, - type: 3} - m_PrefabInstance: {fileID: 1586313744} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &3627422791265370336 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3627422790351223536, guid: 468617cab16b1b247861a34c84c17093, @@ -6849,18 +6842,12 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &3212677601990559794 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3212677601009955362, guid: 468617cab16b1b247861a34c84c17093, +--- !u!224 &4819124223079371455 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4819124223994587311, guid: 468617cab16b1b247861a34c84c17093, type: 3} m_PrefabInstance: {fileID: 1586313744} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &3627422790634649912 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3627422792068236072, guid: 468617cab16b1b247861a34c84c17093, @@ -6873,12 +6860,30 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &3770994322754615037 stripped +--- !u!224 &5276636554200323067 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 3770994322174938349, guid: 468617cab16b1b247861a34c84c17093, + m_CorrespondingSourceObject: {fileID: 5276636554830195179, guid: 468617cab16b1b247861a34c84c17093, type: 3} m_PrefabInstance: {fileID: 1586313744} m_PrefabAsset: {fileID: 0} +--- !u!224 &8578032120255413264 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8578032118938715648, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + m_PrefabInstance: {fileID: 1586313744} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3212677601990559794 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3212677601009955362, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + m_PrefabInstance: {fileID: 1586313744} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &4977516612952781682 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4977516612038609250, guid: 468617cab16b1b247861a34c84c17093, @@ -6891,30 +6896,6 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &1850157548528732598 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1850157547883672486, guid: 468617cab16b1b247861a34c84c17093, - type: 3} - m_PrefabInstance: {fileID: 1586313744} - m_PrefabAsset: {fileID: 0} ---- !u!224 &5276636554200323067 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5276636554830195179, guid: 468617cab16b1b247861a34c84c17093, - type: 3} - m_PrefabInstance: {fileID: 1586313744} - m_PrefabAsset: {fileID: 0} ---- !u!224 &4819124223079371455 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4819124223994587311, guid: 468617cab16b1b247861a34c84c17093, - type: 3} - m_PrefabInstance: {fileID: 1586313744} - m_PrefabAsset: {fileID: 0} ---- !u!224 &8578032120255413264 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8578032118938715648, guid: 468617cab16b1b247861a34c84c17093, - type: 3} - m_PrefabInstance: {fileID: 1586313744} - m_PrefabAsset: {fileID: 0} --- !u!114 &1025801120123142962 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1025801121239562530, guid: 468617cab16b1b247861a34c84c17093, @@ -6939,21 +6920,45 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &9210540043962569155 stripped +--- !u!114 &5801667295543234053 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 9210540042713000915, guid: 468617cab16b1b247861a34c84c17093, - type: 3} - m_PrefabInstance: {fileID: 1586313744} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &48726414869426410 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 48726416186231546, guid: 468617cab16b1b247861a34c84c17093, + m_CorrespondingSourceObject: {fileID: 5801667296641823765, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + m_PrefabInstance: {fileID: 1586313744} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &3567789177352917364 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3567789178250308452, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + m_PrefabInstance: {fileID: 1586313744} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &745258826316257641 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 745258827095679865, guid: 468617cab16b1b247861a34c84c17093, + type: 3} + m_PrefabInstance: {fileID: 1586313744} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2121817464057637238 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2121817462489813862, guid: 468617cab16b1b247861a34c84c17093, type: 3} m_PrefabInstance: {fileID: 1586313744} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua index 892e06cd9e..72ca22f9a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua @@ -3,13 +3,13 @@ HandBookHeroInfoPanel = Inherit(BasePanel) local this = HandBookHeroInfoPanel local tabs = { - [RoleInfoPanelIndex.qingbao] = {default = "UI_hz_yt_01", lock = "r_hero_xuanze_002", select = "UI_hz_yt_01",title = Language[11093], sub = SubUIConfig.HandBookRoleInfoLayout + [RoleInfoPanelIndex.qingbao] = {default = "UI_hz_gonghui_31", lock = "UI_hz_gonghui_31", select = "UI_hz_gonghui_31",title = Language[11093], sub = SubUIConfig.HandBookRoleInfoLayout }, - [RoleInfoPanelIndex.shenhun] = {default = "UI_hz_yt_02", lock = "r_hero_xuanze_002", select = "UI_hz_yt_02",title = "神魂",sub = SubUIConfig.RoleGodSoulLayout + [RoleInfoPanelIndex.shenhun] = {default = "UI_hz_gonghui_32", lock = "UI_hz_gonghui_32", select = "UI_hz_gonghui_32",title = "神魂",sub = SubUIConfig.RoleGodSoulLayout }, - [RoleInfoPanelIndex.chuanshuo] = {default = "UI_hz_yt_03", lock = "r_hero_xuanze_002", select = "UI_hz_yt_03",title = Language[11095], sub = SubUIConfig.RoleStoryLayout + [RoleInfoPanelIndex.chuanshuo] = {default = "UI_hz_gonghui_33", lock = "UI_hz_gonghui_33", select = "UI_hz_gonghui_33",title = Language[11095], sub = SubUIConfig.RoleStoryLayout }, - [RoleInfoPanelIndex.pifu] = {default = "UI_hz_yt_04", lock = "r_hero_xuanze_002", select = "UI_hz_yt_04",title = Language[11816], sub = SubUIConfig.HandBookRoleSkinPanel + [RoleInfoPanelIndex.pifu] = {default = "UI_hz_gonghui_34", lock = "UI_hz_gonghui_34", select = "UI_hz_gonghui_34",title = Language[11816], sub = SubUIConfig.HandBookRoleSkinPanel }, } @@ -379,6 +379,7 @@ function HandBookHeroInfoPanel:UpdateBtnList() tabsList[k].gameObject:SetActive(true) end local title = Util.GetGameObject(tabsList[k], "Text"):GetComponent("Text") + Util.GetGameObject(tabsList[k], "Image"):GetComponent("Image").sprite=this.spLoader:LoadSprite(tabs[k].default) title.text = GetCurLanguage() == 0 and tabs[k].title or ""..tabs[k].title.."" Util.AddOnceClick(tabsList[k],function() if k == _CurPageIndex then @@ -396,7 +397,7 @@ function HandBookHeroInfoPanel:SetSelectBtn(index) this.select.transform:SetParent(tabsList[index].transform) this.select.transform.localScale = Vector3.one this.select.transform.localPosition=Vector3.zero - this.select.transform:SetAsFirstSibling() + this.select.transform:SetAsLastSibling() end -- tab改变事件 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index e473728119..96ecedb447 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -687,9 +687,9 @@ function this:BindEvent() end) Util.AddClick(this.btnPokemon, function () - --this.FunctionClickEvent(FUNCTION_OPEN_TYPE.POKEMON, function () + this.FunctionClickEvent(FUNCTION_OPEN_TYPE.POKEMON, function () UIManager.OpenPanel(UIName.PokemonMainPanel) - --end) + end) this.ScenceBtnClick(FUNCTION_OPEN_TYPE.POKEMON) end)