diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/y_yjj_128kuang005.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/y_yjj_128kuang005.png new file mode 100644 index 0000000000..b9710c17dd Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/y_yjj_128kuang005.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/y_yjj_128kuang005.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/y_yjj_128kuang005.png.meta new file mode 100644 index 0000000000..52dcb4b2fd --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/y_yjj_128kuang005.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: b53f4ee62b5787b47ac915da970e5aaf +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 + - 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a6d224b2b24bec34f8982ef3462cbfbb + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png new file mode 100644 index 0000000000..f92e85c42d Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta new file mode 100644 index 0000000000..4bedd0d356 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: e4a1ba017aac14a4d84c35656d081e7b +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 + - 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 36ed93142f0acc04bb2913e0ebf02326 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_128kuang004.png b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_128kuang004.png new file mode 100644 index 0000000000..548fc6479a Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_128kuang004.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_128kuang004.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_128kuang004.png.meta new file mode 100644 index 0000000000..a8d6df7224 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_128kuang004.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 6065d0c756ba9184f892c56cb5e26c77 +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 + - 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: cf3cbc8f19bcde24d93e72d877f9a632 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png new file mode 100644 index 0000000000..3f43dc0455 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta new file mode 100644 index 0000000000..0efa64c189 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 44bb972b166b76744b315a9b70e97937 +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 + - 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 67b52df8b11ebeb4489f0b7c1f4795be + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 756b52069c..035a6322be 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -984,7 +984,6 @@ function this:OnShow() this.InitFuncShow() this.RefreshActivityShow() this.RefreshFuncNewText() - this.RefreshGiftBtnShow() -- 刷新一次编队战斗力 FormationManager.RefreshMainFormationPower() this.TimeFormat() @@ -1186,39 +1185,6 @@ function this.TimeFormat() else showTab = false end - elseif v.ActId == 668 then - -- 加入对月卡的判断 - -- local isMonthCardActive = OperatingManager.IsMonthCardActive() - local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) - local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) - showTab = (isOpen_128 or isOpen_328)--isMonthCardActive and - -- if isMonthCardActive then - local cardType = nil - if isOpen_328 then - cardType = GoodsTypeDef.MONTHCARD_328 - end - if not cardType and isOpen_128 then - cardType = GoodsTypeDef.MONTHCARD_128 - end - if cardType then - local data = OperatingManager.GetGiftGoodsInfo(cardType) - if data then - local time = data.endTime - PlayerManager.serverTime - if time < 1 then - showTab = false - else - showTab = true - if OperatingManager.GetGoodsBuyTime(GoodsTypeDef.MONTHCARD_128) > 0 and OperatingManager.GetGoodsBuyTime(GoodsTypeDef.MONTHCARD_328) > 0 then - activityTabs[k].timeImg.gameObject:SetActive(false) - elseif time >= 86400 then - activityTabs[k].timeText.text = TimeToDH(time) - else - activityTabs[k].timeText.text = TimeToHMS(time) - end - end - end - end - -- end elseif v.ActId == 667 then local limitSkinGift = OperatingManager.GetTimeLimitSkinInfoList() if not limitSkinGift then @@ -1404,21 +1370,6 @@ function this.RefreshChangeName() end end --- 刷新一些购买活动的按钮限时 -function this.RefreshGiftBtnShow() - for k,v in pairs(activitys) do - local ishow = DynamicActivityManager.IsQualifiled(v.Id) - if v.ActId == 668 and ishow then - -- 加入对月卡的判断 - -- local isMonthCardActive = OperatingManager.IsMonthCardActive() - local showTab = activityTabs[k].go.gameObject.activeSelf - local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) - local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) - showTab = (isOpen_128 or isOpen_328)--isMonthCardActive and - this.RefreshLayer(showTab,k,v) - end - end -end --后台推送 function this.RefreshActivityBtn(context) --LogGreen("context.type1 " .. context.type .. " " .. context.status) @@ -1468,94 +1419,27 @@ end function this.RefreshActivityShow() --八日十五日登陆 this.RefreshEightGiftPreview() + this.RefreshGiftBtnShow() +end +function this.RefreshGiftBtnShow() + local curAllMonthCardData = OperatingManager.GetMonthCardData() + local curState = VipManager.GetChargedNum() > ConfigManager.GetConfigData(ConfigName.MonthcardConfig,MONTH_CARD_TYPE.LUXURYMONTHCARD).Price + local showTab for k,v in ipairs(activitys) do - local showTab = activityTabs[k].go.gameObject.activeSelf - local ishow = DynamicActivityManager.IsQualifiled(v.Id) - if ishow then - if v.RpType > 0 then - --绑定新的红点 - BindRedPointObject(v.RpType,activityTabs[k].redpot) - end - if v.ActiveType < 1 and v.FunType < 1 then - if v.ActId == 666 then - --限时折扣 - local giftList = {} - giftList = OperatingManager.GetInfoList(v.ShopData) - if #giftList > 0 then - local time = giftList[1].endTime - GetTimeStamp() - if time < 1 then - OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, giftList[1].goodsId) - showTab = false - else - showTab = true - end - else - showTab = false - end - elseif v.ActId == 668 then - --超值基金 - -- 加入对月卡的判断 - -- local isMonthCardActive = OperatingManager.IsMonthCardActive() - local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) - local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) - showTab = (isOpen_128 or isOpen_328)--isMonthCardActive and - -- if isMonthCardActive then - local cardType = nil - if isOpen_328 then - cardType = GoodsTypeDef.MONTHCARD_328 - end - if not cardType and isOpen_128 then - cardType = GoodsTypeDef.MONTHCARD_328 - end - if cardType then - local data = OperatingManager.GetGiftGoodsInfo(cardType) - if data then - local time = data.endTime - PlayerManager.serverTime - if time < 1 then - showTab = false - else - showTab = true - end - end - end - -- end - end - elseif v.ActiveType > 0 then - local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) - if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then - if v.ActiveType == 42 then - if ActivityGiftManager.GetRewardState(42) ~= 3 then - local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero) - if endTime - PlayerManager.serverTime > 0 then - showTab = true - else - showTab = false - end - else - showTab = false - end - elseif v.FunType and v.FunType == 41 then - showTab = DailyRechargeManager.GetDailyRechargeExist() - else - showTab = true - end - else - showTab = false - end - elseif v.FunType > 0 then - if ActTimeCtrlManager.SingleFuncState(v.FunType) then - showTab = true - else - showTab = false + if v.FunType == 94 then + showTab = activityTabs[k].go.gameObject.activeSelf + local ishow = ActTimeCtrlManager.SingleFuncState(v.FunType) + if ishow then + if curState then + showTab = true end else showTab = false end - else - showTab = false - end - this.RefreshLayer(showTab,k,v) + this.RefreshLayer(showTab,k,v) + break + end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 0d605ff232..1b46bc0551 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -8,23 +8,32 @@ local ImgType = { bg = "y_yjj_128beijdi", mask = "y_yjj_128dikuang001", rewardBg = "y_yjj_128kuang", - moneyTag = "y_yjj_128", downBg = "y_yjj_128kuang001", - rewardPreview = "y_yjj_128kuang002_zh", - valueMask = "y_yjj_128jjz002", + rewardPreview = "y_yjj_128kuang004", + rewardPreviewText = "y_yjj_128kuang005", + reward = "y_yjj_1280", + iconId = 16, chargerBaseType = GoodsTypeDef.MONTHCARD_128, }, [10003] = { - bg = "y_yjj_328beijdi", - mask = "y_yjj_328dikuang001", - rewardBg = "y_yjj_328kuang", - moneyTag = "y_yjj_328", - downBg = "y_yjj_328kuang001", - rewardPreview = "y_yjj_328kuang002_zh", - valueMask = "y_yjj_328jjz002", + bg = "s_sanshibei_beijingren", + mask = "s_sanshibei_bg", + rewardBg = "s_sanshibei_kuang_02", + downBg = "s_sanshibei_kuang_01", + rewardPreview = "s_sanshibei_xiaobiaodi", + rewardPreviewText = "s_sanshibei_biaotizi", + reward = "y_yjj_3280", + iconId = 16, chargerBaseType = GoodsTypeDef.MONTHCARD_328, }, } + +local state = { + [0] = {bg = "r_hero_button_001",text = "",red = false}, + [1] = {bg = "s_slbz_1anniuongse",text = "领取",red = true}, + [2] = {bg = "s_slbz_1anniuhuise",text = "已领取",red = false}, +} + function UpperMonthCard:New(gameObject) local b = {} b.gameObject = gameObject @@ -36,36 +45,30 @@ end --初始化组件(用于子类重写) function UpperMonthCard:InitComponent() self.spLoader = SpriteLoader.New() - self.Bg = Util.GetGameObject(self.gameObject, "bg"):GetComponent("Image") + self.Bg = Util.GetGameObject(self.gameObject, "Bg/bg"):GetComponent("Image") self.mask = Util.GetGameObject(self.gameObject, "Bg/mask"):GetComponent("Image") - + + self.chargeIconType = Util.GetGameObject(self.gameObject, "Bg/payBack/icon"):GetComponent("Image") self.chargeType = Util.GetGameObject(self.gameObject, "Bg/payBack/type"):GetComponent("Image") - self.btnPreview = Util.GetGameObject(self.gameObject, "Bg/previewRoot/btnPreview") - self.valueIcon = Util.GetGameObject(self.gameObject, "Bg/previewRoot/Image/icon"):GetComponent("Image") - self.totalValue = Util.GetGameObject(self.gameObject, "Bg/previewRoot/Image/value"):GetComponent("Text") - self.valueMask = Util.GetGameObject(self.gameObject, "Bg/previewRoot/Image"):GetComponent("Image") - + --- 不同的充值行为显示部分 - self.middlePart = Util.GetGameObject(self.gameObject, "Bg/partDown/Bg") - self.titleImg = Util.GetGameObject(self.middlePart, "title"):GetComponent("Image") - self.infoBg = Util.GetGameObject(self.middlePart, "middle"):GetComponent("Image") - self.grid = Util.GetGameObject( self.middlePart, "middle/grid") - self.itemPre = Util.GetGameObject(self.middlePart, "middle/itemPre") + self.middlePart = Util.GetGameObject(self.gameObject, "Bg/partDown/Bg"):GetComponent("Image") + self.titleDi = Util.GetGameObject(self.middlePart.transform, "titleDi"):GetComponent("Image") + self.titleImg = Util.GetGameObject(self.titleDi.transform, "title"):GetComponent("Image") + self.infoBg = Util.GetGameObject(self.middlePart.transform, "middle"):GetComponent("Image") + self.grid = Util.GetGameObject( self.middlePart.transform, "middle/grid") + local width = self.grid.transform.rect.width + local height = self.grid.transform.rect.height + self.itemPre = Util.GetGameObject(self.middlePart.transform, "middle/itemPre") - - --- 未购买 - self.buyPanel = Util.GetGameObject(self.middlePart, "buyPart") - self.tipIcon = Util.GetGameObject(self.buyPanel, "tip/icon/Image"):GetComponent("Image") -- 那啥图标 - self.charmyNum = Util.GetGameObject(self.buyPanel, "tip/value"):GetComponent("Text") -- 返利 - self.actLeftTime = Util.GetGameObject(self.buyPanel, "leftTime"):GetComponent("Text") -- 活动剩余天数 - self.btnBuy = Util.GetGameObject(self.buyPanel, "btnBuy") + self.btnBuy = Util.GetGameObject(self.middlePart.transform, "btnBuy") self.textBuy = Util.GetGameObject(self.btnBuy, "Text"):GetComponent("Text") + self.btnBuyRed = Util.GetGameObject(self.btnBuy, "Red") - - -- 已经购买,你先可以享受这你觉得还可以的服务了 - self.boughtPanel = Util.GetGameObject(self.middlePart, "rewardPart") - self.totalLoginday = Util.GetGameObject(self.boughtPanel, "totalDay"):GetComponent("Text") - self.boughtLeftTime = Util.GetGameObject(self.boughtPanel, "time"):GetComponent("Text") + self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.grid.transform, + self.itemPre, nil, Vector2.New(width, height), 1, 5, Vector2.New(35, 35)) + self.scrollView.moveTween.MomentumAmount = 1 + self.scrollView.moveTween.Strength = 2 ---- 奖励列表 self.rewardList = {} @@ -73,35 +76,13 @@ end --绑定事件(用于子类重写) function UpperMonthCard:BindEvent() - Util.AddOnceClick(self.btnPreview, function() - UIManager.OpenPanel(UIName.MonthRewardPreviewPopup, self.baseType, self.chargerBaseType) - end) - - Util.AddOnceClick(self.btnBuy, function() - -- local isActive = VipManager.GetMonthCardOpenState() - -- if not isActive then - -- MsgPanel.ShowTwo(Language[11387], function() - -- end, function(isShow) - -- JumpManager.GoJump(36004) - -- end, Language[10731], Language[10019],nil, false) - -- else - PayManager.Pay(self.baseType, function(id) - self:RechargeSuccessFunc(id) - end) - -- end + Util.AddOnceClick(self.btnBuy, function() + PayManager.Pay(self.baseType, function(id) + self:RechargeSuccessFunc(id) + end) end) end --- --添加事件监听(用于子类重写) --- function UpperMonthCard:AddListener() - --- end - --- --移除事件监听(用于子类重写) --- function UpperMonthCard:RemoveListener() - --- end - --界面打开时调用(用于子类重写) function UpperMonthCard:OnOpen(_activityConfig,_index,parent) self.actConfig = _activityConfig @@ -134,26 +115,24 @@ function UpperMonthCard:OnShow(_sortingOrder) self.baseType = goodsId self.gameObject:SetActive(true) - OperatingManager.SetSerData(self.chargerBaseType) + --OperatingManager.SetSerData(self.chargerBaseType) self:SetPanelType(self.actType) - self:SetRewardInfo(self.actType) - self:SetBuyState() + -- self:SetRewardInfo(self.actType) + -- self:SetBuyState() end --- 设置不同的显示界面 function UpperMonthCard:SetPanelType(type) - self.chargeType.sprite = self.spLoader:LoadSprite(ImgType[type].moneyTag) - self.valueIcon.sprite = SetIcon(self.spLoader, 16) - self.valueMask = self.spLoader:LoadSprite(ImgType[type].valueMask) - self.Bg.sprite = self.spLoader:LoadSprite(ImgType[type].bg) - self.mask.sprite = self.spLoader:LoadSprite(ImgType[type].mask) - self.titleImg.sprite = self.spLoader:LoadSprite(ImgType[type].rewardPreview) - self.middlePart:GetComponent("Image").sprite = self.spLoader:LoadSprite(ImgType[type].rewardBg) - self.infoBg.sprite = self.spLoader:LoadSprite(ImgType[type].downBg) - self.valueIcon.sprite = SetIcon(self.spLoader, chargeConfig[self.baseType].BaseReward[1][1]) - self.tipIcon.sprite = SetIcon(self.spLoader, chargeConfig[self.baseType].RewardShow[1][1]) - self.totalValue.text = chargeConfig[self.baseType].RewardShow[1][2] - self.charmyNum.text = " " .. chargeConfig[self.baseType].BaseReward[1][2] + self.Bg.sprite = self.spLoader:LoadSprite(ImgType[self.actType].bg) + self.mask.sprite = self.spLoader:LoadSprite(ImgType[self.actType].mask) + + self.chargeIconType.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(ImgType[self.actType].iconId)) + self.chargeType.sprite = self.spLoader:LoadSprite(ImgType[self.actType].reward) + + self.middlePart.sprite = self.spLoader:LoadSprite(ImgType[self.actType].rewardBg) + self.titleDi.sprite = self.spLoader:LoadSprite(ImgType[self.actType].rewardPreview) + self.titleImg.sprite = self.spLoader:LoadSprite(ImgType[self.actType].rewardPreviewText) + self.infoBg.sprite = self.spLoader:LoadSprite(ImgType[self.actType].downBg) end --- 设置不同界面的奖励信息