diff --git a/Assets/ManagedResources/BG/UI/1All/T_tongyong_fangdajing_chakan_icon.png b/Assets/ManagedResources/BG/UI/1All/T_tongyong_fangdajing_chakan_icon.png new file mode 100644 index 0000000000..1078d919a6 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/T_tongyong_fangdajing_chakan_icon.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/T_tongyong_fangdajing_chakan_icon.png.meta b/Assets/ManagedResources/BG/UI/1All/T_tongyong_fangdajing_chakan_icon.png.meta new file mode 100644 index 0000000000..fb075cb935 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/T_tongyong_fangdajing_chakan_icon.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: ece53307355a1ae48887cb1dedcc1ec7 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a9d06b96f7aca5444899f4b10445e7ab + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/1All/X1_fangdajing.png b/Assets/ManagedResources/BG/UI/1All/X1_fangdajing.png new file mode 100644 index 0000000000..6d827fb8ed Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/X1_fangdajing.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/X1_fangdajing.png.meta b/Assets/ManagedResources/BG/UI/1All/X1_fangdajing.png.meta new file mode 100644 index 0000000000..94e4953d0f --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/X1_fangdajing.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: d9c4c388bd4677046acf2fff583e4bc3 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4bd9d7e8ea93d5043ade6745711e1c81 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 32f63a6f3a..d1e03503bf 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -10761,6 +10761,7 @@ GameObject: - component: {fileID: 1240811747} - component: {fileID: 1240811745} - component: {fileID: 2456335273585483838} + - component: {fileID: 1240811746} m_Layer: 5 m_Name: titleText m_TagString: Untagged @@ -10784,7 +10785,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 133.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 68.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1240811747 @@ -10822,7 +10823,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.86274517, g: 0.6901961, b: 0.48235297, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -10844,6 +10845,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u901A\u8FC7\u5267\u60C53-3\u5173\u5361 " LanguageIndex: 10530 +--- !u!114 &1240811746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1240811743} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1257636022 GameObject: m_ObjectHideFlags: 0 @@ -11071,7 +11087,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -509.9, y: 359} + m_AnchoredPosition: {x: -509.9, y: 456} m_SizeDelta: {x: 977.6, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1596169475 @@ -11109,7 +11125,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 293.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 68.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1596169479 @@ -73048,7 +73064,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8885551416139425081 RectTransform: m_ObjectHideFlags: 0 @@ -73066,9 +73082,9 @@ RectTransform: m_Father: {fileID: 3952385394978222417} m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -292.5} m_SizeDelta: {x: 100, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6889475057108059259 @@ -110389,7 +110405,7 @@ RectTransform: m_GameObject: {fileID: 4356458383648976209} 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_LocalScale: {x: 2, y: 2, z: 1} m_Children: [] m_Father: {fileID: 559709572625077821} m_RootOrder: 0 @@ -110397,7 +110413,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.09001541, y: -8.409996} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 36, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8709194302715128190 CanvasRenderer: @@ -110427,7 +110443,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: f9265182fc2643642b4a0cb9f45083d0, type: 3} + m_Sprite: {fileID: 21300000, guid: ece53307355a1ae48887cb1dedcc1ec7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -175604,7 +175620,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2790268029142068141 RectTransform: m_ObjectHideFlags: 0 @@ -175621,9 +175637,9 @@ RectTransform: m_Father: {fileID: 3952385394978222417} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -292.5} m_SizeDelta: {x: 100, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8884007560803558536 @@ -201831,7 +201847,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 355, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 69.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7203306409298755909 @@ -224952,15 +224968,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} ---- !u!1 &1533186584701823329 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7582181376025013934, guid: 45fb9a1ded4a71146ba636b09e5dabcf, - type: 3} - m_PrefabInstance: {fileID: 8971074634032498639} - m_PrefabAsset: {fileID: 0} --- !u!224 &830511510176938944 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} m_PrefabInstance: {fileID: 8971074634032498639} m_PrefabAsset: {fileID: 0} +--- !u!1 &1533186584701823329 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7582181376025013934, guid: 45fb9a1ded4a71146ba636b09e5dabcf, + type: 3} + m_PrefabInstance: {fileID: 8971074634032498639} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab index 8d64a2a756..11834ba612 100644 --- a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab @@ -31,6 +31,7 @@ RectTransform: m_Children: - {fileID: 8842722649440153328} - {fileID: 8637345275457359714} + - {fileID: 5389134878973222937} - {fileID: 8275559108294705749} m_Father: {fileID: 798015173237835578} m_RootOrder: 0 @@ -68,8 +69,8 @@ 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: 993079002fe07704c8a501ea8d448527, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 8a12a17d1a7663645a9d429458a99061, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -179,7 +180,7 @@ RectTransform: m_GameObject: {fileID: 154000287755073553} 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_LocalScale: {x: 0.5, y: 0.5, z: 1} m_Children: - {fileID: 6608743359651444989} m_Father: {fileID: 4088516387311303254} @@ -188,7 +189,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -369, y: 83} - m_SizeDelta: {x: 49, y: 46} + m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9118590831829270601 CanvasRenderer: @@ -218,7 +219,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: ca9a8e3ca10f3614798bdcc3a8fb12be, type: 3} + m_Sprite: {fileID: 21300000, guid: d7183aaa8ad92e2488276d26fc370192, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -961,6 +962,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -4} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1625707689676997814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6418424778217422970} + - component: {fileID: 3474373249532994187} + - component: {fileID: 3805338128761791726} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6418424778217422970 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625707689676997814} + 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: 8637345275457359714} + 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 &3474373249532994187 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625707689676997814} + m_CullTransparentMesh: 0 +--- !u!114 &3805338128761791726 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625707689676997814} + 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 &1921545391724587700 GameObject: m_ObjectHideFlags: 0 @@ -988,7 +1063,7 @@ RectTransform: m_GameObject: {fileID: 1921545391724587700} 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_LocalScale: {x: 0.5, y: 0.5, z: 1} m_Children: [] m_Father: {fileID: 1038121354133818456} m_RootOrder: 0 @@ -996,7 +1071,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -2.49, y: -0.95} - m_SizeDelta: {x: 49, y: 46} + m_SizeDelta: {x: 108, y: 87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1921545391724587689 CanvasRenderer: @@ -1026,7 +1101,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: 7f30ca068e9d6fb42b599c00c9a961c1, type: 3} + m_Sprite: {fileID: 21300000, guid: d9c4c388bd4677046acf2fff583e4bc3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1071,7 +1146,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: -10.5, y: -15.9} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 79, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6677399922847633271 @@ -1102,7 +1177,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: 8561d25febfc8bc428011c49f29d126b, type: 3} + m_Sprite: {fileID: 21300000, guid: 0efe29bd0476d5d4e8c274f2030570ec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1742,6 +1817,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3236545942904534335 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5389134878973222937} + - component: {fileID: 7198071189165214034} + - component: {fileID: 1159346453101884487} + m_Layer: 5 + m_Name: DownBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5389134878973222937 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3236545942904534335} + 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: + - {fileID: 5655364755208461069} + m_Father: {fileID: 5605656773988188570} + m_RootOrder: 2 + 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: 50} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7198071189165214034 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3236545942904534335} + m_CullTransparentMesh: 0 +--- !u!114 &1159346453101884487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3236545942904534335} + 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: da769bf29f6ad91419d704aa20062d65, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3336916851255688233 GameObject: m_ObjectHideFlags: 0 @@ -1753,6 +1903,7 @@ GameObject: - component: {fileID: 6608743359651444989} - component: {fileID: 2878907979627942363} - component: {fileID: 6657986290163722965} + - component: {fileID: 3213003908629601647} m_Layer: 5 m_Name: GongMingText m_TagString: Untagged @@ -1776,8 +1927,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 204, y: 22} - m_SizeDelta: {x: 298.4, y: 34.5} + m_AnchoredPosition: {x: 240.8, y: 31.8} + m_SizeDelta: {x: 298.4, y: 51.55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2878907979627942363 CanvasRenderer: @@ -1800,7 +1951,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.92549026, g: 0.7568628, b: 0.40784317, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1809,11 +1960,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 30 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 3 - m_MaxSize: 30 + m_MinSize: 5 + m_MaxSize: 60 m_Alignment: 6 m_AlignByGeometry: 0 m_RichText: 0 @@ -1822,6 +1973,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5171\u9E23\u6548\u679C\u8BE6\u60C5" LanguageIndex: 10145 +--- !u!114 &3213003908629601647 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3336916851255688233} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &3449572036296137203 GameObject: m_ObjectHideFlags: 0 @@ -2435,15 +2601,15 @@ RectTransform: m_GameObject: {fileID: 4874129174205026572} 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_LocalScale: {x: 0.45, y: 0.45, z: 1} m_Children: [] m_Father: {fileID: 5605656773988188570} m_RootOrder: 0 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: 454} - m_SizeDelta: {x: 2, y: 799} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 533, y: 479.9} + m_SizeDelta: {x: 3413, y: 1919.9999} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9223370521814701021 CanvasRenderer: @@ -2473,7 +2639,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: 129397b44dd8ae34898b2a5f161337ea, type: 3} + m_Sprite: {fileID: 21300000, guid: d6806c9ba561ae944acc9d557d14d170, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2753,6 +2919,80 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &5128856298567088144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5655364755208461069} + - component: {fileID: 2318079824044722300} + - component: {fileID: 7559145418780736023} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5655364755208461069 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5128856298567088144} + 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: 5389134878973222937} + 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 &2318079824044722300 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5128856298567088144} + m_CullTransparentMesh: 0 +--- !u!114 &7559145418780736023 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5128856298567088144} + 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 &5152879811982102163 GameObject: m_ObjectHideFlags: 0 @@ -2919,7 +3159,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8275559108294705749 RectTransform: m_ObjectHideFlags: 0 @@ -2932,7 +3172,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5605656773988188570} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -3692,7 +3932,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: -41.78, y: 378} + m_AnchoredPosition: {x: -7, y: 387} m_SizeDelta: {x: 205.17, y: 84.28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7349408683569203262 @@ -3723,7 +3963,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 179ba29a4451da245a7d6cfcaae39cc2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4717,14 +4957,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: 6418424778217422970} m_Father: {fileID: 5605656773988188570} 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.5, y: -44} - m_SizeDelta: {x: 1, y: 100} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3425637686716661965 CanvasRenderer: @@ -4754,7 +4995,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: 420d1d17a3d5ced4cb07001dd98f9852, type: 3} + m_Sprite: {fileID: 21300000, guid: da769bf29f6ad91419d704aa20062d65, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4774,6 +5015,7 @@ GameObject: - component: {fileID: 2949069213640194993} - component: {fileID: 1104369800386973496} - component: {fileID: 6113574451829102462} + - component: {fileID: 9104612599699911593} m_Layer: 5 m_Name: itemNumText m_TagString: Untagged @@ -4843,6 +5085,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 1/3 LanguageIndex: 10145 +--- !u!114 &9104612599699911593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7903604334903786097} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &7963285559257479001 GameObject: m_ObjectHideFlags: 0 @@ -4876,8 +5133,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 47.89917, y: 125} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 40.3, y: 96.6} + m_SizeDelta: {x: 79, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8212858323701775768 GameObject: @@ -5002,6 +5259,7 @@ GameObject: - component: {fileID: 2129515910323730583} - component: {fileID: 6272174061775514837} - component: {fileID: 3190050941170998545} + - component: {fileID: 3827126961300465472} m_Layer: 5 m_Name: UnShowText m_TagString: Untagged @@ -5049,7 +5307,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.99607843, g: 0.84313726, b: 0.6039216, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -5070,6 +5328,21 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u9700\u8981\u83B7\u5F97\u66F4\u591A\u7684\u89C9\u9192\u795E\u5C06\u63D0\u5347\u4E0A\u9650" +--- !u!114 &3827126961300465472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8295717310231159647} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &8369109292289989969 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab index 88eb6785af..7f410a439f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab @@ -798,6 +798,7 @@ GameObject: - component: {fileID: 7232788015283041754} - component: {fileID: 4890547220967424339} - component: {fileID: 1754982326105331989} + - component: {fileID: 6937606705217491434} m_Layer: 5 m_Name: itemNumText m_TagString: Untagged @@ -867,6 +868,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 1/3 LanguageIndex: 10145 +--- !u!114 &6937606705217491434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2387482805356000282} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &2454024966249625906 GameObject: m_ObjectHideFlags: 0 @@ -3400,7 +3416,7 @@ RectTransform: m_GameObject: {fileID: 5669515985787778682} 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_LocalScale: {x: 0.5, y: 0.5, z: 1} m_Children: - {fileID: 1674157773980137110} m_Father: {fileID: 8372305284465964093} @@ -3409,7 +3425,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -352, y: 78} - m_SizeDelta: {x: 45, y: 45} + m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3604721103171538466 CanvasRenderer: @@ -3439,7 +3455,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: f9265182fc2643642b4a0cb9f45083d0, type: 3} + m_Sprite: {fileID: 21300000, guid: d7183aaa8ad92e2488276d26fc370192, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3592,7 +3608,7 @@ RectTransform: m_GameObject: {fileID: 6138236318853110202} 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_LocalScale: {x: 0.5, y: 0.5, z: 1} m_Children: [] m_Father: {fileID: 4820278136578064947} m_RootOrder: 0 @@ -3600,7 +3616,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 49, y: 46} + m_SizeDelta: {x: 108, y: 87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6138236318853110183 CanvasRenderer: @@ -3630,7 +3646,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: 7f30ca068e9d6fb42b599c00c9a961c1, type: 3} + m_Sprite: {fileID: 21300000, guid: d9c4c388bd4677046acf2fff583e4bc3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4129,6 +4145,7 @@ GameObject: - component: {fileID: 1674157773980137110} - component: {fileID: 7745869476401733552} - component: {fileID: 1218469935367627966} + - component: {fileID: 5906663163633864290} m_Layer: 5 m_Name: GongMingText m_TagString: Untagged @@ -4152,7 +4169,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 190, y: 21} + m_AnchoredPosition: {x: 237, y: 21} m_SizeDelta: {x: 292.6, y: 34.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7745869476401733552 @@ -4176,7 +4193,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9921569, g: 0.75294125, b: 0.2509804, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4185,11 +4202,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 30 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 35 + m_MaxSize: 50 m_Alignment: 6 m_AlignByGeometry: 0 m_RichText: 0 @@ -4198,6 +4215,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5171\u9E23\u6548\u679C\u8BE6\u60C5" LanguageIndex: 10145 +--- !u!114 &5906663163633864290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7116294893561557570} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &8673416050080868230 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index cab7ca36b6..b699d673c1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -3944,12 +3944,12 @@ RectTransform: m_Children: - {fileID: 8431793784240067069} m_Father: {fileID: 1557565913901413994} - m_RootOrder: 3 + m_RootOrder: 4 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: -214, y: -266.3} - m_SizeDelta: {x: 250, y: 85.6} + m_AnchoredPosition: {x: -214, y: -260.1} + m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4981646034961737949 CanvasRenderer: @@ -3972,15 +3972,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.26666668, g: 0.627451, b: 0.9960785, 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: b204bd77afb57e14e830d912e88eb357, 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 @@ -10258,7 +10258,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1557565913901413994} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -10899,12 +10899,12 @@ RectTransform: m_Children: - {fileID: 35085352120810994} m_Father: {fileID: 1557565913901413994} - m_RootOrder: 4 + m_RootOrder: 5 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: 194, y: -265.09998} - m_SizeDelta: {x: 250, y: 110} + m_AnchoredPosition: {x: 194, y: -259.03} + m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2012263460902141515 CanvasRenderer: @@ -10927,15 +10927,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.82745105, b: 0.34901962, 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: 1 m_FillCenter: 1 m_FillMethod: 4 @@ -11153,6 +11153,7 @@ GameObject: - component: {fileID: 8431793784240067069} - component: {fileID: 6497207360957518235} - component: {fileID: 2736045024447834383} + - component: {fileID: 113612230710176041} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -11200,7 +11201,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -11222,6 +11223,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u53D6 \u6D88" LanguageIndex: 10407 +--- !u!114 &113612230710176041 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1510889268279029016} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1529907690386763765 GameObject: m_ObjectHideFlags: 0 @@ -13266,7 +13282,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1557565913901413994} - m_RootOrder: 0 + 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} @@ -16798,7 +16814,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1557565913901413994} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -27829,6 +27845,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3876963853278204238 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1457394072651803671} + - component: {fileID: 2760311647949195895} + - component: {fileID: 8404784772446653103} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1457394072651803671 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3876963853278204238} + 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: 1557565913901413994} + 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: 10.4, y: -21.2} + m_SizeDelta: {x: 831.4, y: 335} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2760311647949195895 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3876963853278204238} + m_CullTransparentMesh: 0 +--- !u!114 &8404784772446653103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3876963853278204238} + 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.21960786, g: 0.21960786, b: 0.21960786, a: 0.23137255} + 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_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3883949373974501768 GameObject: m_ObjectHideFlags: 0 @@ -31370,6 +31460,7 @@ GameObject: - component: {fileID: 35085352120810994} - component: {fileID: 6063848363079037380} - component: {fileID: 44617895338175281} + - component: {fileID: 2832822546021895130} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -31417,7 +31508,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -31439,6 +31530,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u786E \u5B9A\r" LanguageIndex: 11274 +--- !u!114 &2832822546021895130 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4426633055309504765} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &4438078317996367643 GameObject: m_ObjectHideFlags: 0 @@ -44663,7 +44769,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1557565913901413994 RectTransform: m_ObjectHideFlags: 0 @@ -44675,6 +44781,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1457394072651803671} - {fileID: 6362333835603005773} - {fileID: 1681549533397587500} - {fileID: 5782088423025344887} diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab index 59088fb7e2..a37b28717b 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab @@ -1374,8 +1374,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -85, y: 1309} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: -68.41, y: 1314.6} + m_SizeDelta: {x: 824.1, y: 82.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222090514832067844 CanvasRenderer: @@ -1406,7 +1406,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1695,8 +1695,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: 188, y: -616} - m_SizeDelta: {x: 260, y: 74} + m_AnchoredPosition: {x: 185, y: -616} + m_SizeDelta: {x: 266, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222377172953290452 CanvasRenderer: @@ -1726,7 +1726,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 71162a8d1456dde45a156c169aeccf54, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2030,6 +2030,7 @@ GameObject: - component: {fileID: 2255336512627614656} - component: {fileID: 2887608802854596771} - component: {fileID: 5423449398225138165} + - component: {fileID: 7202812129054359753} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -2077,7 +2078,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137257, g: 0.23137257, b: 0.23137257, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2099,6 +2100,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9009 \u5B9A" LanguageIndex: 10340 +--- !u!114 &7202812129054359753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 695993841781974942} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &802039833885843169 GameObject: m_ObjectHideFlags: 0 @@ -2558,6 +2574,7 @@ GameObject: - component: {fileID: 1917087398955278254} - component: {fileID: 1914539670844352180} - component: {fileID: 8246341321822404474} + - component: {fileID: 5290644370725133387} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -2605,7 +2622,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137257, g: 0.23137257, b: 0.23137257, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2627,6 +2644,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9009 \u5B9A" LanguageIndex: 0 +--- !u!114 &5290644370725133387 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1837503451298047116} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1837674542571650308 GameObject: m_ObjectHideFlags: 0 @@ -3150,7 +3182,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -188, y: -616} - m_SizeDelta: {x: 260, y: 80} + m_SizeDelta: {x: 260, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &245000640175901755 CanvasRenderer: @@ -3180,7 +3212,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: 0dc0640ffa275b742a82550b589865b2, type: 3} + m_Sprite: {fileID: 21300000, guid: 4ea5db9ce28275b4285f6255c7d52acf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3319,7 +3351,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: ca89b0ae6a91d1b4894f2aec2b6870bf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3480,6 +3512,7 @@ GameObject: - component: {fileID: 2597021665044538728} - component: {fileID: 6679550878004569784} - component: {fileID: 2308586482717025673} + - component: {fileID: 364271551477567256} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -3527,7 +3560,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137257, g: 0.23137257, b: 0.23137257, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3549,6 +3582,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u4E00\u952E\u653E\u5165" LanguageIndex: 0 +--- !u!114 &364271551477567256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5574603915283662575} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &5608037315133309369 GameObject: m_ObjectHideFlags: 0