From 6085b2193a3111410de778f75669a518446a1e7b Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Wed, 6 Sep 2023 14:43:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=9A=E5=AF=B9=E5=A1=94=E6=8C=91?= =?UTF-8?q?=E6=88=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/MonsterCamp/GodsWayTowerPanel.lua | 8 +-- .../~Lua/View/GodsWaySingleSingleWave.lua | 49 ++++++++++--------- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua index 4c66506049..03a271655c 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua @@ -125,10 +125,10 @@ function GodsWayTowerPanel:BindEvent() PopupTipPanel.ShowTip("扫荡次数不足") return end - if not ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.DuoDuiTower,"Type",curType,"TowerNumber",curFloor + 1) then - PopupTipPanel.ShowTip("已通关全部层数,无法继续挑战") - return - end + -- if not ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.DuoDuiTower,"Type",curType,"TowerNumber",curFloor + 1) then + -- PopupTipPanel.ShowTip("已通关全部层数,无法继续挑战") + -- return + -- end -- if FormationManager.CheckFormationValid(curType + 3000) then -- MonsterCampManager.ExecuteFightBattle(trailData.monsterWave + 1 ,0,function() this:OnShow() end,curType,true) -- else diff --git a/Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua b/Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua index 1a10635c17..e37793870f 100644 --- a/Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua +++ b/Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua @@ -56,7 +56,7 @@ function GodsWaySingleSingleWave:OnOpen() --self.bg.sprite = self.spLoader:LoadSprite(GetFourElementBgByType(self.trailData.fourElementType)) self:UpdatePrivilage() if self.data.wave < curFloor then - self.pass.gameObject:SetActive(true) + self.pass.gameObject:SetActive(false) self.fight.gameObject:SetActive(false) self.reward.gameObject:SetActive(false) else @@ -102,25 +102,27 @@ function GodsWaySingleSingleWave:OnOpen() end) end if self.data.wave == curFloor then - if self.freeTimes <=0 and self.buyTimes <= 0 then - PopupTipPanel.ShowTip("今日已无扫荡次数!") - return - end - if self.freeTimes <= 0 then - if BagManager.GetItemCountById(self.itemId) < self.costNum then - PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[self.itemId].Name)) - return - end - local buyId=GodsWayTowerManager.GetTowerBuyIdByType(curType) - MsgPanel.ShowTwo(string.format("是否花费%s%s购买一次扫荡次数?",self.costNum,itemConfig[self.itemId].Name),function() end,function() - ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,self.storeDataId,1,function() - PrivilegeManager.RefreshPrivilegeUsedTimes(buyId, 1) - x() - end) - end,"取消","确定") - else - x() - end + -- if self.freeTimes <=0 and self.buyTimes <= 0 then + -- PopupTipPanel.ShowTip("今日已无扫荡次数!") + -- return + -- end + -- if self.freeTimes <= 0 then + -- if BagManager.GetItemCountById(self.itemId) < self.costNum then + -- PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[self.itemId].Name)) + -- return + -- end + -- local buyId=GodsWayTowerManager.GetTowerBuyIdByType(curType) + -- MsgPanel.ShowTwo(string.format("是否花费%s%s购买一次扫荡次数?",self.costNum,itemConfig[self.itemId].Name),function() end,function() + -- ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,self.storeDataId,1,function() + -- PrivilegeManager.RefreshPrivilegeUsedTimes(buyId, 1) + -- x() + -- end) + -- end,"取消","确定") + -- else + -- x() + -- + PopupTipPanel.ShowTip("已通关最高层") + return elseif self.data.wave == curFloor + 1 then local teamType=0 local myTeams=teamIds[curType] @@ -273,8 +275,8 @@ function GodsWaySingleSingleWave:SetIcon() Util.SetGray(self.fight,false) else --self.fightBtnMask.sprite = self.spLoader:LoadSprite("r_guji_jihuianniu_02") - self.fightBtnIcon.gameObject:SetActive(true) - self.fightBtnNum.gameObject:SetActive(true) + self.fightBtnIcon.gameObject:SetActive(false) + self.fightBtnNum.gameObject:SetActive(false) self.fightBtnIcon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[self.itemId].ResourceID)) local color = 0 LogError("self.itemId==="..self.itemId) @@ -285,10 +287,11 @@ function GodsWaySingleSingleWave:SetIcon() color = "17232A" end self.fightBtnNum.text =string.format("%s",color,self.costNum) - self.fightBtnText.text = string.format("%s",color,"扫荡") + --.fightBtnText.text = string.format("%s",color,"扫荡") if self.buyTimes < 1 then Util.SetGray(self.fight,true) end + self.fightBtnText.text = string.format("%s","17232A","已通关") end else self.rewardData = self.data.firstReward From 4b34e64de70e806e623d77d99c942104af6b51d0 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Wed, 6 Sep 2023 15:11:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E5=BC=80=E5=90=AF=20?= =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E6=8A=80=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guild/GuildMainCityPanel.lua | 2 +- .../~Lua/Modules/Guild/Skill/GuildSkillManager.lua | 12 ++++++------ .../~Lua/Modules/RoleInfo/RoleProInfoPopup.lua | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua index e9e3986446..5c2b9f7b29 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua @@ -47,7 +47,7 @@ local _GuildBuildConfig = { end, }, [GUILD_MAP_BUILD_TYPE.SKILL] = { --技能 - isOpen = false, + isOpen = true, rpType = RedPointType.Guild_Skill, btnName = "btnSkill", btnFunc = function() diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua index 411b10e66c..e82ddce4a8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua @@ -138,12 +138,12 @@ function this.SetAllGuildSkillRedPlayers() end --刷新方法 function this.RefreshAllGuildSkillRedPoint() - -- for i = 1, #GuildSkillType do - -- local isShowRedPoint = this.GuildSkillRedPoint(i) - -- if isShowRedPoint then - -- return true - -- end - -- end + for i = 1, #GuildSkillType do + local isShowRedPoint = this.GuildSkillRedPoint(i) + if isShowRedPoint then + return true + end + end return false end --1 已经查看过不需要显示新红点 0 显示红点 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua index 50d9d31abd..1160a2a7f4 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua @@ -130,7 +130,7 @@ function RoleProInfoPopup:OnOpen(_allAddProVal,_configData,_isShowGuild,_guildSk this.guildProName.text = Language[11061]..GuildSkillType[_configData.Profession] this.guildProValue.text = allLv -- 跳转按钮如果设置的公会技能等级,说明是别人,就不显示跳转 - this.jumpBtn:SetActive(false) + this.jumpBtn:SetActive(_guildSkill == nil) end if not this.specialPro then