From 4d97370a2486c38a935b68e743e67850186e9d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BD=AA?= <2han9b1a0@gmial.com> Date: Thu, 3 Mar 2022 16:52:08 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E3=80=90=E8=BD=A6=E8=BF=9F=E6=96=97?= =?UTF-8?q?=E6=B3=95=E3=80=91=E8=B7=A8=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 3 +++ .../~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua | 5 +++-- .../~Lua/Modules/Guild/GuildMainCityPanel.lua | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 2976f4e66f..37e32b98e8 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2804,6 +2804,9 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag [29] = { bgImage = "r_zjm_paihangbang_banner01", name = "妖灵试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 3,isRankingMainPanelShow = false}, [30] = { bgImage = "r_zjm_paihangbang_banner01", name = "道玄试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 4,isRankingMainPanelShow = false}, [31] = { bgImage = "", name = Language[12101] ,rankType = RANK_TYPE.WORLDARENA,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 10}, + --车迟斗法 + [35] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_CAR_DELEAY_SINGLE,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, + [36] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_CAR_DELEAY_GUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, } diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua index 5169283639..e8e725e8c7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua @@ -317,12 +317,13 @@ function this.SingleRankDataShow(go,userRank) sortNumTabs[4]:SetActive(true) Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = userRank.rankInfo.rank end + local serverName = PlayerManager.isCross == 1 and "("..userRank.serverName..") " or "" if curIndex == 2 then - Util.GetGameObject(go, "Value0"):GetComponent("Text").text = userRank.userName + Util.GetGameObject(go, "Value0"):GetComponent("Text").text = serverName..userRank.userName this.ScrollTitleRootName.text = Language[11020] elseif curIndex == 1 then this.ScrollTitleRootName.text = Language[11021] - Util.GetGameObject(go, "Value0"):GetComponent("Text").text = userRank.guildName.."("..userRank.rankInfo.param2..")" + Util.GetGameObject(go, "Value0"):GetComponent("Text").text = serverName..userRank.guildName.."("..userRank.rankInfo.param2..")" end Util.GetGameObject(go, "Value1"):GetComponent("Text").text = PrintWanNum3(userRank.rankInfo.param1) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua index 54da3f9e47..81f134f1a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua @@ -425,7 +425,7 @@ function this._TimeUpdate() end elseif GuildCarDelayManager.progress == GuildCarDelayProType.Loot then if PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.GUILD_CAR_DELEAY_LOOT) > 0 then - timeDown = GuildCarDelayManager.ChallengeCdTime + timeDown = GuildCarDelayManager.LootCdTime if timeDown > 0 then this.timeText.text = string.format("%s后可抢夺",TimeToMorS(timeDown)) else From ba38abcdafb23d2d9d69f5ab1ada7d4ab019874e Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 3 Mar 2022 16:56:33 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8428=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 514bbc72c3..a2e59797f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -10999,7 +10999,38 @@ local passivityList = { role.Event:AddEvent(BattleEventName.SkillCast, onSkillCast,nil,nil,role) role.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillCastEnd,nil,nil,role) end, + --回合开始前,为我方[a]属性最[b]神将[c]改变[d]点怒气,为敌方[e]属性最[f]神将[g]改变[h]点怒气,每局可触发[i]次 + -- a[int],b[int],c[int],d[int],e[int],f[int],g[int],h[int],i[int] + [428] = function(role, args,id,judge) + local p1 = args[1] + local s1 = args[2] + local ct1= args[3] + local v1 = args[4] + local p2 = args[5] + local s2 = args[6] + local ct2= args[7] + local v2 = args[8] + local t1 = args[9] + local time=0 + BattleLogic.Event:AddEvent(BattleEventName.BattleRoundStart, function(curRound) + if time>=t1 then + return + end + local list = RoleManager.Query(function(v) return v.camp == role.camp end) + list = BattleUtil.SortByProp(list, BattlePropList[p1],s1) + if list and #list>0 then + BattleUtil.CalRage(role,list[1],v1,ct1) + end + + local list2 = RoleManager.Query(function(v) return v.camp ~= role.camp end) + list2 = BattleUtil.SortByProp(list2, BattlePropList[p2],s2) + if list2 and #list2>0 then + BattleUtil.CalRage(role,list2[1],v2,ct2) + end + time=time+1 + end) + end, } return passivityList \ No newline at end of file From 361c08b5b1c2063111006d1545e157ea4cfa3bd9 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 3 Mar 2022 17:08:01 +0800 Subject: [PATCH 3/9] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E8=A2=AB=E5=8A=A8428=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index a2e59797f6..bb19ea94ad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -11014,6 +11014,10 @@ local passivityList = { local time=0 BattleLogic.Event:AddEvent(BattleEventName.BattleRoundStart, function(curRound) + if PassiveManager.passiveCountList[role.camp][428] and PassiveManager.passiveCountList[role.camp][428] > 0 then + return + end + PassiveManager.passiveCountList[role.camp][428] = 1 if time>=t1 then return end From d62388966b44e4cfc039bc6c01747218bbe47f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BD=AA?= <2han9b1a0@gmial.com> Date: Thu, 3 Mar 2022 17:37:34 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E3=80=90=E8=BD=A6=E8=BF=9F=E6=96=97?= =?UTF-8?q?=E6=B3=95=E3=80=91=E6=8A=A2=E5=A4=BA=E8=AE=B0=E5=BD=95=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Guild/CarDelay/GuildCarDelayLootRecordPopup.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootRecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootRecordPopup.lua index 391b54aeb1..f133d936fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootRecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootRecordPopup.lua @@ -41,17 +41,17 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function GuildCarDelayLootRecordPopup:OnShow() local curallLootRecordData = {} - --LogError("carChallengeItem.carChallengeItem "..#carChallengeItem.carChallengeItem) + -- LogError("carChallengeItem.carChallengeItem "..#carChallengeItem.carChallengeItem) --table.sort(carChallengeItem.carChallengeItem, function(a,b) return a.time > b.time end) for i = 1, #carChallengeItem.carChallengeItem do if carChallengeItem.carChallengeItem[i] and carChallengeItem.carChallengeItem[i].content ~= "" then local timeStr = os.date("%Y%m%d",carChallengeItem.carChallengeItem[i].time) if not curallLootRecordData[timeStr] then curallLootRecordData[timeStr] = {} - -- LogError("star "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content) + -- LogYellow("star "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content) table.insert(curallLootRecordData[timeStr],carChallengeItem.carChallengeItem[i]) else - -- LogError("add "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content) + -- LogGreen("add "..carChallengeItem.carChallengeItem[i].time .." "..carChallengeItem.carChallengeItem[i].content) table.insert(curallLootRecordData[timeStr],carChallengeItem.carChallengeItem[i]) end end @@ -89,7 +89,11 @@ function GuildCarDelayLootRecordPopup:OnShow() end titleText[i][j]:SetActive(true) Util.AddOnceClick(titleText[i][j], function() - UIManager.OpenPanel(UIName.PlayerInfoPopup, allLootRecordData[i][j].uid) + if PlayerManager.isCross == 1 then + UIManager.OpenPanel(UIName.PlayerInfoPopup, allLootRecordData[i][j].uid, PLAYER_INFO_VIEW_TYPE.NORMAL,1) + else + UIManager.OpenPanel(UIName.PlayerInfoPopup, allLootRecordData[i][j].uid) + end end) end isShowEmptyObj = false From 586b77af34eb20cc63ec0d66242b52db5de67039 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 4 Mar 2022 16:25:34 +0800 Subject: [PATCH 5/9] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E8=A2=AB=E5=8A=A8427=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index bb19ea94ad..79f5716e38 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -10975,6 +10975,10 @@ local passivityList = { if not skill then return end + --舍身济世分担不触发 + if damageType==3 then + return + end --如果是boss 并且额外伤害是根据最大生命则返回 local isBoss=BattleUtil.CheckIsBoss(target) if isBoss and pro==12 then From 8768ee20a2ddf84e1a0f54bbb945821aaa07cf72 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 4 Mar 2022 17:29:09 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E3=80=90=E7=89=9B=E6=B0=94=E5=86=B2?= =?UTF-8?q?=E5=A4=A9=E3=80=91=E6=B4=BB=E5=8A=A8=E7=95=8C=E9=9D=A2=E7=89=9B?= =?UTF-8?q?=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index 7dd6bb1ebc..bd4a76b0ed 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -209,6 +209,8 @@ function NiuQiChongTianPanel:SetProgress() elseif self.progressData[i].state == 0 then if itemConfig[self.progressData[i].reward[1][1]].ItemType == ItemType.SelfBox then UIManager.OpenPanel(UIName.RewardBoxPanel,nil,self.progressData[i].reward[1][1]) + elseif itemConfig[self.progressData[i].reward[1][1]].ItemType == ItemType.Ride then + UIManager.OpenPanel(UIName.RewardRideShowPopup,self.progressData[i].reward[1][1]) else UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,self.progressData[i].reward[1][1],nil) end @@ -319,4 +321,4 @@ function NiuQiChongTianPanel:OnDestroy() sortingOrder = 0 end -return NiuQiChongTianPanel \ No newline at end of file +return NiuQiChongTianPanel \ No newline at end of file From b10ebcd3ba286f86376d616997897c33d04a21b6 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 4 Mar 2022 17:48:27 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E3=80=90=E8=BD=A6=E8=BF=9F=E6=96=97?= =?UTF-8?q?=E6=B3=95=E3=80=91=E6=8A=A2=E5=A4=BA=E7=95=8C=E9=9D=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=B7=A8=E6=9C=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua index 1d26bc8c2a..3523cba3aa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua @@ -114,7 +114,11 @@ function this.SingleInfoDataShow(go,data) end Util.GetGameObject(go, "infoText/playerName"):GetComponent("Text").text = data.userName Util.GetGameObject(go, "infoText/warPower"):GetComponent("Text").text = data.force - Util.GetGameObject(go, "infoText/guildName"):GetComponent("Text").text = data.guildName + local guildName = data.guildName + if data.serverName and data.serverName ~= "" then + guildName = data.serverName.." "..guildName + end + Util.GetGameObject(go, "infoText/guildName"):GetComponent("Text").text = guildName Util.GetGameObject(go, "infoText/soreText"):GetComponent("Text").text = data.score --LogError("#data.teamInfo "..#data.teamInfo) --hadChallenge =6; // 是否已挑战过,1:表示挑战过,2:未挑战过。 From 51b829874da0520aecc044bd03c02dc67468736a Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 4 Mar 2022 18:13:16 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E3=80=90=E8=A7=92=E8=89=B2=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=91=E6=89=80=E6=9C=89=E8=B7=A8=E6=9C=8D=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E4=BF=A1=E6=81=AF=E7=9A=84=E4=B8=8D=E5=86=8D=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=B7=BB=E5=8A=A0=E5=A5=BD=E5=8F=8B=E5=92=8C=E9=BB=91?= =?UTF-8?q?=E5=90=8D=E5=8D=95=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=B7=A8=E6=9C=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/PlayerInfoPopup.lua | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 528e51a117..28419270db 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -209,6 +209,10 @@ function PlayerInfoPopup:BindEvent() this:ClosePanel() end) Util.AddClick(this.addFriendBtn, function() + if this.serverName and this.serverName ~= "" then + PopupTipPanel.ShowTip("无法跨服添加好友") + return + end if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GOODFRIEND) then PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GOODFRIEND)) return @@ -316,8 +320,8 @@ local titleLiveStr local titleLive function this.RefreshPlayerInfo(data) local curname = "" - if this.serverName then - curname = this.serverName .. " " ..data.name + if data.serverName then + curname = data.serverName .. " " ..data.name else curname = data.name end @@ -419,7 +423,7 @@ function this.FormationAdapter(teamInfo) Util.AddOnceClick(this.Demons[hero.position].frameBtn, function() NetManager.ViewHeroInfoRequest(this._PlayerId,hero.heroid,netserverName,this._Config.formationType,function(msg) if not hero.heroid then - return + return end heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill) GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId) @@ -719,6 +723,10 @@ function this.Report() end -- 拉黑 function this.AddToBlackList() + if this.serverName and this.serverName ~= "" then + PopupTipPanel.ShowTip("无法跨服添加黑名单") + return + end if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GOODFRIEND) then PopupTipPanel.ShowTip(Language[10828]) return From 1d3ef22dacb3e9ca31de90191ae31b6d14157133 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 4 Mar 2022 18:26:36 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E3=80=90=E7=8E=A9=E5=AE=B6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=91=E5=85=BC=E5=AE=B9=E4=BB=A5=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 28419270db..88a417b198 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -320,8 +320,10 @@ local titleLiveStr local titleLive function this.RefreshPlayerInfo(data) local curname = "" - if data.serverName then + if data.serverName and data.serverName ~= "" then curname = data.serverName .. " " ..data.name + elseif this.serverName and this.serverName ~= "" then + curname = this.serverName .. " " ..data.name else curname = data.name end