From 45a1079d88aa4d7d94d7cdfbb5ab3392b032ae95 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 18 Jun 2021 18:55:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=9C=A3=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommonAtlas/d_dengfengzaoji_xiaozidi.png | Bin 0 -> 10088 bytes .../d_dengfengzaoji_xiaozidi.png.meta | 110 ++++++++++++++++++ .../Prefabs/UI/NewActivity/UpStarPre.prefab | 4 +- .../ResConfigs/ResourcePathConfig.asset | 17 ++- .../Modules/NewActivity/CommonActPage.lua | 31 +++-- 5 files changed, 152 insertions(+), 10 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/CommonAtlas/d_dengfengzaoji_xiaozidi.png create mode 100644 Assets/ManagedResources/Atlas/CommonAtlas/d_dengfengzaoji_xiaozidi.png.meta diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/d_dengfengzaoji_xiaozidi.png b/Assets/ManagedResources/Atlas/CommonAtlas/d_dengfengzaoji_xiaozidi.png new file mode 100644 index 0000000000000000000000000000000000000000..d937b74db8c56fe52a55c76a7a0571f6b42384f5 GIT binary patch literal 10088 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 KMNUMnLSTYL%ZzFO literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/d_dengfengzaoji_xiaozidi.png.meta b/Assets/ManagedResources/Atlas/CommonAtlas/d_dengfengzaoji_xiaozidi.png.meta new file mode 100644 index 0000000000..822148a6f5 --- /dev/null +++ b/Assets/ManagedResources/Atlas/CommonAtlas/d_dengfengzaoji_xiaozidi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: e5d62ef53f4e50b4c82c34fb24fff4bd +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: 56 + 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: 885496b284131a6418b5a20738534dc6 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: CommonAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab index d92ff1a052..eaccfb852c 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab @@ -288,7 +288,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: 140, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 61.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &170924767488423321 @@ -15513,7 +15513,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: -41.1, y: -31.5} + m_AnchoredPosition: {x: -25.84, y: -13.1} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.49999997, y: 0.5} --- !u!222 &6689915886973298813 diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 8ab0f270b8..bed8b34c02 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -1134,6 +1134,7 @@ MonoBehaviour: - Assets/ManagedResources/~Lua/Modules/UIComponent - Assets/ManagedResources/~Lua/Modules/Update - Assets/ManagedResources/~Lua/Modules/UpGradePackage + - Assets/ManagedResources/~Lua/Modules/UpStar - Assets/ManagedResources/~Lua/Modules/Vip - Assets/ManagedResources/~Lua/Modules/WarPowerChange - Assets/ManagedResources/~Lua/Modules/WorkShop @@ -16722,6 +16723,10 @@ MonoBehaviour: extension: .png resPathIndex: 22 resAbNameIndex: 11 + - resName: d_dengfengzaoji_xiaozidi + extension: .png + resPathIndex: 23 + resAbNameIndex: 12 - resName: jiantou extension: .png resPathIndex: 23 @@ -57218,6 +57223,10 @@ MonoBehaviour: extension: .prefab resPathIndex: 596 resAbNameIndex: 3851 + - resName: UpStarPre + extension: .prefab + resPathIndex: 596 + resAbNameIndex: 3851 - resName: NewItem extension: .prefab resPathIndex: 597 @@ -80380,6 +80389,7 @@ MonoBehaviour: - lz4/dynamicatlas/commonatlas/artfont/r_xianshiduihuan_huodongguizezi_zh.unity3d - lz4/dynamicatlas/commonatlas/artfont/r_xianshiduihuan_kehuojianglizi_zh.unity3d - lz4/dynamicatlas/commonatlas/artfont/s_shenyitianjiang_shizhuangyulan_zh.unity3d + - lz4/dynamicatlas/commonatlas/artfont/s_slbz_yilingqu_zh.unity3d - lz4/dynamicatlas/commonatlas/artfont/x_xiangjianglaixi_lingpaishangdian_zh.unity3d - lz4/dynamicatlas/commonatlas/artfont/x_xiangjianglaixi_linpaiicon1_zh.unity3d - lz4/dynamicatlas/commonatlas/artfont/x_xiangjianglaixi_tiaozhanjiangli_zh.unity3d @@ -80473,7 +80483,6 @@ MonoBehaviour: - lz4/dynamicatlas/r_xianshiduihuan_zidiban.unity3d - lz4/dynamicatlas/r_ymqf_dikuang.unity3d - lz4/dynamicatlas/r_ymqf_tiao_3.unity3d - - lz4/dynamicatlas/s_shengxingyouli_banner_zh.unity3d - lz4/dynamicatlas/s_shenyitianjiang_beijin.unity3d - lz4/dynamicatlas/s_shenyitianjiang_kuang.unity3d - lz4/dynamicatlas/s_shenyitianjiang_zi_zh.unity3d @@ -81855,6 +81864,7 @@ MonoBehaviour: - lz4/publicartres/animations.unity3d - assetBundleName: lz4/prefabs/ui/newactivity.unity3d dependences: + - lz4/atlas/battleatlas.unity3d - lz4/atlas/commonatlas.unity3d - lz4/atlas/popupatlas.unity3d - lz4/atlas/publicatlas.unity3d @@ -81878,12 +81888,14 @@ MonoBehaviour: - lz4/dynamicatlas/commonatlas/l_mrlb_biankuang.unity3d - lz4/dynamicatlas/commonatlas/l_mrlb_biaoqian.unity3d - lz4/dynamicatlas/commonatlas/r_dungeon_menghei_03.unity3d + - lz4/dynamicatlas/commonatlas/r_hero_suodi_suo.unity3d - lz4/dynamicatlas/commonatlas/r_jyxz_qizhi_di.unity3d - lz4/dynamicatlas/commonatlas/r_xianshiduihuan_danjuyuan.unity3d - lz4/dynamicatlas/commonatlas/r_xianshiduihuan_xiaanniu.unity3d - lz4/dynamicatlas/commonatlas/r_xianshiduihuan_xiadaojukuang.unity3d - lz4/dynamicatlas/commonatlas/s_slbz_1anniuongse.unity3d - lz4/dynamicatlas/commonatlas/y_yueka_hongxian.unity3d + - lz4/dynamicatlas/g_gonghui_shijuezhen_anniudihei.unity3d - lz4/dynamicatlas/l_libao_kuang.unity3d - lz4/dynamicatlas/l_mrlb_tiao.unity3d - lz4/dynamicatlas/l_mrlb_tiao_jpg.unity3d @@ -81898,6 +81910,9 @@ MonoBehaviour: - lz4/dynamicatlas/r_ymqf_dikuang.unity3d - lz4/dynamicatlas/r_ymqf_tiao_3.unity3d - lz4/dynamicatlas/s_shouchong_anniu.unity3d + - lz4/dynamicatlas/s_slbz_kuang1.unity3d + - lz4/dynamicatlas/s_slbz_kuang2.unity3d + - lz4/dynamicatlas/s_slbz_xian.unity3d - lz4/effectresui/meirilibao.unity3d - lz4/effectresui/tiangongxunbao.unity3d - lz4/fonts/artfont_1.unity3d diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index d68f2f37cf..3f2d936a52 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -45,7 +45,8 @@ function CommonActPage:InitComponent() --大圣升星 self.dasheng = Util.GetGameObject(self.gameObject, "Bg/dasheng") - self.time1 = Util.GetGameObject(self.dasheng, "time1/timeText") + self.timeDashengkuang = Util.GetGameObject(self.dasheng, "time1") + self.timeDasheng = Util.GetGameObject(self.timeDashengkuang, "timeText"):GetComponent("Text") self.itemPreDasheng = Util.GetGameObject(self.dasheng, "ItemPre") self.ItemList = {} end @@ -103,6 +104,12 @@ function CommonActPage:OnShow(_sortingOrder) else self.titleIma.gameObject:SetActive(false) end + + if self.actConfig.Icon[5] and self.actConfig.Icon[5] ~= "" then + self.titleTipBg.gameObject:SetActive(true) + else + self.titleTipBg.gameObject:SetActive(false) + end if self.actConfig.TitleText and self.actConfig.TitleText ~= "" then local str = string.split(GetLanguageStrById(self.actConfig.TitleText),"|") @@ -191,16 +198,26 @@ function CommonActPage:ShowSingleData(item,sdata,index) end function CommonActPage:RefreshTime() + self.timeDashengkuang:SetActive(false) + self.time:SetActive(false) if self.actConfig.ShowTime == 0 then - self.time:SetActive(false) return end + if self.localTimer then self.localTimer:Stop() self.localTimer = nil end - self.time:SetActive(true) - local freshTime + local time ,timeText + if self.actType == ActivityTypeDef.ChaoFanRuSheng then + time = self.timeDashengkuang + timeText = self.timeDasheng + else + time = self.time + timeText = self.timeText + end + time:SetActive(true) + local freshTime if self.actType == ActivityTypeDef.AccumulativeRechargeExper then freshTime = CalculateSecondsNowTo_N_OClock(24) else @@ -209,11 +226,11 @@ function CommonActPage:RefreshTime() local update = function() if self.actConfig.ShowTime == 1 then - self.timeText.text = Language[10023]..TimeToFelaxible(freshTime) + timeText.text = Language[10023]..TimeToFelaxible(freshTime) elseif self.actConfig.ShowTime == 2 then - self.timeText.text = Language[10023]..TimeToDHMS(freshTime) + timeText.text = Language[10023]..TimeToDHMS(freshTime) elseif self.actConfig.ShowTime == 3 then - self.timeText.text = Language[10023]..TimeToHMS(freshTime) + timeText.text = Language[10023]..TimeToHMS(freshTime) end end update()