diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab index a1de854cd1..9013b83c8e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab @@ -243233,10 +243233,10 @@ RectTransform: m_Father: {fileID: 5672185311229191161} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 107.875, y: -30} + m_SizeDelta: {x: 87, y: 51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4723865784122906103 CanvasRenderer: @@ -906330,10 +906330,10 @@ RectTransform: m_Father: {fileID: 5672185311229191161} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 196.6875, y: -30} + m_SizeDelta: {x: 90.625, y: 51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6112033298577141693 CanvasRenderer: @@ -1209410,7 +1209410,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1266753377350954170 RectTransform: m_ObjectHideFlags: 0 @@ -1224716,10 +1224716,10 @@ RectTransform: m_Father: {fileID: 5672185311229191161} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 37.1875, y: -30} + m_SizeDelta: {x: 54.375, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7895360677212913353 CanvasRenderer: @@ -2010840,7 +2010840,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2423823732879755494 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index 8fe2e57ed2..cfb14cf8f8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -12395,7 +12395,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u65E0\u7B26\u5408\u8981\u6C42\u7684\u795E\u5C06\uFF01" + m_Text: "\u65E0\u7B26\u5408\u8981\u6C42\u7684\u82F1\u96C4\uFF01" LanguageIndex: 10642 --- !u!1 &1022161149107231362 GameObject: @@ -13668,7 +13668,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, y: -169} + m_AnchoredPosition: {x: 0, y: -111} m_SizeDelta: {x: 1078, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2654776659046276628 @@ -73401,6 +73401,86 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031820122894204, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -46.7 + objectReference: {fileID: 0} + - target: {fileID: 2320031820122894204, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -131.5 + objectReference: {fileID: 0} + - target: {fileID: 2320031820211446154, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 121.688995 + objectReference: {fileID: 0} + - target: {fileID: 2320031820211446154, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.5385 + objectReference: {fileID: 0} + - target: {fileID: 2320031819291926005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 162.252 + objectReference: {fileID: 0} + - target: {fileID: 2320031819291926005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.5385 + objectReference: {fileID: 0} + - target: {fileID: 2320031818902343618, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 181.215 + objectReference: {fileID: 0} + - target: {fileID: 2320031818902343618, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.5385 + objectReference: {fileID: 0} + - target: {fileID: 2320031818921221046, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.5385 + objectReference: {fileID: 0} + - target: {fileID: 2320031818242639343, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 217.458 + objectReference: {fileID: 0} + - target: {fileID: 2320031818242639343, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.5385 + objectReference: {fileID: 0} + - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 40.563 + objectReference: {fileID: 0} + - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.5385 + objectReference: {fileID: 0} + - target: {fileID: 2320031818590170638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 81.126 + objectReference: {fileID: 0} + - target: {fileID: 2320031818590170638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.5385 + objectReference: {fileID: 0} + - target: {fileID: 7377032655362792110, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Spacing + value: 8.07 + objectReference: {fileID: 0} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -73511,86 +73591,6 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 5707498222100529429} - - target: {fileID: 2320031820122894204, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -46.7 - objectReference: {fileID: 0} - - target: {fileID: 2320031820122894204, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -131.5 - objectReference: {fileID: 0} - - target: {fileID: 2320031818921221046, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28.5385 - objectReference: {fileID: 0} - - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 40.563 - objectReference: {fileID: 0} - - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28.5385 - objectReference: {fileID: 0} - - target: {fileID: 2320031818590170638, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 81.126 - objectReference: {fileID: 0} - - target: {fileID: 2320031818590170638, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28.5385 - objectReference: {fileID: 0} - - target: {fileID: 2320031820211446154, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 121.688995 - objectReference: {fileID: 0} - - target: {fileID: 2320031820211446154, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28.5385 - objectReference: {fileID: 0} - - target: {fileID: 2320031819291926005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 162.252 - objectReference: {fileID: 0} - - target: {fileID: 2320031819291926005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28.5385 - objectReference: {fileID: 0} - - target: {fileID: 2320031818902343618, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 181.215 - objectReference: {fileID: 0} - - target: {fileID: 2320031818902343618, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28.5385 - objectReference: {fileID: 0} - - target: {fileID: 2320031818242639343, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 217.458 - objectReference: {fileID: 0} - - target: {fileID: 2320031818242639343, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28.5385 - objectReference: {fileID: 0} - - target: {fileID: 7377032655362792110, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Spacing - value: 8.07 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &2623652777543239359 stripped @@ -73836,6 +73836,14 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -73946,14 +73954,6 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 5229400858541971329} - - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &2773016355873739458 stripped @@ -74211,6 +74211,14 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -74321,14 +74329,6 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 6684151013664846304} - - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &8605789712567816354 stripped @@ -74586,6 +74586,14 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -74696,14 +74704,6 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 8249087443526701538} - - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &3228834877490035988 stripped @@ -74961,6 +74961,14 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -75071,14 +75079,6 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 561092459036176361} - - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &561092459036176361 stripped @@ -75336,6 +75336,14 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -75446,14 +75454,6 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 2285417794909024055} - - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &2135138870114957931 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab index c12f30f5b3..319cb9f3e3 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab @@ -552,6 +552,117 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &2048443099661525535 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4402734459171108343} + - component: {fileID: 513242795845456252} + - component: {fileID: 8156381792345384346} + - component: {fileID: 589829788421846602} + - component: {fileID: 3101585193307039228} + m_Layer: 5 + m_Name: titleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4402734459171108343 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2048443099661525535} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3241267629678625390} + m_RootOrder: 0 + 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: 26.9, y: 0} + m_SizeDelta: {x: 383.1, y: 180.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &513242795845456252 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2048443099661525535} + m_CullTransparentMesh: 0 +--- !u!114 &8156381792345384346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2048443099661525535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9960785, g: 0.93725497, b: 0.93725497, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 72 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u63A8\u8FDB\u57CE\u79D8\u5B9D" +--- !u!114 &589829788421846602 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2048443099661525535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 +--- !u!114 &3101585193307039228 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2048443099661525535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.8431373, g: 0.3254902, b: 0.37254903, a: 1} + m_EffectDistance: {x: 3, y: -3} + m_UseGraphicAlpha: 1 --- !u!1 &2812539162851467086 GameObject: m_ObjectHideFlags: 0 @@ -2613,7 +2724,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: 204.39, y: 56} + m_AnchoredPosition: {x: 204.39, y: 45} m_SizeDelta: {x: 535.02, y: 165.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267629675217323 @@ -2700,7 +2811,8 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 4402734459171108343} m_Father: {fileID: 3241267628795801173} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2724,7 +2836,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3241267629678625389} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: diff --git a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab index 95bdb4fb1b..f5e2a36dc9 100644 --- a/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab @@ -9518,7 +9518,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -48} - m_SizeDelta: {x: 183.1, y: 52.59} + m_SizeDelta: {x: 247.7, y: 52.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1506259854 CanvasRenderer: @@ -9561,7 +9561,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u4E03\u754C\u79D8\u5B9D" + m_Text: "\u63A8\u8FDB\u57CE\u79D8\u5B9D" --- !u!114 &1506259852 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua index c656e97877..542043a44f 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua @@ -2,7 +2,7 @@ require("Base/BasePanel") local GeneralTreasurePanel = Inherit(BasePanel) local itemnum = 0 local LocalData = { - [ActivityTypeDef.QiJieTreasure] = {itemId = 1242,hp = HELP_TYPE.QiJieTreasure,imgName = "q_qjsl_qjmb2",imgBg = "q_qjsl_qjmb",unLockType = 4,Tips = "挑战七界试炼,提升秘宝等级,激活秘宝后还可领取额外奖励"},--七界秘宝 + [ActivityTypeDef.QiJieTreasure] = {itemId = 1242,hp = HELP_TYPE.QiJieTreasure,imgName = "q_qjsl_qjmb2",imgBg = "UI_hz_qj_18",unLockType = 4,Tips = "挑战七界试炼,提升秘宝等级,激活秘宝后还可领取额外奖励"},--七界秘宝 } local id=0 --初始化组件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianMonsterInfo.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianMonsterInfo.lua index 9ff3a07a5c..628d25e00a 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianMonsterInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianMonsterInfo.lua @@ -35,7 +35,7 @@ function QiJieShiLianMonsterInfo:InitComponent(gameObject) --滚动条根节点 self.root = Util.GetGameObject(gameObject, "Root") for i = 1, 6 do - heroListGo[i] = Util.GetGameObject(gameObject, "RoleGrid/Bg"..i.."/Hero") + heroListGo[i] = Util.GetGameObject(gameObject, "RoleGrid/Bg"..i.."/Hero"..i) Util.GetGameObject(gameObject, "RoleGrid/Bg"..i):GetComponent("Image").sprite = self.spLoader:LoadSprite("t_chengyuankuang_kuang")--CardPosImageName[i]) Util.GetGameObject(gameObject, "RoleGrid/Bg"..i.."/Pos"):GetComponent("Image").sprite = self.spLoader:LoadSprite(CardPosImageName[i]) end @@ -44,10 +44,10 @@ function QiJieShiLianMonsterInfo:InitComponent(gameObject) self.targetAttri=Util.GetGameObject(gameObject,"targetAttri") self.targetAttri.gameObject:SetActive(true) self.tip = Util.GetGameObject(gameObject,"tip"):GetComponent("Text") - Util.GetGameObject(gameObject, "RoleGrid/FrontImage"):GetComponent("Image").sprite = self.spLoader:LoadSprite("bd_xinqianpai_zh") - Util.GetGameObject(gameObject, "RoleGrid/BehindImage"):GetComponent("Image").sprite = self.spLoader:LoadSprite("bd_xinhoupai_zh") - self.targetAttri:GetComponent("Image").sprite = self.spLoader:LoadSprite("q_qjsl_wfzjm_mbtx") - Util.GetGameObject(gameObject, "Power"):GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong-zhanli_zh") + Util.GetGameObject(gameObject, "RoleGrid/FrontImage"):GetComponent("Image").sprite = self.spLoader:LoadSprite("UI_hz_RankList_RankBg") + Util.GetGameObject(gameObject, "RoleGrid/BehindImage"):GetComponent("Image").sprite = self.spLoader:LoadSprite("UI_hz_RankList_RankBg") + self.targetAttri:GetComponent("Image").sprite = self.spLoader:LoadSprite("UI_hz_shenjiang_32") + Util.GetGameObject(gameObject, "Power"):GetComponent("Image").sprite = self.spLoader:LoadSprite("UI_hz_shenjiang_15_zh") end function QiJieShiLianMonsterInfo:BindEvent() @@ -101,6 +101,7 @@ function QiJieShiLianMonsterInfo:FormationAdapter() heroListGo[i]:SetActive(true) else heroListGo[i]:SetActive(true) + Util.GetGameObject(heroListGo[i],"lv/Text"):GetComponent("Text").text="" end end ResetItemView(self.root,self.root.transform,itemList,5,1,sortingOrder,false,rewardData) @@ -132,6 +133,7 @@ function QiJieShiLianMonsterInfo:SetCardSingleData(o,monsterId, _pos) -- local live=Util.GetGameObject(o,"Mask/Live") local lv=Util.GetGameObject(o,"lv/Text"):GetComponent("Text") + lv.text=monsterconfig.Level local pro=Util.GetGameObject(o,"Pro/Image"):GetComponent("Image") @@ -142,7 +144,7 @@ function QiJieShiLianMonsterInfo:SetCardSingleData(o,monsterId, _pos) name.text=heroConfig.ReadingName local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage") - local liveName = GetResourcePath(heroConfig.Live) + local liveName = GetResourcePath(heroConfig.Painting) local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroConfig.Id) local scale = roleConfig.play_liveScale local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0)