diff --git a/Assets/ManagedResources/Atlas/PopupAtlas/r_hero_button_002.png b/Assets/ManagedResources/Atlas/PopupAtlas/r_hero_button_002.png index bba50a4eb2..70e0287021 100644 Binary files a/Assets/ManagedResources/Atlas/PopupAtlas/r_hero_button_002.png and b/Assets/ManagedResources/Atlas/PopupAtlas/r_hero_button_002.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/t_tongyong-zhanli_zh.png b/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/t_tongyong-zhanli_zh.png index 2b60589dfa..54947baf97 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/t_tongyong-zhanli_zh.png and b/Assets/ManagedResources/Atlas/PublicAtlas/ArtFont/t_tongyong-zhanli_zh.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_jiantou_001.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_jiantou_001.png index ac76535175..1392df2209 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_jiantou_001.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_jiantou_001.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_jiantou_002.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_jiantou_002.png index 1f9d1ce1f9..61b853f7ec 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_jiantou_002.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_jiantou_002.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_qipao.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_qipao.png index 4f9e4cec80..80728d06cc 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_qipao.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_qipao.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_renwu.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_renwu.png index 2fd969798a..12f66d521a 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_renwu.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_tongyong_renwu.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/zbhc_sanji1.png b/Assets/ManagedResources/Atlas/PublicAtlas/zbhc_sanji1.png index df83af4f60..c1272a30c9 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/zbhc_sanji1.png and b/Assets/ManagedResources/Atlas/PublicAtlas/zbhc_sanji1.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/zbhc_sanji2.png b/Assets/ManagedResources/Atlas/PublicAtlas/zbhc_sanji2.png index c6dcafe0f0..b95cd1fb4c 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/zbhc_sanji2.png and b/Assets/ManagedResources/Atlas/PublicAtlas/zbhc_sanji2.png differ diff --git a/Assets/ManagedResources/BG/b_baowuxitong_beijin_001.png b/Assets/ManagedResources/BG/b_baowuxitong_beijin_001.png new file mode 100644 index 0000000000..79e1aabb1a Binary files /dev/null and b/Assets/ManagedResources/BG/b_baowuxitong_beijin_001.png differ diff --git a/Assets/ManagedResources/BG/b_baowuxitong_beijin_001.png.meta b/Assets/ManagedResources/BG/b_baowuxitong_beijin_001.png.meta new file mode 100644 index 0000000000..f65dc66dc4 --- /dev/null +++ b/Assets/ManagedResources/BG/b_baowuxitong_beijin_001.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 232b522198961e844a2d22797a087223 +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: 36034d7f3baa4d64a86b68ddee6ee9f3 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index 3b72b8dfc4..34219b9c07 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -53982,8 +53982,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -59.100098, y: -440.2002} - m_SizeDelta: {x: 60, y: 84} + m_AnchoredPosition: {x: -64.79999, y: -421} + m_SizeDelta: {x: 97, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222666197140353630 CanvasRenderer: @@ -54209,8 +54209,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: 1.3, y: -362} - m_SizeDelta: {x: 1017.2, y: 724} + m_AnchoredPosition: {x: -0.000012398, y: -896.32} + m_SizeDelta: {x: 1080, y: 127.35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222839184784845028 CanvasRenderer: @@ -54240,7 +54240,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: 0fe4a2041fa84c349bd8f26200e5a853, type: 3} + m_Sprite: {fileID: 21300000, guid: 6253e3364aa642840b7b6ca6ac30239b, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -54877,7 +54877,7 @@ RectTransform: m_GameObject: {fileID: 1510154920752530} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.95, y: 0.95, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 268016902880247916} - {fileID: 224903305027616404} @@ -54891,7 +54891,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.0044928, y: -765.51953} + m_AnchoredPosition: {x: 0.0044928, y: -768.4} m_SizeDelta: {x: 1136.8, y: 164} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222414397184224872 @@ -54951,7 +54951,7 @@ MonoBehaviour: m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 155, y: 85} + m_CellSize: {x: 173, y: 64} m_Spacing: {x: 2.1, y: 0} m_Constraint: 0 m_ConstraintCount: 2 @@ -55608,8 +55608,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 59, y: -440.8} - m_SizeDelta: {x: 60, y: 84} + m_AnchoredPosition: {x: 69.4, y: -448} + m_SizeDelta: {x: 97, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222625709780566480 CanvasRenderer: @@ -55827,7 +55827,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -57, y: 104} + m_AnchoredPosition: {x: -57, y: 67.70001} m_SizeDelta: {x: 67.03998, y: 67.03998} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222113928326134552 @@ -56093,8 +56093,8 @@ 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: -278.35, y: 56} - m_SizeDelta: {x: 276.36, y: 64.06995} + m_AnchoredPosition: {x: -252.7, y: 86} + m_SizeDelta: {x: 286, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222491450968100270 CanvasRenderer: @@ -56232,8 +56232,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 302, y: 56} - m_SizeDelta: {x: 265.87, y: 64.06995} + m_AnchoredPosition: {x: 287.4, y: 86} + m_SizeDelta: {x: 286, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222633175512694564 CanvasRenderer: @@ -61127,7 +61127,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224934929823803674 RectTransform: m_ObjectHideFlags: 0 @@ -61400,7 +61400,6 @@ GameObject: - component: {fileID: 224582139656678132} - component: {fileID: 222286758884224434} - component: {fileID: 114255723050268648} - - component: {fileID: 114432401358702478} m_Layer: 5 m_Name: bg (1) m_TagString: Untagged @@ -61424,8 +61423,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: 0, y: 11} - m_SizeDelta: {x: 1047.7, y: 6.3599854} + m_AnchoredPosition: {x: -9.3, y: 447} + m_SizeDelta: {x: 658, y: 632} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222286758884224434 CanvasRenderer: @@ -61455,7 +61454,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: 19d5542f3ad36154883cfc2022d17e0a, type: 3} + m_Sprite: {fileID: 21300000, guid: 232b522198961e844a2d22797a087223, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -61464,29 +61463,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &114432401358702478 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1969919378755136} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: -56 - m_Right: 0 - m_Top: 22 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 14.64 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 --- !u!1 &1983592959519974 GameObject: m_ObjectHideFlags: 0 @@ -61502,7 +61478,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224825482267854604 RectTransform: m_ObjectHideFlags: 0 @@ -61752,8 +61728,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: -239.59998, y: 90.5} - m_SizeDelta: {x: 402, y: 234} + m_AnchoredPosition: {x: -117.5, y: 162.6} + m_SizeDelta: {x: 211, y: 107} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7026626449646263958 CanvasRenderer: @@ -76681,8 +76657,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: 0.79999995, y: 15.299999} - m_SizeDelta: {x: 229.5, y: 64.4} + m_AnchoredPosition: {x: 1.37, y: -0.44} + m_SizeDelta: {x: 175.41, y: 95.88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &76115989153622027 CanvasRenderer: @@ -76705,7 +76681,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.1882353, g: 0.30980393, b: 0.5058824, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -76713,8 +76689,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 35 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 @@ -81593,7 +81569,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 86.5, y: -356} - m_SizeDelta: {x: 354, y: 470} + m_SizeDelta: {x: 519, y: 404} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &534147342820771080 CanvasRenderer: @@ -96190,7 +96166,7 @@ RectTransform: m_GameObject: {fileID: 1438478634096779389} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5561687783376730610} - {fileID: 7402777051519901064} @@ -96199,8 +96175,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 171, y: -129} - m_SizeDelta: {x: 405, y: 138} + m_AnchoredPosition: {x: 73.7, y: -132.7} + m_SizeDelta: {x: 98, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7798329101788675826 CanvasRenderer: @@ -96272,7 +96248,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: e5c1f003e5286704f848234b7773dca2, type: 3} + m_Sprite: {fileID: 21300000, guid: 0fdb11ebf0af8694cb08b9c264d3fa2a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -106238,7 +106214,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.0000023842, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2539474575079667379 @@ -106277,7 +106253,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, a: 1} + m_Color: {r: 0.9725491, g: 0.92549026, b: 0.85098046, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -106286,7 +106262,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 48 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -106335,8 +106311,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -387.55005, y: -1684.74} - m_SizeDelta: {x: 170.7, y: 97.72} + m_AnchoredPosition: {x: -316.2, y: -1696.4} + m_SizeDelta: {x: 173, y: 64} m_Pivot: {x: 0, y: 1} --- !u!222 &8815997685655610939 CanvasRenderer: @@ -121318,7 +121294,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: 84.9, y: 18} + m_AnchoredPosition: {x: 92.5, y: 24.8} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &32025381920975939 @@ -126261,7 +126237,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -89.44, y: 135.40002} - m_SizeDelta: {x: 127, y: 135} + m_SizeDelta: {x: 132, y: 127} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1392686099003557812 CanvasRenderer: @@ -126706,7 +126682,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -183, y: 96} + m_AnchoredPosition: {x: -183, y: 59.7} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8419355116901077688 @@ -126730,7 +126706,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -126739,7 +126715,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -165302,7 +165278,6 @@ GameObject: - component: {fileID: 5561687783376730610} - component: {fileID: 329602736948110786} - component: {fileID: 5908704349386629032} - - component: {fileID: 4656998361141670262} m_Layer: 5 m_Name: value m_TagString: Untagged @@ -165326,8 +165301,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: 354.4, y: -14} - m_SizeDelta: {x: 793.5, y: 119.9} + m_AnchoredPosition: {x: 532.8, y: -6.8} + m_SizeDelta: {x: 933.6, y: 55.32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &329602736948110786 CanvasRenderer: @@ -165350,7 +165325,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9843137, g: 0.8862745, b: 0.6, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -165358,8 +165333,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 634137158f07dff488d018d707aa403a, type: 2} - m_FontSize: 0 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -165370,20 +165345,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: ---- !u!114 &4656998361141670262 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5649126956949771540} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} - m_Name: - m_EditorClassIdentifier: - _textSpacing: -30.48 + m_Text: 4285 --- !u!1 &5716710563094498347 GameObject: m_ObjectHideFlags: 0 @@ -184584,7 +184546,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.0000023842, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9222142365797290585 @@ -184623,7 +184585,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, a: 1} + m_Color: {r: 0.9725491, g: 0.92549026, b: 0.85098046, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -184632,7 +184594,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 48 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -199383,7 +199345,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.0000023842, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6031811929480031179 @@ -199422,7 +199384,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, a: 1} + m_Color: {r: 0.9725491, g: 0.92549026, b: 0.85098046, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -199431,7 +199393,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 48 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -218593,7 +218555,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.0000023842, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5799991397920675855 @@ -218632,7 +218594,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, a: 1} + m_Color: {r: 0.9725491, g: 0.92549026, b: 0.85098046, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -218641,7 +218603,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 48 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -233075,7 +233037,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: 8} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4343649736118813185 @@ -233114,7 +233076,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, a: 1} + m_Color: {r: 0.45882356, g: 0.33333334, b: 0.3254902, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -233123,7 +233085,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 48 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -243180,7 +243142,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: 1.06, y: 0.62} + m_AnchoredPosition: {x: -11, y: -6.1} m_SizeDelta: {x: 179.3, y: 55.05} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8775708263615543408 @@ -243204,7 +243166,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: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -243213,11 +243175,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 36 + m_FontSize: 42 m_FontStyle: 0 m_BestFit: 1 m_MinSize: 3 - m_MaxSize: 36 + m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -243335,7 +243297,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.0000023842, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8775710720111501234 @@ -243374,7 +243336,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, a: 1} + m_Color: {r: 0.9725491, g: 0.92549026, b: 0.85098046, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -243383,7 +243345,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 48 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -243654,8 +243616,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: 70, y: 79} - m_SizeDelta: {x: 140, y: 121} + m_AnchoredPosition: {x: 58, y: 79.7} + m_SizeDelta: {x: 116, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8776110070455323806 CanvasRenderer: @@ -243863,7 +243825,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.64, y: 0.05} + m_AnchoredPosition: {x: -4.3, y: -4.4} m_SizeDelta: {x: 177.55, y: 54.61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8776221260369459526 @@ -243887,7 +243849,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: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -243896,11 +243858,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 36 + m_FontSize: 42 m_FontStyle: 0 m_BestFit: 1 m_MinSize: 3 - m_MaxSize: 36 + m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -249238,7 +249200,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.0000023842, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 155.92, y: 77.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6655377552230782079 @@ -249277,7 +249239,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, a: 1} + m_Color: {r: 0.9725491, g: 0.92549026, b: 0.85098046, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -249286,7 +249248,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 48 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 @@ -254232,81 +254194,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 9048018877149632059} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 9048018877149632049} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 9048018877149632041} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 9048018877149632043} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 9048018877149632037} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 9048018877149632033} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 9048018877149632035} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 9048018877149632039} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 9048018877149632047} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 9048018877149632045} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Bones.Array.data[10] - value: - objectReference: {fileID: 9048018877149632051} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Bones.Array.data[11] - value: - objectReference: {fileID: 9048018877149632029} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Bones.Array.data[12] - value: - objectReference: {fileID: 9048018877149632055} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_Bones.Array.data[13] - value: - objectReference: {fileID: 9048018877149632053} - - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 9048018877149632059} - target: {fileID: 1271572593122207079, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} propertyPath: m_Bones.Array.data[0] @@ -254382,8 +254269,173 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 8944061103535072730} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 9048018877149632059} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 9048018877149632049} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 9048018877149632041} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 9048018877149632043} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 9048018877149632037} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 9048018877149632033} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 9048018877149632035} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 9048018877149632039} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 9048018877149632047} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 9048018877149632045} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Bones.Array.data[10] + value: + objectReference: {fileID: 9048018877149632051} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Bones.Array.data[11] + value: + objectReference: {fileID: 9048018877149632029} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Bones.Array.data[12] + value: + objectReference: {fileID: 9048018877149632055} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_Bones.Array.data[13] + value: + objectReference: {fileID: 9048018877149632053} + - target: {fileID: 1165092669487781510, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 9048018877149632059} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} +--- !u!4 &9048018877149632043 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632041 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377586, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632047 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377588, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072716 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907927, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072704 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907931, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072718 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907925, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072706 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907929, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632045 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377590, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632051 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377576, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632049 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377578, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9048018877149632037 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092669499377598, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072714 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907921, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072708 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907935, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072710 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907933, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8944061103535072722 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572593135907913, guid: 4c8639a41d5af934d933d50f22d40218, + type: 3} + m_PrefabInstance: {fileID: 7906694384947843483} + m_PrefabAsset: {fileID: 0} --- !u!4 &8944061103535072726 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572593135907917, guid: 4c8639a41d5af934d933d50f22d40218, @@ -254396,15 +254448,15 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072730 stripped +--- !u!4 &8944061103535072720 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907905, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1271572593135907915, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072704 stripped +--- !u!4 &8944061103535072730 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907931, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1271572593135907905, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} @@ -254414,93 +254466,9 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632047 stripped +--- !u!4 &9048018877149632029 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377588, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632045 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377590, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632059 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377568, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072718 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907925, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072716 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907927, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072722 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907913, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072710 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907933, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072720 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907915, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632053 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377582, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072764 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907943, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632041 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377586, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632043 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377584, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632037 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377598, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632039 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377596, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632033 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377594, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1165092669499377542, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} @@ -254510,21 +254478,21 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632029 stripped +--- !u!4 &8944061103535072764 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377542, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1271572593135907943, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072706 stripped +--- !u!4 &9048018877149632059 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907929, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1165092669499377568, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632049 stripped +--- !u!4 &9048018877149632053 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377578, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1165092669499377582, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} @@ -254534,15 +254502,15 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072708 stripped +--- !u!4 &9048018877149632033 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907935, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1165092669499377594, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &8944061103535072714 stripped +--- !u!4 &9048018877149632039 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572593135907921, guid: 4c8639a41d5af934d933d50f22d40218, + m_CorrespondingSourceObject: {fileID: 1165092669499377596, guid: 4c8639a41d5af934d933d50f22d40218, type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} @@ -254552,9 +254520,3 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7906694384947843483} m_PrefabAsset: {fileID: 0} ---- !u!4 &9048018877149632051 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092669499377576, guid: 4c8639a41d5af934d933d50f22d40218, - type: 3} - m_PrefabInstance: {fileID: 7906694384947843483} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab index 2a98dddc21..0701e959bf 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleGodSoulLayout.prefab @@ -1774,9 +1774,9 @@ RectTransform: m_Father: {fileID: 7083992215520858126} 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: 370.85, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 370.85, y: -61.7} m_SizeDelta: {x: 741.7, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1846349423519424633 @@ -2052,8 +2052,8 @@ RectTransform: m_Father: {fileID: 7083992215520858126} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 397.315, y: 0} m_SizeDelta: {x: 794.63, y: 0} m_Pivot: {x: 0.5, y: 1} @@ -3633,6 +3633,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8133986337164326410} m_Modifications: + - target: {fileID: 8073956589681315700, guid: 9e34ca2105307f24b96ade2cbf305e62, + type: 3} + propertyPath: m_Name + value: fx_shenhun + objectReference: {fileID: 0} - target: {fileID: 2033830630954937158, guid: 9e34ca2105307f24b96ade2cbf305e62, type: 3} propertyPath: m_LocalPosition.x @@ -3738,11 +3743,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8073956589681315700, guid: 9e34ca2105307f24b96ade2cbf305e62, - type: 3} - propertyPath: m_Name - value: fx_shenhun - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9e34ca2105307f24b96ade2cbf305e62, type: 3} --- !u!224 &178265486883988764 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintPanel.prefab b/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintPanel.prefab index efab790108..c99ca7cbd7 100644 --- a/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SoulPrint/SoulPrintPanel.prefab @@ -239,7 +239,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5711111241830959256 RectTransform: m_ObjectHideFlags: 0 @@ -24527,7 +24527,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7082714544173305546 RectTransform: m_ObjectHideFlags: 0 @@ -24756,7 +24756,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {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} @@ -24832,7 +24832,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -57.349976, y: -84.04999} - m_SizeDelta: {x: 60, y: 84} + m_SizeDelta: {x: 97, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5057811455108623833 CanvasRenderer: @@ -30055,8 +30055,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: 70, y: 90} - m_SizeDelta: {x: 140, y: 121} + m_AnchoredPosition: {x: 58, y: 79.7} + m_SizeDelta: {x: 116, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1835638802433367497 CanvasRenderer: @@ -30193,7 +30193,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -57.350098, y: -575} + m_AnchoredPosition: {x: -64.8, y: -562.9} m_SizeDelta: {x: 114.70001, y: 168.09998} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6094776389478172487 @@ -30382,7 +30382,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5895840991951113012 RectTransform: m_ObjectHideFlags: 0 @@ -30497,7 +30497,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: 383} + m_AnchoredPosition: {x: 6.9, y: 494.9} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6698283452277567238 @@ -30699,8 +30699,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: -5.2, y: 15.299999} - m_SizeDelta: {x: 322, y: 64.4} + m_AnchoredPosition: {x: 1.37, y: -0.44} + m_SizeDelta: {x: 175.41, y: 95.88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6184686970600464913 CanvasRenderer: @@ -30723,7 +30723,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.18823531, g: 0.30980393, b: 0.5058824, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -30731,11 +30731,11 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 35 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 3 m_MaxSize: 51 m_Alignment: 4 m_AlignByGeometry: 0 @@ -30969,7 +30969,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: 68, y: 68} + m_SizeDelta: {x: 65.4, y: 65.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3208073532332124040 CanvasRenderer: @@ -40755,8 +40755,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: -239.59998, y: 90.5} - m_SizeDelta: {x: 402, y: 234} + m_AnchoredPosition: {x: -117.5, y: 162.6} + m_SizeDelta: {x: 211, y: 107} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5060893349991286671 CanvasRenderer: @@ -40935,7 +40935,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -40986,7 +40986,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: 57.350098, y: -575} + m_AnchoredPosition: {x: 69.4, y: -589.9} m_SizeDelta: {x: 114.70001, y: 168.09998} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3957528042042170780 @@ -41263,7 +41263,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -101.799805, y: -956.1001} - m_SizeDelta: {x: 127, y: 135} + m_SizeDelta: {x: 132, y: 127} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7239027833556938891 CanvasRenderer: @@ -41619,8 +41619,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: 91, y: -447} - m_SizeDelta: {x: 354, y: 470} + m_AnchoredPosition: {x: 79, y: -434} + m_SizeDelta: {x: 519, y: 404} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9138231538396098527 CanvasRenderer: @@ -41676,7 +41676,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8708557581736934610 RectTransform: m_ObjectHideFlags: 0 @@ -46533,7 +46533,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2983110256035923289 RectTransform: m_ObjectHideFlags: 0 @@ -65967,7 +65967,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 380} + m_AnchoredPosition: {x: 0, y: 484} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8385341527737281261 @@ -71239,7 +71239,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 57.350006, y: -84.04999} - m_SizeDelta: {x: 60, y: 84} + m_SizeDelta: {x: 97, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1624506931873580806 CanvasRenderer: @@ -71538,8 +71538,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 202.5, y: -148} - m_SizeDelta: {x: 405, y: 138} + m_AnchoredPosition: {x: 73.7, y: -132.7} + m_SizeDelta: {x: 98, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4072144891088174203 CanvasRenderer: @@ -72051,7 +72051,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7000968113238702684 RectTransform: m_ObjectHideFlags: 0 @@ -76997,7 +76997,6 @@ GameObject: - component: {fileID: 4656303206379513369} - component: {fileID: 8692682360422462389} - component: {fileID: 4213741042924813791} - - component: {fileID: 6606439008336764125} m_Layer: 5 m_Name: Value m_TagString: Untagged @@ -77021,8 +77020,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: 424.5, y: -16} - m_SizeDelta: {x: 933.6, y: 30} + m_AnchoredPosition: {x: 532.8, y: -6.8} + m_SizeDelta: {x: 933.6, y: 55.32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8692682360422462389 CanvasRenderer: @@ -77045,7 +77044,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9843138, g: 0.8862746, b: 0.6, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -77053,8 +77052,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 634137158f07dff488d018d707aa403a, type: 2} - m_FontSize: 0 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -77065,20 +77064,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 2222222222222 ---- !u!114 &6606439008336764125 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8931411752281599040} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} - m_Name: - m_EditorClassIdentifier: - _textSpacing: -30.48 + m_Text: 4285 --- !u!1 &9116375194532373736 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index e9ab089f00..1aac7b5da7 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -92,7 +92,7 @@ function RoleEquipPanel:InitComponent() this.effect = Util.GetGameObject(self.transform, "bg/effect") for i = 1, 6 do tabs[i] = Util.GetGameObject(self.transform, "Tabs/Btn" .. i) - Util.GetGameObject(tabs[i], "Text"):GetComponent("Text").fontSize = GetCurLanguage() == 0 and 48 or 40 + Util.GetGameObject(tabs[i], "Text"):GetComponent("Text").fontSize = GetCurLanguage() == 0 and 40 or 40 redTabs[i] = Util.GetGameObject(tabs[i], "red") effectList[i] = Util.GetGameObject(self.transform, "bg/equipInfo/equip" .. i .. "/effect") end @@ -671,7 +671,7 @@ end function this:SetSelectBtn() this.selectBtn:SetActive(true) this.selectBtn.transform:SetParent(tabs[indexBtnNum].transform) - this.selectBtn:GetComponent("RectTransform").anchoredPosition3D = Vector3(-12.28, 1.08, 0) + this.selectBtn:GetComponent("RectTransform").anchoredPosition3D = Vector3(0, 0, 0) this.selectBtn.transform:SetSiblingIndex(1) --this.selectBtn.transform.localScale = Vector3.one --this.selectBtn:GetComponent("Image"):SetNativeSize()