From 5252dbe4006ad5e3c2eeb1d20634bfb476e43738 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 14 Jan 2022 13:20:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E8=83=BD=E6=B7=BB=E5=8A=A0=E5=BA=95?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Atlas/HeroAtlas/r_hero_jinengdadi.png | Bin 0 -> 991 bytes .../HeroAtlas/r_hero_jinengdadi.png.meta | 110 ++++++++++++++++++ .../Prefabs/UI/RoleInfo/RoleInfoLayout.prefab | 110 ++++++++++++++++-- 3 files changed, 213 insertions(+), 7 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jinengdadi.png create mode 100644 Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jinengdadi.png.meta diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jinengdadi.png b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jinengdadi.png new file mode 100644 index 0000000000000000000000000000000000000000..325c9a3d38985c361e65ed5061234efeb26148a1 GIT binary patch literal 991 zcmeAS@N?(olHy`uVBq!ia0vp^Js`}%1|-)VaI|A!U|#0w;uumf=k1NNS;C1T?H`Tf zGw0MzkkZi&DOo7MlCSvvvFeV(hsV4>)Dlqn77_hvz+q3^`|CY;n32C>l2AXd^@qb$NwvB0N(`Mi7of-T4 z;>oC^ua4IJ`*HHo)yZ$Syq;+CyK>f_bKlp@Uv8!)r2Qf_nKi8CYl4v3BArSx-ZH5` zv&`jp!Ir zOT^9;1_Jc_N5 zPYYXTlxpz&r{3g4QK9nxzQwQwKUWklfB8IBJ35S2_@^EBhI1=4%HtPR8Zgc-+Tnfm z_@jm5JItFJTM`r$B|JFTghrXfgu|%>rnI)|PYIt?W*F(OnaZ-W-ej}Z3{R=PnPS(x znx+3|B!wC*Uj9(@@}a1+JKiK`gc?j||9Id~y*A$m`S*_$q<*YCZ8XF0n$-2Cmsh)& z9A8q<>8ZFSEumzj0H9;j$Wz3ADar}vj^ zy0&C)ng6%NukZeSvCB|v(k<6{w{~>oo?7(DV8&(e MboFyt=akR{0JUPMGXMYp literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jinengdadi.png.meta b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jinengdadi.png.meta new file mode 100644 index 0000000000..b13b7089ea --- /dev/null +++ b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jinengdadi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: f6306ec3b0bad0343addfd72411164f8 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - 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: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 70e1074682a50d346b119fc054fac295 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: HeroAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab index cc74713664..e87449ec17 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab @@ -105,7 +105,7 @@ RectTransform: m_Children: - {fileID: 2601159845779406231} m_Father: {fileID: 8121286746226876291} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2054,7 +2054,7 @@ RectTransform: - {fileID: 9066401974130890280} - {fileID: 5310927602810155407} m_Father: {fileID: 8121286746226876291} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3607,7 +3607,7 @@ RectTransform: - {fileID: 499082220907345685} - {fileID: 825524469479898753} m_Father: {fileID: 8121286746226876291} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -6021,7 +6021,7 @@ RectTransform: m_Children: - {fileID: 1148558860390168617} m_Father: {fileID: 8121286746226876291} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -7073,7 +7073,7 @@ RectTransform: - {fileID: 4091827381361819950} - {fileID: 4828258630538021549} m_Father: {fileID: 8121286746226876291} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -7536,7 +7536,7 @@ RectTransform: - {fileID: 4835584040523510709} - {fileID: 636662867098924114} m_Father: {fileID: 8121286746226876291} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -8718,6 +8718,7 @@ RectTransform: m_LocalScale: {x: 0.85, y: 0.85, z: 1} m_Children: - {fileID: 8122010842041701115} + - {fileID: 4346157344466295825} - {fileID: 9023474137314707660} - {fileID: 3527351795417798528} - {fileID: 6290818895529228761} @@ -9161,7 +9162,7 @@ RectTransform: - {fileID: 348555451632011912} - {fileID: 2481748837918028601} m_Father: {fileID: 8121286746226876291} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -9957,3 +9958,98 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 10000000 +--- !u!1 &9155835935592497418 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4346157344466295825} + - component: {fileID: 1239602244554082193} + - component: {fileID: 4628890696888089938} + - component: {fileID: 5962708655965232871} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4346157344466295825 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9155835935592497418} + 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: 8121286746226876291} + 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: 4.700012, y: -0.3899994} + m_SizeDelta: {x: 1218.4, y: 204.01} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1239602244554082193 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9155835935592497418} + m_CullTransparentMesh: 0 +--- !u!114 &4628890696888089938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9155835935592497418} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f6306ec3b0bad0343addfd72411164f8, 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 &5962708655965232871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9155835935592497418} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1