diff --git a/Assets/ManagedResources/BG/UI/BaoKu/X1_tongyong_huode_biaotijianbian.png b/Assets/ManagedResources/BG/UI/BaoKu/X1_tongyong_huode_biaotijianbian.png new file mode 100644 index 0000000000..2ee7c102a6 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/BaoKu/X1_tongyong_huode_biaotijianbian.png differ diff --git a/Assets/ManagedResources/BG/UI/BaoKu/X1_tongyong_huode_biaotijianbian.png.meta b/Assets/ManagedResources/BG/UI/BaoKu/X1_tongyong_huode_biaotijianbian.png.meta new file mode 100644 index 0000000000..4aabe7bcbe --- /dev/null +++ b/Assets/ManagedResources/BG/UI/BaoKu/X1_tongyong_huode_biaotijianbian.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 5396e3b0d75d0c245a30c07637f69ece +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: 56d3b5d37ac488f4d8a70a4cc47d437b + 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 6e089bb9a5..67cb6ed347 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -10785,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: 0, y: 0} + m_AnchoredPosition: {x: 133.5, y: 0} m_SizeDelta: {x: 0, y: 68.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1240811747 @@ -11125,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: 0, y: 0} + m_AnchoredPosition: {x: 293.5, y: 0} m_SizeDelta: {x: 0, y: 68.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1596169479 @@ -40817,8 +40817,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: 47, y: 29.499928} - m_SizeDelta: {x: 109.23, y: 109.04} + m_AnchoredPosition: {x: 47, y: 26.6} + m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &105834560485712322 CanvasRenderer: @@ -40848,7 +40848,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: 07939926d7a30d34dac9e0bac0e6bef5, type: 3} + m_Sprite: {fileID: 21300000, guid: 123cd399d0bfdba4099960524df57d9e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -88737,6 +88737,7 @@ GameObject: - component: {fileID: 3013323903996126055} - component: {fileID: 3013323903996126053} - component: {fileID: 3013323903996126054} + - component: {fileID: 4530993416380270235} m_Layer: 5 m_Name: num m_TagString: Untagged @@ -88760,7 +88761,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: 12.540012, y: -6.0000725} + m_AnchoredPosition: {x: 12.540012, y: -8.1} m_SizeDelta: {x: 160, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3013323903996126053 @@ -88805,6 +88806,21 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 100 +--- !u!114 &4530993416380270235 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3013323903996126072} + 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 &3013323904051820471 GameObject: m_ObjectHideFlags: 0 @@ -98079,7 +98095,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3013323905690480856 RectTransform: m_ObjectHideFlags: 0 @@ -201847,7 +201863,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: 0, y: 0} + m_AnchoredPosition: {x: 355, y: 0} m_SizeDelta: {x: 0, y: 69.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7203306409298755909 @@ -208889,7 +208905,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: 46.44001, y: 29.799927} + m_AnchoredPosition: {x: 46.44001, y: 33.4} m_SizeDelta: {x: 95, y: 95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3602753115386589030 @@ -224968,15 +224984,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} ---- !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} +--- !u!224 &830511510176938944 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf, + type: 3} + m_PrefabInstance: {fileID: 8971074634032498639} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyLvUpPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyLvUpPanel.prefab index 9c72869eaa..330af5be2b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyLvUpPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyLvUpPanel.prefab @@ -697,8 +697,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -234, y: 106} - m_SizeDelta: {x: 272.52002, y: 83.81} + m_AnchoredPosition: {x: -234, y: 111} + m_SizeDelta: {x: 270, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8305654950852658372 CanvasRenderer: @@ -721,15 +721,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9528302, g: 0.4980979, b: 0.38203096, 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: b1134bbf289f6804196269f211ceb031, 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 @@ -787,7 +787,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2022748833372537490} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} m_CullingMode: 0 @@ -2755,7 +2755,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: 0.122641504, g: 0.11627803, b: 0.11627803, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2895,8 +2895,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: 217, y: 106} - m_SizeDelta: {x: 272.52, y: 83.81} + m_AnchoredPosition: {x: 217, y: 111} + m_SizeDelta: {x: 270, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6375091461778044110 CanvasRenderer: @@ -2919,15 +2919,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.8235295, b: 0.34509805, 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: fa9b45624eb407043825833322436cd3, 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 @@ -2985,7 +2985,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8853127179332475563} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} m_CullingMode: 0 @@ -3068,7 +3068,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: 0.122641504, g: 0.11627803, b: 0.11627803, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyPanel.prefab index 466cd6bc66..fc1c8adb06 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Skill/HeroPotencyPanel.prefab @@ -293,7 +293,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 3937515349930592392} - {fileID: 8979604583196391230} + - {fileID: 425720802870280413} - {fileID: 9061675142307396770} - {fileID: 1118513371606340603} - {fileID: 8358685323825040817} @@ -341,7 +343,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: 996442112c6c3d04c86a27f4c31d997c, type: 3} + m_Sprite: {fileID: 21300000, guid: b58713968e107324dbcdba541e584a97, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2465,11 +2467,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7291677974192425490} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -4.21, y: -41} + m_AnchoredPosition: {x: 0, y: -46.1} m_SizeDelta: {x: 227.6, y: 43.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3044936633401095989 @@ -3171,7 +3173,7 @@ RectTransform: m_Children: - {fileID: 4185023736460575320} m_Father: {fileID: 7291677974192425490} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -3276,6 +3278,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &2860151345234221648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 425720802870280413} + - component: {fileID: 2408510514621114858} + - component: {fileID: 1968154905845163242} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &425720802870280413 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2860151345234221648} + m_LocalRotation: {x: 1, y: 0, 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: 7291677974192425490} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 34, y: -681.9} + m_SizeDelta: {x: 800, y: 800} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2408510514621114858 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2860151345234221648} + m_CullTransparentMesh: 0 +--- !u!114 &1968154905845163242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2860151345234221648} + 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.078431375, g: 0.14117648, b: 0.28627452, a: 0.32941177} + 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: dd48c4c876c9bdd41bfab3246f1d7c04, 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 &2911311855608958242 GameObject: m_ObjectHideFlags: 0 @@ -3425,7 +3501,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7291677974192425490} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -3563,12 +3639,12 @@ RectTransform: m_Children: - {fileID: 4084311398351970593} m_Father: {fileID: 7291677974192425490} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -259.3, y: -64.2} - m_SizeDelta: {x: 110, y: 110} + m_AnchoredPosition: {x: -199, y: -67} + m_SizeDelta: {x: 52, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6797061669773567766 CanvasRenderer: @@ -4122,7 +4198,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8979604583196391230 RectTransform: m_ObjectHideFlags: 0 @@ -4135,12 +4211,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7291677974192425490} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 10, y: -107.140015} - m_SizeDelta: {x: 459.27, y: 68.53} + m_AnchoredPosition: {x: 0, y: -570.03} + m_SizeDelta: {x: 840, y: 976.43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3332450459819794264 CanvasRenderer: @@ -4163,14 +4239,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.6132076, g: 0.6132076, b: 0.6132076, a: 0.49019608} 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: a9c02e2fe460c9d4e8192af15d49e483, type: 3} + m_Sprite: {fileID: 21300000, guid: 1c277d7bafa8559468580283ac966e48, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4288,7 +4364,7 @@ RectTransform: - {fileID: 9036336711224762185} - {fileID: 1048734205820756108} m_Father: {fileID: 7291677974192425490} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4504,12 +4580,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7291677974192425490} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -23.799988, y: -76.6} - m_SizeDelta: {x: 100, y: 83} + m_AnchoredPosition: {x: -54.8, y: -47.6} + m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3970827270026282698 CanvasRenderer: @@ -4539,7 +4615,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: 14febe560d2f44a4ebfbc3a8b2cbe026, type: 3} + m_Sprite: {fileID: 21300000, guid: 58d829c46f84cc24bbcbbdb99411714c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4714,7 +4790,7 @@ RectTransform: m_LocalScale: {x: 1.5, y: 1.5, z: 1} m_Children: [] m_Father: {fileID: 7291677974192425490} - m_RootOrder: 8 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5243,7 +5319,7 @@ RectTransform: m_LocalScale: {x: 1.5, y: 1.5, z: 1} m_Children: [] m_Father: {fileID: 7291677974192425490} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5904,11 +5980,11 @@ RectTransform: - {fileID: 8063148406133354940} - {fileID: 6043783546069413436} m_Father: {fileID: 7291677974192425490} - m_RootOrder: 3 + 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: 0, y: -70} + m_AnchoredPosition: {x: 0, y: -86.30005} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6078191505958703496 @@ -6547,11 +6623,11 @@ RectTransform: m_Children: - {fileID: 5225995387536556913} m_Father: {fileID: 7291677974192425490} - m_RootOrder: 1 + 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} - m_AnchoredPosition: {x: 0, y: 34.299995} + m_AnchoredPosition: {x: 0, y: 18} m_SizeDelta: {x: 755, y: 733} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7688059151632438232 @@ -6817,7 +6893,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: 88, y: 72} + m_SizeDelta: {x: 52, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7219840534232891233 CanvasRenderer: @@ -7247,6 +7323,7 @@ GameObject: - component: {fileID: 6727079257835830319} - component: {fileID: 4987857707258824429} - component: {fileID: 7607121958531999364} + - component: {fileID: 4997098482490822352} m_Layer: 5 m_Name: resetStr m_TagString: Untagged @@ -7266,7 +7343,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7291677974192425490} - m_RootOrder: 11 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -7294,7 +7371,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.08627451, g: 0.14901961, b: 0.2901961, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -7316,6 +7393,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u91CD\u7F6E" LanguageIndex: 0 +--- !u!114 &4997098482490822352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7436638352096440587} + 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 &7520590658209543278 GameObject: m_ObjectHideFlags: 0 @@ -7464,6 +7556,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7603423763621332352 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3937515349930592392} + - component: {fileID: 2109024556765434180} + - component: {fileID: 1786252410055329283} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3937515349930592392 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7603423763621332352} + 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: 7291677974192425490} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -67.83, y: -45.8} + m_SizeDelta: {x: 801.72, y: 86.93} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2109024556765434180 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7603423763621332352} + m_CullTransparentMesh: 0 +--- !u!114 &1786252410055329283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7603423763621332352} + 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: c39d460845b8bfb4aab7d859cd894c2f, 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 &7633201733786670451 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/OnlineReward/OnlineRewardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/OnlineReward/OnlineRewardPanel.prefab index b9a3587fe4..b3aa8f8d52 100644 --- a/Assets/ManagedResources/Prefabs/UI/OnlineReward/OnlineRewardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/OnlineReward/OnlineRewardPanel.prefab @@ -714,7 +714,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1555336025957337984 RectTransform: m_ObjectHideFlags: 0 @@ -1173,7 +1173,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -11.61, y: -518.00006} - m_SizeDelta: {x: 209.26, y: 69.46} + m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4916908169215410511 CanvasRenderer: @@ -1196,15 +1196,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.63529414, b: 0.11764707, 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: 9657165ee43a7cb44ba1f1d5b522d220, 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 @@ -1341,12 +1341,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6631754303772144012} - 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} - m_AnchoredPosition: {x: 0, y: -25.9} - m_SizeDelta: {x: 875.3, y: 641.5} + m_AnchoredPosition: {x: 0, y: -12.2} + m_SizeDelta: {x: 880, y: 669.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1087643590289456861 CanvasRenderer: @@ -1369,7 +1369,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5566038, g: 0.5566038, b: 0.5566038, a: 0.42745098} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1538,12 +1538,12 @@ RectTransform: - {fileID: 1980409146586669169} - {fileID: 6421008487197975363} m_Father: {fileID: 6631754303772144012} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -5.200012, y: -1} - m_SizeDelta: {x: -150.8, y: -509.7} + m_AnchoredPosition: {x: -0.3000183, y: -14} + m_SizeDelta: {x: -160.6, y: -421.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &5317356944270574070 Canvas: @@ -2237,6 +2237,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &5054484875789356314 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3081936544427178690} + - component: {fileID: 4157912878788325130} + - component: {fileID: 5805846961591539127} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3081936544427178690 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5054484875789356314} + 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: 6631754303772144012} + 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: -69.82, y: 464.5} + m_SizeDelta: {x: 894.97, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4157912878788325130 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5054484875789356314} + m_CullTransparentMesh: 0 +--- !u!114 &5805846961591539127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5054484875789356314} + 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: c39d460845b8bfb4aab7d859cd894c2f, 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 &5318074761023787425 GameObject: m_ObjectHideFlags: 0 @@ -2383,7 +2457,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -11.61, y: -518} - m_SizeDelta: {x: 209.26, y: 69.46} + m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6865377683232565591 CanvasRenderer: @@ -2406,15 +2480,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.2784314, g: 0.6392157, 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: fa9b45624eb407043825833322436cd3, 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 @@ -2878,6 +2952,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 3081936544427178690} - {fileID: 4229585954170434107} - {fileID: 6631754305078478492} - {fileID: 6631754303891943345} @@ -2912,14 +2987,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.8117647} + 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: aa49f00fc82880a4584b2b1f3867a979, type: 3} + m_Sprite: {fileID: 21300000, guid: b58713968e107324dbcdba541e584a97, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2961,7 +3036,7 @@ RectTransform: - {fileID: 4868474814583752816} - {fileID: 2445984844216577658} m_Father: {fileID: 6631754303772144012} - 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} @@ -3157,7 +3232,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6631754303772144012} - 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} @@ -3357,11 +3432,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6631754303772144012} - 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} - m_AnchoredPosition: {x: 0, y: 467.98} + m_AnchoredPosition: {x: 0, y: 464.3} m_SizeDelta: {x: 700, y: 75.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6631754305078478494 @@ -3385,7 +3460,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8396226, g: 0.8169871, b: 0.16237983, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3395,7 +3470,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 55 - m_FontStyle: 0 + m_FontStyle: 2 m_BestFit: 0 m_MinSize: 5 m_MaxSize: 90