From 8117c5ebbaa5e1f30a05501110d6ced92b937a41 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 22 Apr 2021 10:59:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=91=E6=B8=B8=E5=95=86=E4=BA=BA?= =?UTF-8?q?=E3=80=91=E6=80=8E=E5=8A=A0=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Atlas/YunYouManAtlas.meta | 8 + .../Atlas/YunYouManAtlas/y_yosr_dui.png | Bin 0 -> 3674 bytes .../Atlas/YunYouManAtlas/y_yosr_dui.png.meta | 99 ++++++++ .../Atlas/YunYouManAtlas/y_yosr_jiahao.png | Bin 0 -> 2904 bytes .../YunYouManAtlas/y_yosr_jiahao.png.meta | 99 ++++++++ .../Atlas/YunYouManAtlas/y_yosr_jiantou.png | Bin 0 -> 2816 bytes .../YunYouManAtlas/y_yosr_jiantou.png.meta | 99 ++++++++ .../Atlas/YunYouManAtlas/y_yosr_wenhao.png | Bin 0 -> 3688 bytes .../YunYouManAtlas/y_yosr_wenhao.png.meta | 99 ++++++++ .../UI/NewActivity/ItemUpstarPre.prefab | 226 +++++++++++++++++- .../ResConfigs/ResourcePathConfig.asset | 18 +- .../~Lua/Common/GlobalDefine.lua | 4 +- .../ActivityGift/ActivityGiftManager.lua | 11 + .../Modules/NewActivity/CommonActPage.lua | 1 + .../NewActivity/CommonActPageManager.lua | 25 +- .../Modules/NewActivity/ItemUpstarPre.lua | 3 + .../~Lua/Modules/Player/RedpotManager.lua | 1 + 17 files changed, 673 insertions(+), 20 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/YunYouManAtlas.meta create mode 100644 Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png create mode 100644 Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png.meta create mode 100644 Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png create mode 100644 Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta create mode 100644 Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiantou.png create mode 100644 Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiantou.png.meta create mode 100644 Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png create mode 100644 Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas.meta b/Assets/ManagedResources/Atlas/YunYouManAtlas.meta new file mode 100644 index 0000000000..ad9ba24a15 --- /dev/null +++ b/Assets/ManagedResources/Atlas/YunYouManAtlas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8635c3edcfcb80947bf01dc7fd4b26e2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png new file mode 100644 index 0000000000000000000000000000000000000000..c9be4ce636e307bd493d40d2e4cae1e163cd8b43 GIT binary patch literal 3674 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png.meta b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png.meta new file mode 100644 index 0000000000..2b792a923f --- /dev/null +++ b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 2250134424dc56e4ea36edd55dc6c1a9 +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: 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: 69ead9518a76f224bace995b4f5923b8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: YunYouManAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png new file mode 100644 index 0000000000000000000000000000000000000000..e70b502e0b7948511593a7fa789722bed0452f3b GIT binary patch literal 2904 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 literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta new file mode 100644 index 0000000000..7f285df973 --- /dev/null +++ b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 91bd0f13615c325478f8d42feefe6118 +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: 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: d46d523bcc3c61449be51a8da54a1058 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: YunYouManAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiantou.png b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiantou.png new file mode 100644 index 0000000000000000000000000000000000000000..a7e65f1dd98e5d994c12d984339b5984e09468f9 GIT binary patch literal 2816 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 SCeLI50000dE^yS>}H-KT%-?%m$$ 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 0 then + local str = PlayerPrefs.GetInt(PlayerManager.uid.."CommonActPage"..ActivityTypeDef.YunYouShangRen) + if str == 1 then + return false + else + return true + end + end +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index f151628f4c..dfd54e91f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -54,6 +54,7 @@ function CommonActPage:OnOpen(_activityConfig,_index,parent) self.pageIndex = _index self.parent = parent self.gameObject.name = "CommonActPage"..self.actConfig.Id + PlayerPrefs.SetInt(PlayerManager.uid.."CommonActPage"..self.actConfig.ActiveType,1) end -- 打开,重新打开时回调 diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index a0d87a0052..897e532303 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -93,14 +93,15 @@ function this.GetExpertData(indexType,actType) if curData.rewards[i].missionId == actRewardConfigs[j].Id then if indexType == 3 then -- 3 积天豪礼 curData.rewards[i].otherData.Values = actRewardConfigs[j].Values[1][2] + curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].otherData.Values,curData.rewards[i].otherData.Values) if curData.rewards[i].state == 1 then curData.rewards[i].otherData.state = 2 elseif curData.rewards[i].progress == 1 then curData.rewards[i].otherData.state = 0 else curData.rewards[i].otherData.state = 1 + curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].progress,curData.rewards[i].otherData.Values) end - curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].progress,curData.rewards[i].otherData.Values) else --日累计充值 达人 if actType == ActivityTypeDef.AccumulativeRechargeExper then curData.rewards[i].otherData.Values = actRewardConfigs[j].Values[1][1] @@ -189,4 +190,26 @@ function this.UpdateSingleTypeData(actType) end end +function this.CheckSingleRed(data) + if data.state == 0 then + local list = BagManager.GetBagItemDataByItemType(ItemBaseType.Equip) + local EquipedEquipList = HeroManager.GetEquipedEquipList() + for i = 1, #data.otherData.needItems do + for j = 1, #list do + if data.otherData.needItems[i] == list[j].itemConfig.Id then + return true + end + end + end + for i = 1, #data.otherData.needItems do + for j = 1, #EquipedEquipList do + if data.otherData.needItems[i] == EquipedEquipList[j] then + return true + end + end + end + end + return false +end + return CommonActPageManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua index d7fe148e99..e689363de7 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua @@ -23,6 +23,7 @@ function ItemUpstarPre:InitComponent() self.btnMaskNeed = Util.GetGameObject(self.midLayout,"itemNeed/mask") self.btnMaskGet = Util.GetGameObject(self.midLayout,"itemGet/mask") self.btnMaskNeedAdd = Util.GetGameObject(self.midLayout,"itemNeed/mask/Image") + self.effect = Util.GetGameObject(self.gameObject,"UI_Effect_MianBan_LiBao_button_01") end --绑定事件(用于子类重写) @@ -83,6 +84,8 @@ function ItemUpstarPre:Refresh() end self:SetMask() self:SetButton() + Util.SetParticleSortLayer(self.effect, self.sortingOrder or 0) + self.effect:SetActive(CommonActPageManager.CheckSingleRed(self.data)) end function ItemUpstarPre:SetMask() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index a4cf5489fd..8053dfffb6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -411,6 +411,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Expert_WeekCard, ActivityGiftManager.WeedCardActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.Expert_Expedition, ActivityGiftManager.ExpterActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.Expert_Slhj, ActivityGiftManager.ExpterActivityIsShowRedPoint) + RPData:AddCheckFunc(RedPointType.Expert_YunYouMan, ActivityGiftManager.CheckYunYouManRedPoint) -- RPData:AddCheckFunc(RedPointType.HERO_STAR_GIFT, OperatingManager.IsHeroStarGiftActive) --战力排行 RPData:AddCheckFunc(RedPointType.WarPowerSort_Sort, ActivityGiftManager.WarPowerSortActivityIsShowRedPoint)