diff --git a/Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab b/Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab index 47bff211f4..788364ca7e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab @@ -1864,7 +1864,7 @@ Camera: serializedVersion: 2 m_Bits: 4294967295 m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 0ba7bc807256bee4ba91353d18870bb2, type: 2} + m_TargetTexture: {fileID: 8400000, guid: 46d116f72c5d3354cbe7e57c58666737, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 @@ -2041,7 +2041,7 @@ Camera: serializedVersion: 2 m_Bits: 4294967295 m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 0ba7bc807256bee4ba91353d18870bb2, type: 2} + m_TargetTexture: {fileID: 8400000, guid: aa344742525755f468f1743df85b146b, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 @@ -2119,7 +2119,7 @@ Camera: serializedVersion: 2 m_Bits: 4294967295 m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 0ba7bc807256bee4ba91353d18870bb2, type: 2} + m_TargetTexture: {fileID: 8400000, guid: 2ae3ee26b7d31d941ba75d61ea134ebd, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 @@ -2377,7 +2377,7 @@ Camera: serializedVersion: 2 m_Bits: 4294967295 m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 0ba7bc807256bee4ba91353d18870bb2, type: 2} + m_TargetTexture: {fileID: 8400000, guid: a56ce059867a1574c8cc9fe1bc08de8e, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 @@ -3066,7 +3066,7 @@ Camera: serializedVersion: 2 m_Bits: 4294967295 m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 0ba7bc807256bee4ba91353d18870bb2, type: 2} + m_TargetTexture: {fileID: 8400000, guid: cb5e7d25b74b846448edb1f0fadad211, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 @@ -3712,7 +3712,7 @@ Camera: serializedVersion: 2 m_Bits: 4294967295 m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 0ba7bc807256bee4ba91353d18870bb2, type: 2} + m_TargetTexture: {fileID: 8400000, guid: cba646a05007d954b8f98b005a20fe80, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab index 14ea488f17..5e7f44292b 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab @@ -4302,7 +4302,7 @@ RectTransform: - {fileID: 1485145351} - {fileID: 1715758814} m_Father: {fileID: 1252269825180492747} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4695,7 +4695,7 @@ RectTransform: m_LocalScale: {x: 0.95238096, y: 0.95238096, z: 1} m_Children: [] m_Father: {fileID: 1252269825180492747} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6164,8 +6164,8 @@ RectTransform: - {fileID: 721588110232646809} - {fileID: 6760869819602811802} - {fileID: 5660155357608886913} - - {fileID: 7717053893065876478} - {fileID: 1230853736198021691} + - {fileID: 7717053893065876478} m_Father: {fileID: 1327116469934475768} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/RTexture/CardTexture14.renderTexture b/Assets/ManagedResources/RTexture/CardTexture14.renderTexture new file mode 100644 index 0000000000..5ea6b3d87f --- /dev/null +++ b/Assets/ManagedResources/RTexture/CardTexture14.renderTexture @@ -0,0 +1,34 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CardTexture14 + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_Width: 640 + m_Height: 960 + m_AntiAliasing: 1 + m_DepthFormat: 0 + m_ColorFormat: 0 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture14.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture14.renderTexture.meta new file mode 100644 index 0000000000..20c6515a8e --- /dev/null +++ b/Assets/ManagedResources/RTexture/CardTexture14.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46d116f72c5d3354cbe7e57c58666737 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: lz4/rtexture/cardtexture12 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture15.renderTexture b/Assets/ManagedResources/RTexture/CardTexture15.renderTexture new file mode 100644 index 0000000000..33f13f913f --- /dev/null +++ b/Assets/ManagedResources/RTexture/CardTexture15.renderTexture @@ -0,0 +1,34 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CardTexture15 + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_Width: 640 + m_Height: 960 + m_AntiAliasing: 1 + m_DepthFormat: 0 + m_ColorFormat: 0 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture15.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture15.renderTexture.meta new file mode 100644 index 0000000000..f0ceb65a67 --- /dev/null +++ b/Assets/ManagedResources/RTexture/CardTexture15.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cb5e7d25b74b846448edb1f0fadad211 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: lz4/rtexture/cardtexture12 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture16.renderTexture b/Assets/ManagedResources/RTexture/CardTexture16.renderTexture new file mode 100644 index 0000000000..d3034fd597 --- /dev/null +++ b/Assets/ManagedResources/RTexture/CardTexture16.renderTexture @@ -0,0 +1,34 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CardTexture16 + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_Width: 640 + m_Height: 960 + m_AntiAliasing: 1 + m_DepthFormat: 0 + m_ColorFormat: 0 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture16.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture16.renderTexture.meta new file mode 100644 index 0000000000..8b3007317e --- /dev/null +++ b/Assets/ManagedResources/RTexture/CardTexture16.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a56ce059867a1574c8cc9fe1bc08de8e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: lz4/rtexture/cardtexture12 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture17.renderTexture b/Assets/ManagedResources/RTexture/CardTexture17.renderTexture new file mode 100644 index 0000000000..836544131d --- /dev/null +++ b/Assets/ManagedResources/RTexture/CardTexture17.renderTexture @@ -0,0 +1,34 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CardTexture17 + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_Width: 640 + m_Height: 960 + m_AntiAliasing: 1 + m_DepthFormat: 0 + m_ColorFormat: 0 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture17.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture17.renderTexture.meta new file mode 100644 index 0000000000..346bc124fa --- /dev/null +++ b/Assets/ManagedResources/RTexture/CardTexture17.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2ae3ee26b7d31d941ba75d61ea134ebd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: lz4/rtexture/cardtexture12 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture18.renderTexture b/Assets/ManagedResources/RTexture/CardTexture18.renderTexture new file mode 100644 index 0000000000..836544131d --- /dev/null +++ b/Assets/ManagedResources/RTexture/CardTexture18.renderTexture @@ -0,0 +1,34 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CardTexture17 + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_Width: 640 + m_Height: 960 + m_AntiAliasing: 1 + m_DepthFormat: 0 + m_ColorFormat: 0 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture18.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture18.renderTexture.meta new file mode 100644 index 0000000000..392a33b844 --- /dev/null +++ b/Assets/ManagedResources/RTexture/CardTexture18.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cba646a05007d954b8f98b005a20fe80 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: lz4/rtexture/cardtexture12 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua index 888f02f6e9..0d3beafce1 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua @@ -61,7 +61,9 @@ function FourElementMonsterCampPanel:InitComponent() this.btnRank = Util.GetGameObject(self.gameObject, "InfoRoot/btnRank") this.btnFormation = Util.GetGameObject(self.gameObject, "InfoRoot/btnFormation") this.btnHelpFight = Util.GetGameObject(self.gameObject, "InfoRoot/btnHelpFight") + this.btnHelpFight:SetActive(false) this.btnHelpFightRed = Util.GetGameObject(this.btnHelpFight, "redPoint") + Util.GetGameObject(self.gameObject, "InfoRoot/btnBG1 (1)"):SetActive(false) -- this.btnHelpFight:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_silingshilian_zhuzhananniu_zh") end diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index 90f565f4a2..e7746530ff 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -806,54 +806,55 @@ function this.FourElementRedCheck(redType) end function this.CheckHelpFightRedPoint(redType) - if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.FourElementTrail) then - return false - end - if redType == RedPointType.PersonTrailHelp then - local heros = HeroManager.GetHeroDataByProperty(1,0) - if not heros or #heros < 1 then - return false - end - if this.fourMonsterData[1] and this.fourMonsterData[1].openState > 0 then - if not this.GetMyHelpHero(1) then - return true - end - end - return false - elseif redType == RedPointType.BuddishTrailHelp then - local heros = HeroManager.GetHeroDataByProperty(2,0) - if not heros or #heros < 1 then - return false - end - if this.fourMonsterData[2] and this.fourMonsterData[2].openState > 0 then - if not this.GetMyHelpHero(2) then - return true - end - end - return false - elseif redType == RedPointType.DemonTrailHelp then - local heros = HeroManager.GetHeroDataByProperty(3,0) - if not heros or #heros < 1 then - return false - end - if this.fourMonsterData[3] and this.fourMonsterData[3].openState > 0 then - if not this.GetMyHelpHero(3) then - return true - end - end - return false - elseif redType == RedPointType.TaoistTrailHelp then - local heros = HeroManager.GetHeroDataByProperty(4,0) - if not heros or #heros < 1 then - return false - end - if this.fourMonsterData[4] and this.fourMonsterData[4].openState > 0 then - if not this.GetMyHelpHero(4) then - return true - end - end - return false - end + return false + -- if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.FourElementTrail) then + -- return false + -- end + -- if redType == RedPointType.PersonTrailHelp then + -- local heros = HeroManager.GetHeroDataByProperty(1,0) + -- if not heros or #heros < 1 then + -- return false + -- end + -- if this.fourMonsterData[1] and this.fourMonsterData[1].openState > 0 then + -- if not this.GetMyHelpHero(1) then + -- return true + -- end + -- end + -- return false + -- elseif redType == RedPointType.BuddishTrailHelp then + -- local heros = HeroManager.GetHeroDataByProperty(2,0) + -- if not heros or #heros < 1 then + -- return false + -- end + -- if this.fourMonsterData[2] and this.fourMonsterData[2].openState > 0 then + -- if not this.GetMyHelpHero(2) then + -- return true + -- end + -- end + -- return false + -- elseif redType == RedPointType.DemonTrailHelp then + -- local heros = HeroManager.GetHeroDataByProperty(3,0) + -- if not heros or #heros < 1 then + -- return false + -- end + -- if this.fourMonsterData[3] and this.fourMonsterData[3].openState > 0 then + -- if not this.GetMyHelpHero(3) then + -- return true + -- end + -- end + -- return false + -- elseif redType == RedPointType.TaoistTrailHelp then + -- local heros = HeroManager.GetHeroDataByProperty(4,0) + -- if not heros or #heros < 1 then + -- return false + -- end + -- if this.fourMonsterData[4] and this.fourMonsterData[4].openState > 0 then + -- if not this.GetMyHelpHero(4) then + -- return true + -- end + -- end + -- return false + -- end end function this.SetRewardWave(waves) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index 338896bf76..1a0e4df3b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -302,6 +302,7 @@ function this.SingleHeroDataShow(_go,_heroData) --end imageCom.gameObject:GetComponent("Image").sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.changeProId)) Util.GetGameObject(_go.transform, "card/heroStage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage]) + Util.GetGameObject(_go.transform, "card/redAndLock"):SetActive(true) local redPoint = Util.GetGameObject(_go.transform, "card/redAndLock/redPoint") Util.GetGameObject(_go.transform, "card/redAndLock/lockImage"):SetActive(heroData.lockState == 1) Util.GetGameObject(_go.transform, "card/core"):SetActive(heroData.heroConfig.Main == 1)