diff --git a/Assets/ManagedResources/Atlas/AiYuanActivityAtlas/ArtFont/x_xinjiangzhaohuan_shogan_bhmc_zh.png b/Assets/ManagedResources/Atlas/AiYuanActivityAtlas/ArtFont/x_xinjiangzhaohuan_shogan_bhmc_zh.png new file mode 100644 index 0000000000..c3c9110f6d Binary files /dev/null and b/Assets/ManagedResources/Atlas/AiYuanActivityAtlas/ArtFont/x_xinjiangzhaohuan_shogan_bhmc_zh.png differ diff --git a/Assets/ManagedResources/Atlas/AiYuanActivityAtlas/ArtFont/x_xinjiangzhaohuan_shogan_bhmc_zh.png.meta b/Assets/ManagedResources/Atlas/AiYuanActivityAtlas/ArtFont/x_xinjiangzhaohuan_shogan_bhmc_zh.png.meta new file mode 100644 index 0000000000..98026bfe17 --- /dev/null +++ b/Assets/ManagedResources/Atlas/AiYuanActivityAtlas/ArtFont/x_xinjiangzhaohuan_shogan_bhmc_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 90a3d99ee82cce641b7019d70c2acf26 +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: a3d0715204af37e409b516e6173b5594 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: AiYuanActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index d86ed39263..67da1ba79f 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -146,6 +146,7 @@ function TimeLimitUpHero:OnShow(_sortingOrder) for k,v in ipairs(self.bgs) do v.bg.gameObject:SetActive(false) end + LogError(" actid===="..self.actId) wishConfig=ConfigManager.GetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",self.actId) self.titleImg.sprite=self.spLoader:LoadSprite(self.actConfig.Icon[3]) Setting= ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1) @@ -280,14 +281,13 @@ function TimeLimitUpHero:Recruit(actId,type,itemId) PrivilegeManager.RefreshPrivilegeUsedTimes(self.yaojingMaxTimeId,recrutType)--记录妖晶抽卡次数 end if type == 1 then - UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop,actId,{RecruitType.PrayerSingle,RecruitType.PrayerTen},oneFunc) else --UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,actId,type,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen}) UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop,actId,{RecruitType.PrayerSingle,RecruitType.PrayerTen},tenFunc) end if msg.drop.Hero[1] then - UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],actId,1,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen},oneFunc2) + UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],actId,1,{RecruitType.PrayerSingle,RecruitType.PrayerTen},oneFunc2) end CheckRedPointStatus(RedPointType.TimeLimited) end,self.freeTimesId)