From 206cf4e68a33f441c7038d34f945c4e19ae6a9e5 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Sun, 29 Dec 2024 15:05:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=91=E5=A5=B3=E4=BC=98=E5=8C=96=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Carbon/XuanYuanMirrorPanelList.prefab | 352 +++++++--- .../UI/MonsterCamp/MonsterCampNewPanel.prefab | 662 +++++++++--------- .../Carbon/XuanYuanMirrorPanelList.lua | 8 +- .../FourElementMonsterCampPanel.lua | 8 +- 4 files changed, 590 insertions(+), 440 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab index 7ec46f677f..3d55cb9a7a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab @@ -36,7 +36,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: -209, y: -74} + m_AnchoredPosition: {x: -168.8, y: 68.400024} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &274293795 @@ -123,7 +123,7 @@ GameObject: - component: {fileID: 297144692} - component: {fileID: 297144691} m_Layer: 5 - m_Name: Image + m_Name: UPBG m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -136,17 +136,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 297144689} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 2087026551871257240} - m_RootOrder: 3 + m_Children: + - {fileID: 8549175562964259523} + m_Father: {fileID: 3395763085718138868} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -0.00001214, y: 66.5} - m_SizeDelta: {x: 1080, y: 148.32} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &297144692 CanvasRenderer: @@ -216,11 +217,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2087026551871257240} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 221, y: -476.5} + m_AnchoredPosition: {x: 221, y: -455.5} m_SizeDelta: {x: 546.7, y: 178} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1250770360 @@ -292,7 +293,7 @@ GameObject: - component: {fileID: 1504717360} - component: {fileID: 1504717359} m_Layer: 5 - m_Name: Image (1) + m_Name: DownBG m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -308,14 +309,15 @@ 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: 113366261774190767} m_Father: {fileID: 3395763085718138868} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -0.00061035156, y: 63.899902} - m_SizeDelta: {x: 0, y: 127.7} + m_AnchoredPosition: {x: -0.00061035156, y: 50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1504717360 CanvasRenderer: @@ -384,11 +386,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2087026551871257240} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -572} + m_AnchoredPosition: {x: 540, y: -551} m_SizeDelta: {x: 1090, y: 84.100006} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1809268255 @@ -458,7 +460,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3395763085718138868} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -862,10 +864,10 @@ RectTransform: m_Father: {fileID: 3233073780574710381} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: -265} - m_SizeDelta: {x: 0, y: 1030.9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -269.8} + m_SizeDelta: {x: 0, y: -898.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5399186556472212939 CanvasRenderer: @@ -1048,13 +1050,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2087026551871257240} + m_Father: {fileID: 3395763085718138868} 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: 0, y: -878.19995} - m_SizeDelta: {x: 1085, y: 1151.3} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1336265199340948667 CanvasRenderer: @@ -1158,11 +1160,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2087026551871257240} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207, y: -475} + m_AnchoredPosition: {x: 207, y: -454} m_SizeDelta: {x: 417, y: 111} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3640825442392904260 @@ -1339,6 +1341,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1748884613386845803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 113366261774190767} + - component: {fileID: 48845452882517046} + - component: {fileID: 3198052238392222530} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &113366261774190767 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1748884613386845803} + m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1504717358} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 180, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &48845452882517046 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1748884613386845803} + m_CullTransparentMesh: 0 +--- !u!114 &3198052238392222530 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1748884613386845803} + 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: 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_Sprite: {fileID: 21300000, guid: fbba7bf478bcbfa4e89527b0910764ef, 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 &1968817385086113262 GameObject: m_ObjectHideFlags: 0 @@ -1370,11 +1446,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2087026551871257240} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 505, y: -574} + m_AnchoredPosition: {x: 505, y: -553} m_SizeDelta: {x: 1004.1, y: 84.100006} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4472731735553598297 @@ -1470,7 +1546,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: 66, y: -74} + m_AnchoredPosition: {x: 162.20001, y: 68.400024} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1351034079552654768 @@ -1728,10 +1804,10 @@ RectTransform: m_Father: {fileID: 3233073780574710381} 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: 0, y: -826} - m_SizeDelta: {x: 0, y: 45.8} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -1080, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3083248293155326010 GameObject: @@ -1859,7 +1935,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4627273074014379799} - {fileID: 2087026551871257240} + - {fileID: 297144690} - {fileID: 3753356304809304800} - {fileID: 6079698517707254614} - {fileID: 1504717358} @@ -2056,7 +2134,7 @@ RectTransform: - {fileID: 1198983249173518002} - {fileID: 1444424565373780552} m_Father: {fileID: 3395763085718138868} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2102,7 +2180,7 @@ RectTransform: - {fileID: 6551732854407264896} - {fileID: 2253100506837407954} m_Father: {fileID: 3395763085718138868} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2411,7 +2489,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: 1190} + m_AnchoredPosition: {x: 0, y: 2273} m_SizeDelta: {x: 1080, y: 169.84} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4826477924305440128 @@ -2714,6 +2792,80 @@ MonoBehaviour: m_LineSpacing: 0.8 m_Text: "\u9700\u8981\u4E0A\u9635\u4E24\u540D\u6C34\u7CFB\u795E\u5C06" LanguageIndex: 0 +--- !u!1 &6006794760392825457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8549175562964259523} + - component: {fileID: 4099141664854896927} + - component: {fileID: 1294431979231354545} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8549175562964259523 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6006794760392825457} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 297144690} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4099141664854896927 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6006794760392825457} + m_CullTransparentMesh: 0 +--- !u!114 &1294431979231354545 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6006794760392825457} + 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: 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_Sprite: {fileID: 21300000, guid: fbba7bf478bcbfa4e89527b0910764ef, 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 &6270048820798839854 GameObject: m_ObjectHideFlags: 0 @@ -3336,7 +3488,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: 0, y: -135} + m_AnchoredPosition: {x: 0, y: 30} m_SizeDelta: {x: 330, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2009070379428583229 @@ -3520,19 +3672,17 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4627273074014379799} - {fileID: 1809268253} - {fileID: 8468937203654416970} - - {fileID: 297144690} - {fileID: 6607143107321845372} - {fileID: 1250770358} m_Father: {fileID: 3395763085718138868} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.00024414062, y: -73} - m_SizeDelta: {x: 0, y: 637} + m_AnchoredPosition: {x: 0, y: -98} + m_SizeDelta: {x: 0, y: 607} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4790383402239116868 CanvasRenderer: @@ -3562,7 +3712,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: 2875187b215844044b3a333a45412ae7, type: 3} + m_Sprite: {fileID: 21300000, guid: 3f9556e9e31da8d4e91b015e0a31cfe4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3832,6 +3982,12 @@ PrefabInstance: objectReference: {fileID: 211788872410810404} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} +--- !u!1 &244077828304158224 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + m_PrefabInstance: {fileID: 245312915230788118} + m_PrefabAsset: {fileID: 0} --- !u!1 &6435640585191448024 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6496578562299647950, guid: cc289befb290a5544b9c25eae7cf8973, @@ -3856,12 +4012,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 245312915230788118} m_PrefabAsset: {fileID: 0} ---- !u!1 &244077828304158224 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - m_PrefabInstance: {fileID: 245312915230788118} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1347193298197866759 PrefabInstance: m_ObjectHideFlags: 0 @@ -4014,12 +4164,6 @@ PrefabInstance: objectReference: {fileID: 1379749903929322293} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} ---- !u!224 &1273557018881095601 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - m_PrefabInstance: {fileID: 1347193298197866759} - m_PrefabAsset: {fileID: 0} --- !u!114 &1379749903929322293 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 114817672248082994, guid: cc289befb290a5544b9c25eae7cf8973, @@ -4032,9 +4176,9 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1348428538602413313 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, +--- !u!224 &1273557018881095601 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} m_PrefabInstance: {fileID: 1347193298197866759} m_PrefabAsset: {fileID: 0} @@ -4044,6 +4188,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1347193298197866759} m_PrefabAsset: {fileID: 0} +--- !u!1 &1348428538602413313 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + m_PrefabInstance: {fileID: 1347193298197866759} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1988041395764277848 PrefabInstance: m_ObjectHideFlags: 0 @@ -4202,12 +4352,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1988041395764277848} m_PrefabAsset: {fileID: 0} ---- !u!1 &1986743482931643998 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - m_PrefabInstance: {fileID: 1988041395764277848} - m_PrefabAsset: {fileID: 0} --- !u!114 &1873808663702270058 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 114817672248082994, guid: cc289befb290a5544b9c25eae7cf8973, @@ -4226,6 +4370,12 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1988041395764277848} m_PrefabAsset: {fileID: 0} +--- !u!1 &1986743482931643998 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + m_PrefabInstance: {fileID: 1988041395764277848} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4147880410307112141 PrefabInstance: m_ObjectHideFlags: 0 @@ -4378,15 +4528,9 @@ PrefabInstance: objectReference: {fileID: 4037425737645485823} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} ---- !u!1 &4149115942918658251 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - m_PrefabInstance: {fileID: 4147880410307112141} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7185564165013109507 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6496578562299647950, guid: cc289befb290a5544b9c25eae7cf8973, +--- !u!224 &4219484961250095739 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} m_PrefabInstance: {fileID: 4147880410307112141} m_PrefabAsset: {fileID: 0} @@ -4402,9 +4546,15 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &4219484961250095739 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, +--- !u!1 &7185564165013109507 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6496578562299647950, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + m_PrefabInstance: {fileID: 4147880410307112141} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4149115942918658251 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} m_PrefabInstance: {fileID: 4147880410307112141} m_PrefabAsset: {fileID: 0} @@ -4457,7 +4607,7 @@ PrefabInstance: - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} @@ -4477,7 +4627,7 @@ PrefabInstance: - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x - value: -592 + value: -1165 objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} @@ -4541,6 +4691,12 @@ PrefabInstance: objectReference: {fileID: 6257228251352152018} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} +--- !u!224 &6079698517707254614 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + m_PrefabInstance: {fileID: 6287528526349006304} + m_PrefabAsset: {fileID: 0} --- !u!114 &6257228251352152018 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 114817672248082994, guid: cc289befb290a5544b9c25eae7cf8973, @@ -4559,12 +4715,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6287528526349006304} m_PrefabAsset: {fileID: 0} ---- !u!224 &6079698517707254614 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - m_PrefabInstance: {fileID: 6287528526349006304} - m_PrefabAsset: {fileID: 0} --- !u!1 &6288551579478999526 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, @@ -4905,18 +5055,6 @@ PrefabInstance: objectReference: {fileID: 9129438280617203840} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} ---- !u!1 &9160612023568559796 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - m_PrefabInstance: {fileID: 9161919986690841266} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2670025894890540412 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6496578562299647950, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - m_PrefabInstance: {fileID: 9161919986690841266} - m_PrefabAsset: {fileID: 0} --- !u!224 &8951759513183077380 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, @@ -4935,3 +5073,15 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &9160612023568559796 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + m_PrefabInstance: {fileID: 9161919986690841266} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2670025894890540412 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6496578562299647950, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + m_PrefabInstance: {fileID: 9161919986690841266} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab index 40f9723fd1..49588cfe7e 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab @@ -43751,7 +43751,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: 0d091033c58124f4589a0ed9c236c9bf, type: 3} + m_Sprite: {fileID: 21300000, guid: 5061ac5560c41794495dd5fc105641e3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -77437,61 +77437,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 39.475 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 7217783855302734575} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 1114276989151819077} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 1579732936000020151} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 1437357056673778352} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 7366866657557505971} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 4565619240352049754} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 3026763596731748523} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 2159031189683543540} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 4801328436564801422} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 6896511908906501734} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 7217783855302734575} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -77547,6 +77492,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 56281934147840962} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 7217783855302734575} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 1114276989151819077} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 1579732936000020151} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 1437357056673778352} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 7366866657557505971} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 4565619240352049754} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 3026763596731748523} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 2159031189683543540} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 4801328436564801422} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 6896511908906501734} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 7217783855302734575} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &902978120492740624 stripped @@ -77807,61 +77807,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 39.475 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 9078096222491911596} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 1632534261919998470} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 881877569491192308} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 730670448200474099} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 9218031124726296816} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 2777892780174949657} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 3733590958481852392} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 299264164226910903} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 6589019693040885965} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 5072193704105857317} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 9078096222491911596} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -77917,6 +77862,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 1807821797052857473} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 9078096222491911596} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 1632534261919998470} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 881877569491192308} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 730670448200474099} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 9218031124726296816} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 2777892780174949657} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 3733590958481852392} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 299264164226910903} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 6589019693040885965} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 5072193704105857317} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 9078096222491911596} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &1374384700529156335 stripped @@ -78197,61 +78197,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 39.475 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 8646120632458819111} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 2062998066431357325} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 449197192490015359} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 10428230327422584} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 8497121494036259707} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 3209903566003318418} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 4167713940492244067} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 1018345295788890428} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 5869938595821876038} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 5504205517907804846} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 8646120632458819111} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -78307,6 +78252,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 1373735144008658698} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 8646120632458819111} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 2062998066431357325} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 449197192490015359} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 10428230327422584} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 8497121494036259707} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 3209903566003318418} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 4167713940492244067} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 1018345295788890428} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 5869938595821876038} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 5504205517907804846} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 8646120632458819111} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &4167713940492244067 stripped @@ -78587,61 +78587,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 39.475 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 929846087844600416} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 7474699121145994698} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 9016651239254521400} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 8880894622862991935} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 1076813354804154172} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 6309988077389644501} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 4813498420676950052} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 8447531714926769531} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 3056955676072926977} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 3997110907586113257} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 929846087844600416} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -78697,6 +78642,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 7496864062743675725} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 929846087844600416} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 7474699121145994698} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 9016651239254521400} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 8880894622862991935} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 1076813354804154172} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 6309988077389644501} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 4813498420676950052} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 8447531714926769531} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 3056955676072926977} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 3997110907586113257} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 929846087844600416} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &2582649329368532083 stripped @@ -78962,61 +78962,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 39.475 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 2672140106218458208} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 5641132833275546570} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 6112431242037403704} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 5966536994217964607} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 2811300983572126012} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 9107325089224381653} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 7727851627526237732} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 6686026878135051131} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 260751030747826433} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 2200769703649491177} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 2672140106218458208} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -79072,6 +79017,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 4753573007027393869} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 2672140106218458208} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 5641132833275546570} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 6112431242037403704} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 5966536994217964607} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 2811300983572126012} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 9107325089224381653} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 7727851627526237732} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 6686026878135051131} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 260751030747826433} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 2200769703649491177} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 2672140106218458208} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &5641132833275546570 stripped @@ -79332,61 +79332,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 39.475 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 4349850764781440669} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 6269515430215616823} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 5592108072355504837} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 5442031381090481858} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 4488716792654355393} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 7434080243150968360} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 8247858253780462809} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 5008307865821094278} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 1933945106020240380} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 559056716487178772} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 4349850764781440669} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -79442,6 +79387,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 6390759652702508976} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 4349850764781440669} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 6269515430215616823} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 5592108072355504837} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 5442031381090481858} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 4488716792654355393} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 7434080243150968360} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 8247858253780462809} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 5008307865821094278} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 1933945106020240380} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 559056716487178772} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 4349850764781440669} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &5442031381090481858 stripped diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua index ec1af0110d..49605579cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua @@ -11,25 +11,25 @@ local storeData = {} local mirrors = { [1] = { id = Language[10331], --人杰 - bg = "Painting_1009", + bg = "Painting_1067", tip = string.format("%s", GetLanguageStrById(specialConfig[71].Value)), name="灼烧宝藏" }, [2] = { id = Language[10332], --佛禅 - bg = "Painting_1004", + bg = "Painting_1068", tip = string.format("%s", GetLanguageStrById(specialConfig[74].Value)), name="爆伤宝藏" }, [3] = { id = Language[10333], --妖灵 - bg = "Painting_1005", + bg = "Painting_1098", tip = string.format("%s", GetLanguageStrById(specialConfig[73].Value)), name="永动宝藏" }, [4] = { id = Language[10334], --道玄 - bg = "Painting_1006", + bg = "Painting_1099", tip = string.format("%s", GetLanguageStrById(specialConfig[72].Value)), name="控怒宝藏" } diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua index 0d3beafce1..13c2df22ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua @@ -24,10 +24,10 @@ local redTrailType = { [4] = RedPointType.TaoistTrailHelp, } local typebg={ -[1]="UI_hz_xm_10", -[2]="UI_hz_xm_11", -[3]="UI_hz_xm_12", -[4]="UI_hz_xm_13", +[1]="bg_l2d_girl123008", +[2]="bg_l2d_girl123022", +[3]="bg_l2d_girl125017", +[4]="bg_l2d_girl133022", }