diff --git a/Assets/ManagedResources/BG/UI/1All/Ancientruins_zlbtn.png b/Assets/ManagedResources/BG/UI/1All/Ancientruins_zlbtn.png new file mode 100644 index 0000000000..4280970b50 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/Ancientruins_zlbtn.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/Ancientruins_zlbtn.png.meta b/Assets/ManagedResources/BG/UI/1All/Ancientruins_zlbtn.png.meta new file mode 100644 index 0000000000..9db66bc383 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/Ancientruins_zlbtn.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 13948c422f3f01949b62642a27e7f046 +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: e113d99541758ba4fb263f0c95b9b3dd + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab index 08fd42ade9..2c9db366d1 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab @@ -18096,7 +18096,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: 7.1} + m_AnchoredPosition: {x: -1.4, y: 1.5} m_SizeDelta: {x: 160, y: 47.98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5736388407104608439 @@ -18140,7 +18140,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: New Text + m_Text: 15 --- !u!114 &107735428350691665 MonoBehaviour: m_ObjectHideFlags: 0 @@ -18340,7 +18340,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -346.5, y: -80} - m_SizeDelta: {x: 129, y: 101} + m_SizeDelta: {x: 146, y: 146} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8611711615031641208 CanvasRenderer: @@ -18370,7 +18370,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: 1348835932c6bff49886ac8ba69eeec0, type: 3} + m_Sprite: {fileID: 21300000, guid: 13948c422f3f01949b62642a27e7f046, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -39762,7 +39762,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 4} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 102, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5714047808390805826 @@ -40488,7 +40488,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: 296d377425fecff4daaa56ea39a4bd27, type: 3} + m_Sprite: {fileID: 21300000, guid: 90a4cab76c6cfcb47b665efd61b19bc9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab b/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab index a3b2732243..561f95adc8 100644 --- a/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab @@ -87,6 +87,7 @@ GameObject: - component: {fileID: 1817200903926908161} - component: {fileID: 1105400113769574238} - component: {fileID: 6704889549388359208} + - component: {fileID: 6797586831435588722} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -156,6 +157,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5237\u65B0\u65F6\u95F4:06:09:23:24" LanguageIndex: 0 +--- !u!114 &6797586831435588722 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410632908566662960} + 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 &626477204229868700 GameObject: m_ObjectHideFlags: 0 @@ -739,7 +755,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: d9eb47e7e33ca8a4aa13a0de17b927ab, type: 3} + m_Sprite: {fileID: 21300000, guid: 90a4cab76c6cfcb47b665efd61b19bc9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2242,7 +2258,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: 7.1} + m_AnchoredPosition: {x: -1.2, y: 1.6} m_SizeDelta: {x: 160, y: 47.98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7295399741626864174 @@ -2507,7 +2523,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -346.5, y: -80} - m_SizeDelta: {x: 129, y: 101} + m_SizeDelta: {x: 146, y: 146} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4274281064170348843 CanvasRenderer: @@ -2537,7 +2553,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: edb5ebb438d20f744959876dba82dd09, type: 3} + m_Sprite: {fileID: 21300000, guid: 13948c422f3f01949b62642a27e7f046, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3656,7 +3672,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: e0d70e0322fd03b4bbf550d673a7cc5d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4011,13 +4027,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7674280127341663863} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: -100} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5160537316942131690} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 3.3, y: 0} @@ -4044,7 +4060,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137257, g: 0.23137257, b: 0.23137257, a: 1} + m_Color: {r: 0.09433961, g: 0.09389461, b: 0.09389461, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4719,13 +4735,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8884065852126531152} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: -100} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7457893688675853356} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -4752,7 +4768,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6117647, g: 0.48627454, b: 0.28627452, a: 1} + m_Color: {r: 0.09803922, g: 0.09411765, b: 0.09411765, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index 160582f169..03212cfe7c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -52,7 +52,7 @@ function EveryDayGiftNew:InitComponent() --=================Rewards================= self.Reward = Util.GetGameObject(self.newPage,"Reward") - self.Reward:GetComponent("RectTransform").sizeDelta = Vector2.New(1080,864.7) + self.Reward:GetComponent("RectTransform").sizeDelta = Vector2.New(1080,860) self.Reward:GetComponent("RectTransform").localPosition = Vector3.New(0,209,-100) self.endTimeBg = Util.GetGameObject(self.newPage,"growPack/Time") self.endTime = Util.GetGameObject(self.endTimeBg,"Text"):GetComponent("Text") @@ -276,7 +276,7 @@ function EveryDayGiftNew:RefreshReward(Data) local size = rechargeNum/num size = size > 1 and 1 or size -- LogRed(DynamicActivityManager.Index.." #growData:"..tostring(#growData).." text:"..tostring(text)) - self.icon.sprite = self.spLoader:LoadSprite("UI_hz_huizhang") + self.icon.sprite = self.spLoader:LoadSprite("Ancientruins_zlbtn") self.Level.text=text self.progress:GetComponent("RectTransform").sizeDelta = Vector3.New(483*size,12,0) self.value.text = string.format("%s/%s",rechargeNum,num) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index 4eae7432bb..889ee8a5e7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -154,7 +154,7 @@ function RechargeViewNew:RefreshReward(Data) self.tip.text="每充值1元可以获得10点名望经验" local size = rechargeNum/num size = size > 1 and 1 or size - self.icon.sprite = self.spLoader:LoadSprite("UI_hz_huizhang") + self.icon.sprite = self.spLoader:LoadSprite("Ancientruins_zlbtn") self.Level.text=text self.progress:GetComponent("RectTransform").sizeDelta = Vector3.New(483*size,12,0) self.value.text = string.format("%s/%s",rechargeNum,num)