diff --git a/Assets/ManagedResources/BG/UI/1All/X1_zaixianjiangli_jinglidiban_yilingqu.png b/Assets/ManagedResources/BG/UI/1All/X1_zaixianjiangli_jinglidiban_yilingqu.png new file mode 100644 index 0000000000..76c18e8065 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/X1_zaixianjiangli_jinglidiban_yilingqu.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/X1_zaixianjiangli_jinglidiban_yilingqu.png.meta b/Assets/ManagedResources/BG/UI/1All/X1_zaixianjiangli_jinglidiban_yilingqu.png.meta new file mode 100644 index 0000000000..fb2ca0f93a --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/X1_zaixianjiangli_jinglidiban_yilingqu.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: 0f75c5da78dbb6a44a8ac8079e4d6f92 +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: 61, y: 24, z: 73, w: 80} + 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 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: fdf9dd1d2796a6941970b825b1d8b265 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab index 6b354ba66e..e85eb998ce 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab @@ -767,10 +767,10 @@ RectTransform: m_Father: {fileID: 224115538434952156} m_RootOrder: 10 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: 50, y: 57} - m_SizeDelta: {x: 850.57, y: 55.55} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 50, y: -823} + m_SizeDelta: {x: -229.43, y: 55.549988} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &569836967 CanvasRenderer: @@ -2220,10 +2220,10 @@ RectTransform: m_Father: {fileID: 224115538434952156} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -880.5} + m_SizeDelta: {x: 0, y: 1761} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1214415783535910 GameObject: @@ -3180,9 +3180,9 @@ RectTransform: m_Father: {fileID: 224115538434952156} 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: -23.8, y: 336.6} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -23.8, y: -543.4} m_SizeDelta: {x: 1080, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222346043805713504 @@ -3517,10 +3517,10 @@ RectTransform: m_Father: {fileID: 224115538434952156} 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} - m_AnchoredPosition: {x: 13.03, y: -896.11993} - m_SizeDelta: {x: 259.07, y: 95.11} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 13.03, y: -16.119934} + m_SizeDelta: {x: 259.07, y: 95.109985} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222193881412881734 CanvasRenderer: @@ -3609,7 +3609,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1577117849624036} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} m_CullingMode: 0 @@ -3817,10 +3817,10 @@ RectTransform: m_Father: {fileID: 224115538434952156} m_RootOrder: 7 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -133} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: -980, y: -1660} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &114861066741700688 MonoBehaviour: @@ -30641,9 +30641,9 @@ RectTransform: m_Father: {fileID: 224940237106884974} 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: -414, y: 87} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 126, y: -873} m_SizeDelta: {x: 252, y: 134} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8223500229529607729 @@ -36682,10 +36682,10 @@ RectTransform: m_Father: {fileID: 224115538434952156} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -1.5998535, y: 212.8} - m_SizeDelta: {x: 0, y: 100} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -1.5998535, y: -667.2} + m_SizeDelta: {x: 1080, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1651308860009044788 GameObject: @@ -58588,9 +58588,9 @@ RectTransform: m_Father: {fileID: 224115538434952156} m_RootOrder: 14 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: 55.9, y: -789} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 55.9, y: 91} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5160507017332407076 @@ -69246,8 +69246,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -301} - m_SizeDelta: {x: -216, y: -936} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1221667142595184593 CanvasRenderer: @@ -93333,10 +93333,10 @@ RectTransform: m_Father: {fileID: 224115538434952156} m_RootOrder: 13 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.8024802, y: -784.9} - m_SizeDelta: {x: 1078.4, y: 75.8} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -0.8024802, y: 95.099976} + m_SizeDelta: {x: 1078.4, y: 75.79999} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &365307137303593027 CanvasRenderer: @@ -93731,9 +93731,9 @@ RectTransform: m_Father: {fileID: 224115538434952156} m_RootOrder: 9 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: -32, y: 614} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -32, y: -266} m_SizeDelta: {x: 1080, y: 169.26294} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8963787482496569464 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/BoxRewardShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/BoxRewardShowPopup.prefab index e7404806e1..b840c4e047 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/BoxRewardShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/BoxRewardShowPopup.prefab @@ -68,7 +68,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: a9d99aaadd0a9e143b499c7f81be48b2, type: 3} + m_Sprite: {fileID: 21300000, guid: 0f75c5da78dbb6a44a8ac8079e4d6f92, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -88,6 +88,7 @@ GameObject: - component: {fileID: 4313352104623850896} - component: {fileID: 3053693435245224188} - component: {fileID: 5174403494178349800} + - component: {fileID: 3577112874192318333} m_Layer: 5 m_Name: getInfo m_TagString: Untagged @@ -111,7 +112,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: -137.6, y: 31.92} + m_AnchoredPosition: {x: -137.6, y: 42.2} m_SizeDelta: {x: 243.14, y: 38.93} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3053693435245224188 @@ -135,7 +136,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.95686275, g: 0.9137255, b: 0.79607844, a: 1} + m_Color: {r: 1, g: 0.73170733, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -157,6 +158,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6D3B\u8DC3\u5EA6\u8FBE\u523025\u83B7\u5F97:" LanguageIndex: 11155 +--- !u!114 &3577112874192318333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1382404403900267544} + 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: 0.2, y: -0.2} + m_UseGraphicAlpha: 1 --- !u!1 &2754077924357946759 GameObject: m_ObjectHideFlags: 0 @@ -191,7 +207,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -8.5} + m_AnchoredPosition: {x: -0.000030517578, y: -8.5} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &4618542884487971357 @@ -347,10 +363,10 @@ RectTransform: m_Father: {fileID: 5857632331839885829} 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: 5.67, y: 84.99} - m_SizeDelta: {x: 271.43, y: 53.82} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -29.46} + m_SizeDelta: {x: 0, y: 64.54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4227349640935253932 CanvasRenderer: @@ -367,20 +383,20 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5358276464861204877} - m_Enabled: 1 + m_Enabled: 0 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_Color: {r: 1, g: 0.84278667, b: 0, 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: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Sprite: {fileID: 21300000, guid: 625c9b931ac325044bf0a31622feebc1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -678,6 +694,7 @@ GameObject: - component: {fileID: 6493090192649059652} - component: {fileID: 8676532303112283732} - component: {fileID: 8903267190979061610} + - component: {fileID: 2698532337486822453} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -701,7 +718,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: -6, y: -2.81} + m_AnchoredPosition: {x: -6, y: -0.6} m_SizeDelta: {x: 163.25, y: 48.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8676532303112283732 @@ -725,7 +742,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9843137, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -747,3 +764,18 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5956\u52B1\u9884\u89C8" LanguageIndex: 10314 +--- !u!114 &2698532337486822453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8883644459415460423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.33962262, g: 0, b: 0.012408364, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/SecretBox/WishGemBuyTenPanel.prefab b/Assets/ManagedResources/Prefabs/UI/SecretBox/WishGemBuyTenPanel.prefab index e52bdba027..30212726d4 100644 --- a/Assets/ManagedResources/Prefabs/UI/SecretBox/WishGemBuyTenPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SecretBox/WishGemBuyTenPanel.prefab @@ -257,8 +257,8 @@ RectTransform: m_Father: {fileID: 224533120120159862} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 165} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} @@ -10630,8 +10630,8 @@ RectTransform: m_Father: {fileID: 224533120120159862} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} @@ -84273,10 +84273,10 @@ RectTransform: m_Father: {fileID: 224108844430661056} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -1080, y: -2460} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &95898582153097858 Animator: diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index 889ee8a5e7..23ed8a6ce2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -167,12 +167,12 @@ function RechargeViewNew:RefreshReward(Data) self.btnGet:GetComponent("Button").interactable = true Util.SetGray(self.btnGet, false) if rechargeNum >= needNum then - self.btnGet:GetComponent("Image").sprite = self.spLoader:LoadSprite("Btn_hz_cheng_01") + self.btnGet:GetComponent("Image").sprite = self.spLoader:LoadSprite("X1_zhanling_pata_bt_03") if BagManager.GetTotalItemNum(Data.data.costId) >= Data.data.price then self.btnRed:SetActive(true) end else - self.btnGet:GetComponent("Image").sprite = self.spLoader:LoadSprite("Btn_hz_cheng_01") + self.btnGet:GetComponent("Image").sprite = self.spLoader:LoadSprite("X1_zhanling_pata_bt_03") end else self.btnText:SetActive(true)