From 2f9e47fd1f407e7e54cdd74f83384e7dac7575e7 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 8 Mar 2021 17:54:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E7=82=B9=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/MonsterCamp/MonsterCampMainPanel.prefab | 10 +++++----- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 4 ++-- .../MonsterCamp/FourElementMonsterCampPanel.lua | 4 ++-- .../~Lua/Modules/MonsterCamp/MonsterCampManager.lua | 12 +++++++----- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab index b7176395bf..74d430b0d1 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampMainPanel.prefab @@ -573,7 +573,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3237263451956369982 RectTransform: m_ObjectHideFlags: 0 @@ -647,7 +647,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4300771784587347048 RectTransform: m_ObjectHideFlags: 0 @@ -797,7 +797,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8405720891597481347 RectTransform: m_ObjectHideFlags: 0 @@ -1929,7 +1929,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7981364898394692271 RectTransform: m_ObjectHideFlags: 0 @@ -2573,7 +2573,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6489330602894791834 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 27e41f8b4a..2e429edc7d 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -863,7 +863,7 @@ RedPointType = { TaoistTrailHelp = 805,--道玄试炼 --鸿蒙阵 - HongMeng = 801, -- 鸿蒙阵界面 + HongMeng = 8010, -- 鸿蒙阵界面 HongMeng_Evory = 8011, -- 鸿蒙使者格子 HongMeng_UpTower = 8012, -- 升级鸿蒙塔 按钮 HongMeng_OpenBox = 8013, -- 格子开启 @@ -2288,7 +2288,7 @@ Pokemon_Formation_RefreshType={ } FourElementName = {"人杰试炼","佛禅试炼","妖灵试炼","道玄试炼"} FourElementNameImage = {"s_silingshilian_renjiezi_zh","s_silingshilian_fochanzi_zh","s_silingshilian_yaolingzi_zh","s_silingshilian_daoxuanzi_zh"} -NumConvertWeek = {[1]=Language[10001],[2]=Language[10002],[3]=Language[10003],[4]=Language[10004],[5]=Language[10005],[6]=Language[10006],[7]=Language[10007]} +NumConvertWeek = {[1]=Language[10001],[2]=Language[10002],[3]=Language[10003],[4]=Language[10004],[5]=Language[10005],[6]=Language[10006],[7]=Language[10335]} CompShowType = { a = 1, diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua index 03f7308f04..f584ad9601 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua @@ -168,7 +168,7 @@ end --界面关闭时调用(用于子类重写) function FourElementMonsterCampPanel:OnClose() - + ClearRedPointObject(redTrailType[curType],Util.GetGameObject(this.btnHelpFight, "redPoint")) end --界面销毁时调用(用于子类重写) @@ -177,7 +177,7 @@ function FourElementMonsterCampPanel:OnDestroy() for k,v in pairs(this.singledataList) do v:OnDestroy() end - ClearRedPointObject(redTrailType[curType],Util.GetGameObject(this.btnHelpFight, "redPoint")) + end return FourElementMonsterCampPanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index f31fd3e70f..47bab1d6c7 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -501,13 +501,13 @@ function this.SetMyHelpHeroData(trail,_data,func) end this.myHelpHeroData[trail] = _data if trail == 1 then - CheckRedPointStatus(RedPointType.PersonTrailHelp) + CheckRedPointStatus(RedPointType.PersonTrail) elseif trail == 2 then - CheckRedPointStatus(RedPointType.BuddishTrailHelp) + CheckRedPointStatus(RedPointType.BuddishTrail) elseif trail == 3 then - CheckRedPointStatus(RedPointType.DemonTrailHelp) + CheckRedPointStatus(RedPointType.DemonTrail) elseif trail == 4 then - CheckRedPointStatus(RedPointType.TaoistTrailHelp) + CheckRedPointStatus(RedPointType.TaoistTrail) end end if func then @@ -565,6 +565,7 @@ function this.FourElementRedCheck(redType) elseif redType == RedPointType.TaoistTrail then if this.fourMonsterData[4] and this.fourMonsterData[4].openState > 0 then if this.fourMonsterData[4].freeTime > 0 then + LogGreen("道玄 红点开了") return true end end @@ -601,12 +602,13 @@ function this.CheckHelpFightRedPoint(redType) elseif redType == RedPointType.TaoistTrailHelp then if this.fourMonsterData[4] and this.fourMonsterData[4].openState > 0 then if not this.GetMyHelpHero(4) then + LogGreen("道玄 红点开了") return true end end + LogGreen("道玄 红点关了") return false end - end function this.SetRewardWave(waves)