diff --git a/Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png b/Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png deleted file mode 100644 index f43238e9e3..0000000000 Binary files a/Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png and /dev/null differ diff --git a/Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png.meta b/Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png.meta deleted file mode 100644 index 75ce055470..0000000000 --- a/Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: a26b2cd667514dd4bb33d0e266e79a3d -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: -1 - 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: 0 - 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: Standalone - 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: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: df99d8df15200ae469aa15fc5927e2c7 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 24c54eabae..2049bec41b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -30552,7 +30552,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5DF2\u4E0B\u795E\u5C06\u5DF2\u52A0\u5165\u5FC3\u613F\u540D\u5355\uFF1A" + m_Text: "\u4EE5\u4E0B\u795E\u5C06\u5DF2\u52A0\u5165\u5FC3\u613F\u540D\u5355\uFF1A" LanguageIndex: 0 --- !u!1 &4502575453775152244 GameObject: diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab index d7584eeb8b..9e0b81b55f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab @@ -934,7 +934,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1189879797113255339} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -11256,7 +11256,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2671413894708845251} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -21578,7 +21578,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3915160258044306129} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index c063bed004..95fdbc7fc9 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -272,6 +272,10 @@ function this.OnPageTabChange(index) subViewList[_CurPageIndex].sub:OnClose() end if subViewList[index] and subViewList[index].config and subViewList[index].sub then + --每日每周任务页签拆分用 + if tabs[index].ShopData and tabs[index].ShopData[1][1] == -9999 then + CommonActPageManager.DynamicActType = tabs[index].ActId + end subViewList[index].sub:OnShow(orginLayer) else subViewList[index] = {} @@ -279,8 +283,12 @@ function this.OnPageTabChange(index) if tabs[index].UIName then subViewList[index].config = SubUIConfig[tabs[index].UIName[1]] subViewList[index].sub = SubUIManager.Open(subViewList[index].config,this.content.transform,tabs[index],index,this) + --每日每周任务页签拆分用 + if tabs[index].ShopData and tabs[index].ShopData[1][1] == -9999 then + CommonActPageManager.DynamicActType = tabs[index].ActId + end subViewList[index].sub:OnShow(orginLayer) - end + end end if tabs[index].UpView and #tabs[index].UpView > 0 then this.upView:OnOpen({showType = tabs[index].UpView[1][1], panelType = tabs[index].UpView[2] }) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index 9c77e2a3dd..3c17e00c44 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -76,21 +76,25 @@ function CommonActPage:OnShow(_sortingOrder) self.sortingOrder = _sortingOrder or self.sortingOrder self.actId = self.actConfig.ActId self.actType = self.actConfig.ActiveType + --每日每周任务页签拆分用 + if self.actConfig.ShopData and self.actConfig.ShopData[1][1] == -9999 then + self.actType = 20000 + end if self.actConfig.IfBack == 1 then - if self.actConfig.ActiveType > 0 then - local id = ActivityGiftManager.IsActivityTypeOpen(self.actConfig.ActiveType) + if self.actType > 0 then + local id = ActivityGiftManager.IsActivityTypeOpen(self.actType) if id and id > 0 then self.actId = id local actConfig - local actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",GlobalActConfig[id].ShowArt,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType) + local actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",GlobalActConfig[id].ShowArt,"PageType",self.actConfig.PageType,"ActiveType",self.actType) if not actConfig then - actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",id,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType) + actConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",id,"PageType",self.actConfig.PageType,"ActiveType",self.actType) end if actConfig then self.actConfig = actConfig end else - LogRed("活动类型:"..tostring(self.actConfig.ActiveType).."的活动未开启") + LogRed("活动类型:"..tostring(self.actType).."的活动未开启") end end end @@ -165,7 +169,7 @@ function CommonActPage:OnShow(_sortingOrder) end --刷新数据 function CommonActPage:RefreshData(isUpdata,isTop,isAni) - self.ActData = CommonActPageManager.GetData(self.actConfig.ActiveType) + self.ActData = CommonActPageManager.GetData(self.actType) if self.actConfig.RpType > 0 then CheckRedPointStatus(self.actConfig.RpType) end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 9bb9401a15..11916355d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -3,6 +3,7 @@ local this = CommonActPageManager local dataList = {} this.TaSuiLingXiaoMsg = nil this.TaSuiLingXiaoHistoryDmg = 0 +this.DynamicActType = 1 function this.Initialize() end @@ -243,7 +244,7 @@ function this.InitTaskData(curData,taskType,configName) local allMissionData = TaskManager.GetTypeTaskList(taskType) for i=1,#allListData do for j=1,#allMissionData do - if allListData[i].Id == allMissionData[j].missionId then + if allListData[i].Id == allMissionData[j].missionId and allListData[i].Type == this.DynamicActType then local data = {} data.missionId = allMissionData[j].missionId data.taskType = taskType diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index 7be3319532..dc00380a62 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -64,6 +64,7 @@ function RecruitPanelNew:InitComponent() self.upHeroPreList[i].pos = Util.GetGameObject(self.upHeroPreList[i].go,"di") self.upHeroPreList[i].itempos = Util.GetGameObject(self.upHeroPreList[i].go,"itempos") self.upHeroPreList[i].item = SubUIManager.Open(SubUIConfig.ItemView,self.upHeroPreList[i].itempos.transform) + self.upHeroPreList[i].item.gameObject:SetActive(false) self.upHeroPreList[i].item.transform:SetSiblingIndex(0) self.upHeroPreList[i].choosed = Util.GetGameObject(self.upHeroPreList[i].go,"state") end