diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/l_leichong_tu.jpg b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/l_leichong_tu.jpg index f8deecfd4b..9505ebbbf8 100644 Binary files a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/l_leichong_tu.jpg and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/l_leichong_tu.jpg differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/l_leichong_tu_5898.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/l_leichong_tu_5898.png new file mode 100644 index 0000000000..f04d311002 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/l_leichong_tu_5898.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/l_leichong_tu_5898.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/l_leichong_tu_5898.png.meta new file mode 100644 index 0000000000..9739b0a414 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/l_leichong_tu_5898.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: c7d36974206a07348b0f9bbf78ef28be +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 734dd6a647dd6324184524bdb06be036 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab index c08b2ce039..2b9586c87d 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab @@ -11068,6 +11068,80 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5FC5\u5B9A\u83B7\u5F974\u661F\u53CA\u4EE5\u4E0A\u795E\u5C06" +--- !u!1 &2805894608886825043 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1716214957021616883} + - component: {fileID: 3890064347644507805} + - component: {fileID: 8417027437846675060} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1716214957021616883 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2805894608886825043} + 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: 7418089345689583210} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.39610174} + m_AnchorMax: {x: 0.5, y: 0.39610174} + m_AnchoredPosition: {x: 181, y: 83} + m_SizeDelta: {x: 678, y: 245} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3890064347644507805 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2805894608886825043} + m_CullTransparentMesh: 0 +--- !u!114 &8417027437846675060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2805894608886825043} + 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: c7d36974206a07348b0f9bbf78ef28be, 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 &2819432265183645017 GameObject: m_ObjectHideFlags: 0 @@ -18222,6 +18296,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3289416830980271015} m_CullTransparentMesh: 0 +--- !u!1 &3330006556557932423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1854272509670267911} + - component: {fileID: 8466004943863475395} + - component: {fileID: 380937246086603746} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1854272509670267911 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3330006556557932423} + 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: 7418089345689583210} + 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: 187.8, y: -16.3} + m_SizeDelta: {x: 664.5, y: 32.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8466004943863475395 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3330006556557932423} + m_CullTransparentMesh: 0 +--- !u!114 &380937246086603746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3330006556557932423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.9058824, b: 0.7490196, 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_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 26 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6D3B\u52A8\u671F\u95F4\uFF0C\u7D2F\u8BA1\u5145\u503C\u91D1\u989D\u8FBE\u5230\u6761\u4EF6\uFF0C\u5373\u53EF\u9886\u53D6\u9650\u65F6\u8C6A\u793C" --- !u!1 &3332210018519927459 GameObject: m_ObjectHideFlags: 0 @@ -20883,6 +21036,85 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u540E\u5237\u65B0" LanguageIndex: 0 +--- !u!1 &4136469528793777667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3129186934683472544} + - component: {fileID: 1833456856835910015} + - component: {fileID: 6182399689767144648} + m_Layer: 5 + m_Name: Text2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3129186934683472544 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4136469528793777667} + 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: 7418089345689583210} + 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: 197.99998, y: -66} + m_SizeDelta: {x: 596.9, y: 32.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1833456856835910015 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4136469528793777667} + m_CullTransparentMesh: 0 +--- !u!114 &6182399689767144648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4136469528793777667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.9058824, b: 0.7490196, 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_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\uFF08\u8D2D\u4E70\u793C\u5305\u6216\u8005\u5145\u503C\u5996\u6676\u5747\u8BA1\u7B97\u5728\u5185\uFF09" --- !u!1 &4176943088936872840 GameObject: m_ObjectHideFlags: 0 @@ -35930,7 +36162,7 @@ GameObject: - component: {fileID: 68668057159031517} - component: {fileID: 441495240168842132} m_Layer: 5 - m_Name: bg + m_Name: bg1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -35946,7 +36178,10 @@ RectTransform: 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_Children: + - {fileID: 1716214957021616883} + - {fileID: 1854272509670267911} + - {fileID: 3129186934683472544} m_Father: {fileID: 6872382260446978439} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua index b1d5c37f4a..4f818081a1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua @@ -15,6 +15,8 @@ end function LeiJiChongZhiPage:InitComponent(gameObject) this.time = Util.GetGameObject(gameObject, "tiao/time"):GetComponent("Text") + this.text1 = Util.GetGameObject(gameObject, "bg1/Text"):GetComponent("Text") + this.text2 = Util.GetGameObject(gameObject, "bg1/Text2"):GetComponent("Text") this.itemPre = Util.GetGameObject(gameObject, "ItemPre") this.scrollItem = Util.GetGameObject(gameObject, "grid") local rootHight = this.scrollItem.transform.rect.height @@ -83,8 +85,12 @@ function LeiJiChongZhiPage:OnShowData() if allData then if curtype == ActivityTypeDef.AccumulativeRechargeExper then endtime = CalculateSecondsNowTo_N_OClock(5) + this.text1.text = "每日累计充值金额达到条件,即可领取限时豪礼" + this.text2.text = "(购买礼包或者充值妖晶均计算在内)" else endtime = ActivityGiftManager.GetTaskEndTime(curtype) - GetTimeStamp() + this.text1.text = "活动期间,累计充值金额达到条件,即可领取限时豪礼" + this.text2.text = "(购买礼包或者充值妖晶均计算在内)" end this.SortData(allData)