diff --git a/Assets/ManagedResources/Atlas/TagAtlas/y_yjj_$19.99.png b/Assets/ManagedResources/Atlas/TagAtlas/y_yjj_$19.99.png new file mode 100644 index 0000000000..b292afff20 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TagAtlas/y_yjj_$19.99.png differ diff --git a/Assets/ManagedResources/Atlas/TagAtlas/y_yjj_$19.99.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/y_yjj_$19.99.png.meta new file mode 100644 index 0000000000..01cdeeb3ee --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagAtlas/y_yjj_$19.99.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: ebf0871a2a4efb641b756ee437b966cc +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: 4d22bc0f55b095f46911304c0983088c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/TagAtlas/y_yjj_$49.99.png b/Assets/ManagedResources/Atlas/TagAtlas/y_yjj_$49.99.png new file mode 100644 index 0000000000..1c0efa2f90 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TagAtlas/y_yjj_$49.99.png differ diff --git a/Assets/ManagedResources/Atlas/TagAtlas/y_yjj_$49.99.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/y_yjj_$49.99.png.meta new file mode 100644 index 0000000000..c13f21925e --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagAtlas/y_yjj_$49.99.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 8e8b3ba622dd1c54fa4bb011a5957518 +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: 554d71840fbbca648a39678c6d9c5b95 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index d13c90d71a..d64901efa3 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -3744,14 +3744,26 @@ MonoBehaviour: extension: .png resPathIndex: 6 resAbNameIndex: 3 + - resName: d_dianfrngsai_baqiang + extension: .png + resPathIndex: 7 + resAbNameIndex: 3 - resName: d_dianfrngsai_guan extension: .png resPathIndex: 7 resAbNameIndex: 3 + - resName: d_dianfrngsai_guanjun + extension: .png + resPathIndex: 7 + resAbNameIndex: 3 - resName: d_dianfrngsai_ji extension: .png resPathIndex: 7 resAbNameIndex: 3 + - resName: d_dianfrngsai_siqiang + extension: .png + resPathIndex: 7 + resAbNameIndex: 3 - resName: d_dianfrngsai_xuweiyidai extension: .png resPathIndex: 7 @@ -3760,6 +3772,10 @@ MonoBehaviour: extension: .png resPathIndex: 7 resAbNameIndex: 3 + - resName: d_dianfrngsai_yajun + extension: .png + resPathIndex: 7 + resAbNameIndex: 3 - resName: j_jingjichang_ya extension: .png resPathIndex: 7 @@ -11380,6 +11396,14 @@ MonoBehaviour: extension: .png resPathIndex: 74 resAbNameIndex: 39 + - resName: y_yjj_$19.99 + extension: .png + resPathIndex: 74 + resAbNameIndex: 39 + - resName: y_yjj_$49.99 + extension: .png + resPathIndex: 74 + resAbNameIndex: 39 - resName: y_yjj_128 extension: .png resPathIndex: 74 diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua index 39e9f9f1ca..e1f26235a8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua @@ -76,15 +76,18 @@ function MissionDailyPanel:OnOpen(popupType,...) end if not index then index = 1 + type = 0 if RedPointManager.GetRedPointMissionDaily() then index = 1 type = 0 - elseif QinglongSerectTreasureManager.GetQinglongSerectTreasureRedPot() then - index = 2 - type = 1 - elseif QinglongSerectTreasureManager.GetSerectTreasureTrailRedPot() then - index = 3 - type = 1 + elseif ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then + if QinglongSerectTreasureManager.GetQinglongSerectTreasureRedPot() then + index = 2 + type = 1 + elseif QinglongSerectTreasureManager.GetSerectTreasureTrailRedPot() then + index = 3 + type = 1 + end elseif TaskManager.GetAchievementState() then index = 4 type = 0 @@ -93,12 +96,9 @@ function MissionDailyPanel:OnOpen(popupType,...) for i=1,#contentPrefabs do contentPrefabs[i].gameObject:SetActive(false) end + LogGreen("index:"..index.." type:"..type) if index ~=1 and type == 0 then - if ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then - index = 4 - else - index = 2 - end + index = 4 end contentPrefabs[index].gameObject:SetActive(true) contentScripts[index].view:OnShow(this,...)--1、传入自己 2、传入不定参 diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua index 5c6260717d..e16cc094b7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua @@ -60,19 +60,20 @@ function this:AddListener() Game.GlobalEvent:AddEvent(GameEvent.TreasureOfHeaven.BuyQinglongSerectLevelSuccess, this.refresh) Game.GlobalEvent:AddEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess, this.refresh) Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose,this.CloseFunction) + Game.GlobalEvent:AddEvent(GameEvent.MoneyPay.OnPayResultSuccess, this.refresh) end function this:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.BuyQinglongSerectLevelSuccess) Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess) Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose) + Game.GlobalEvent:RemoveEvent(GameEvent.MoneyPay.OnPayResultSuccess) end this.Closefunction = function() Timer.New(function() if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then PopupTipPanel.ShowTip(Language[12320]) parent:ClosePanel() - return else this.refresh() @@ -82,7 +83,10 @@ end function this:OnShow(_parent,...) parent=_parent sortingOrder = _parent.sortingOrder - + if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then + parent:ClosePanel() + return + end this.tips.text = Language[12350] local startTime,endTime,endTimeScale = QinglongSerectTreasureManager.GetTimeStartToEnd() this.time.text = Language[10546]..startTime.."-"..endTime @@ -107,7 +111,8 @@ function this:OnDestroy() end end -this.refresh = function() +this.refresh = function() + QinglongSerectTreasureManager.UpdateTreasureState2() this:topBar() this:showTaskList() CheckRedPointStatus(RedPointType.QinglongSerectTreasure) diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua index 97958b5378..d7f59c3cdf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua @@ -67,12 +67,14 @@ function this:AddListener() Game.GlobalEvent:AddEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess, this.refresh,curType) Game.GlobalEvent:AddEvent(GameEvent.TreasureOfHeaven.TaskRefresh, this.refresh,curType) Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose,this.CloseFunction) + Game.GlobalEvent:AddEvent(GameEvent.MoneyPay.OnPayResultSuccess, this.refresh) end function this:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess,this.refresh,curType) - Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.TaskRefresh, this.refresh,curType) - Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose,this.Closefunction) + Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess) + Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.TaskRefresh) + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClosen) + Game.GlobalEvent:RemoveEvent(GameEvent.MoneyPay.OnPayResultSuccess) end this.Closefunction = function() @@ -91,6 +93,10 @@ end function this:OnShow(_parent,...) parent=_parent sortingOrder = _parent.sortingOrder + if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then + parent:ClosePanel() + return + end this.refresh(curType) end @@ -142,7 +148,9 @@ function this:OnDestroy() self.timer = nil end end + function this.refresh(type) + QinglongSerectTreasureManager.UpdateTreasureState2() this:SetTopBar() this:SetSelect() this:ShowTime(type) diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua index 8782596f02..ef230eeb96 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua @@ -92,7 +92,7 @@ function this.UpdateTreasureState2() local activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody) if this.rewardData[activityId] then for k,v in pairs(this.rewardData[activityId]) do - if level < k or (level > k and this.GetTreasureState() < 1 and v.type == 1) then + if level < k or (level >= k and this.GetTreasureState() < 1 and v.type == 1) then v.state = -2 elseif v.state == -2 then v.state = 0 @@ -165,8 +165,13 @@ function this.SetLevel(_level) end function this.GetLevel() - if this.level > 50 then - this.level = 50 + if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then + return 0 + end + local activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody) + local level = this.rewardData[activityId][LengthOfTable(this.rewardData[activityId])-1].level + if this.level > level then + this.level = level end return this.level end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index fe03ddbfcb..9ab3ff9d7d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -8,7 +8,7 @@ local ImgType = { bg = "y_yjj_128beijdi", mask = "y_yjj_128dikuang001", rewardBg = "y_yjj_128kuang", - moneyTag = "y_yjj_128", + moneyTag = "y_yjj_$19.99", downBg = "y_yjj_128kuang001", rewardPreview = "y_yjj_128kuang002", valueMask = "y_yjj_128jjz002", @@ -17,7 +17,7 @@ local ImgType = { bg = "y_yjj_328beijdi", mask = "y_yjj_328dikuang001", rewardBg = "y_yjj_328kuang", - moneyTag = "y_yjj_328", + moneyTag = "y_yjj_$49.99", downBg = "y_yjj_328kuang001", rewardPreview = "y_yjj_328kuang002", valueMask = "y_yjj_328jjz002",