diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab index 928cf0d44d..3b5324db84 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab @@ -673,7 +673,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: 367, y: -26} + m_AnchoredPosition: {x: 386, y: -26} m_SizeDelta: {x: 222.5, y: 81.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2256811987525152314 @@ -697,15 +697,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.6117647, g: 0.4431373, 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: 6ff20609e8c68014394e6b730e1c7948, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -763,7 +763,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 532637317469506245} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} m_CullingMode: 0 @@ -2231,12 +2231,12 @@ RectTransform: - {fileID: 1888815952675900269} - {fileID: 9042132379393637595} m_Father: {fileID: 4779751217131831776} - m_RootOrder: 0 + m_RootOrder: 1 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: -396.55, y: 0.80000305} - m_SizeDelta: {x: 260.9, y: 162.2} + m_AnchoredPosition: {x: -399.36, y: -7.080002} + m_SizeDelta: {x: 266.93, y: 165.11} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3977152365312893247 CanvasRenderer: @@ -2259,15 +2259,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.7019608, g: 0.50980395, b: 0.9058824, a: 0.9019608} 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: 8bcf29c25528490458d961e3e1238c67, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: fd74cbb3e7676dd42b4c6bd11db16049, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2314,8 +2314,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: 37, y: -2} - m_SizeDelta: {x: 636.7, y: 134.57} + m_AnchoredPosition: {x: -22.6, y: -2} + m_SizeDelta: {x: 458.8, y: 134.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6899759931426735578 MonoBehaviour: @@ -2478,14 +2478,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7044693870083366580} - {fileID: 1396680106514277842} m_Father: {fileID: 3408442198697653928} 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: 1.12, y: -1.6543} - m_SizeDelta: {x: 1054.18, y: 161.4} + m_AnchoredPosition: {x: -4.2, y: -0.37} + m_SizeDelta: {x: 1088.41, y: 179.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4779751217131831790 CanvasRenderer: @@ -2508,15 +2509,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.16862746, g: 0.17254902, b: 0.18039216, a: 0.83137256} + 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: 0} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: ae88e620eb34e3742a46d8320b86062f, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2713,6 +2714,80 @@ MonoBehaviour: m_LineSpacing: 0.8 m_Text: "\u9700\u8981\u4E0A\u9635\u4E24\u540D\u6C34\u7CFB\u795E\u5C06" LanguageIndex: 0 +--- !u!1 &6270048820798839854 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7044693870083366580} + - component: {fileID: 6338992315598199313} + - component: {fileID: 732818674090853436} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7044693870083366580 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6270048820798839854} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.55, y: 0.55, z: 1} + m_Children: [] + m_Father: {fileID: 4779751217131831776} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -621, y: 88.5} + m_SizeDelta: {x: 836, y: 307} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6338992315598199313 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6270048820798839854} + m_CullTransparentMesh: 0 +--- !u!114 &732818674090853436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6270048820798839854} + 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: 0.41509432, g: 0.28966072, b: 0.13510145, a: 0.7764706} + 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!114 &3547548188433578879 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3356,7 +3431,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: 867, y: -38} + m_AnchoredPosition: {x: 899, y: -43} m_SizeDelta: {x: 0, y: 44} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5476576972710045244 @@ -3763,12 +3838,6 @@ GameObject: 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!114 &211788872410810404 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 114817672248082994, guid: cc289befb290a5544b9c25eae7cf8973, @@ -3787,6 +3856,12 @@ 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 @@ -3957,18 +4032,18 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &5231576254009261769 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6496578562299647950, guid: cc289befb290a5544b9c25eae7cf8973, - 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!1 &5231576254009261769 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6496578562299647950, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + m_PrefabInstance: {fileID: 1347193298197866759} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1988041395764277848 PrefabInstance: m_ObjectHideFlags: 0 @@ -4466,24 +4541,6 @@ PrefabInstance: objectReference: {fileID: 6257228251352152018} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} ---- !u!1 &6288551579478999526 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1308101793526790, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - m_PrefabInstance: {fileID: 6287528526349006304} - m_PrefabAsset: {fileID: 0} ---- !u!1 &966499488462217774 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6496578562299647950, guid: cc289befb290a5544b9c25eae7cf8973, - 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!114 &6257228251352152018 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 114817672248082994, guid: cc289befb290a5544b9c25eae7cf8973, @@ -4496,6 +4553,24 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &966499488462217774 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6496578562299647950, guid: cc289befb290a5544b9c25eae7cf8973, + 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, + type: 3} + m_PrefabInstance: {fileID: 6287528526349006304} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6301443867518586460 PrefabInstance: m_ObjectHideFlags: 0 @@ -4842,6 +4917,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 9161919986690841266} m_PrefabAsset: {fileID: 0} +--- !u!224 &8951759513183077380 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, + type: 3} + m_PrefabInstance: {fileID: 9161919986690841266} + m_PrefabAsset: {fileID: 0} --- !u!114 &9129438280617203840 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 114817672248082994, guid: cc289befb290a5544b9c25eae7cf8973, @@ -4854,9 +4935,3 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &8951759513183077380 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - m_PrefabInstance: {fileID: 9161919986690841266} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua index 320a28d849..a3a3eb689b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua @@ -39,7 +39,7 @@ local dataList = {} local list = {} local colorText = { sprite = {[0] = "Btn_hz_lan_01", [1] = "Btn_hz_cheng_01", [2] = "Btn_hz_cheng_01"}, - color = {[0] = "3B3B3B", [1] = "855139", [2] = "8B670C"}, + color = {[0] = "3B3B3B", [1] = "000000", [2] = "000000"}, text = {[0] = Language[10292], [1] = Language[10287], [2] = Language[10289]} } local difficult = {