From d474f0b456102c081f9d165d2f4ae9d352155d6b Mon Sep 17 00:00:00 2001 From: Yorgei Date: Thu, 3 Jul 2025 09:07:07 +1000 Subject: [PATCH] a --- index/index.js | 101 ++++++++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 48 deletions(-) diff --git a/index/index.js b/index/index.js index 5a470ae..5b988a5 100644 --- a/index/index.js +++ b/index/index.js @@ -82274,9 +82274,7 @@ window.__require = function e(t, n, o) { else { var t = b.AssaultOperationModel.GetSelfLocateResourceInfo(); if (t) { - var n; - console.error("AutoBattleTag", "\u67e5\u627e\u76ee\u6807\u4fe1\u606f", t); - for (var o = {}, r = 0; r < t.BattleQueue.length; r++) { + for (var n, o = {}, r = 0; r < t.BattleQueue.length; r++) { var i = t.BattleQueue[r].Items; o[i[b.AssaultOperationBattleInfo.AttackUid]] = !0, o[i[b.AssaultOperationBattleInfo.DefenderUid]] = !0 } @@ -82291,37 +82289,40 @@ window.__require = function e(t, n, o) { break } } - if (a && null == n) return console.error("AutoBattleTag", "\u6709\u73a9\u5bb6\u8fdb\u653b\u65b9\u5728\u6218\u6597 \u4e14\u672a\u627e\u5230\u5176\u4ed6\u53ef\u653b\u51fb\u73a9\u5bb6"), void this.StopAutoAttack(); - if (a = !1, null == n && t.OccupyAllianceId != s) { - for (r = 0; r < t.Defenders.length; r++) { - var c; - if (l = t.Defenders[r], !(c = b.AssaultOperationModel.GetPlayerInfo(l))) return; - if (c.ArrayParam[2] != s && !b.AssaultOperationModel.GetPlayerMoveInfo(l)) { - if (!o[l]) { - n = l; - break + if (a && null == n) this.StopAutoAttack(); + else { + if (a = !1, null == n && t.OccupyAllianceId != s) { + for (r = 0; r < t.Defenders.length; r++) { + var c; + if (l = t.Defenders[r], !(c = b.AssaultOperationModel.GetPlayerInfo(l))) return; + if (c.ArrayParam[2] != s && !b.AssaultOperationModel.GetPlayerMoveInfo(l)) { + if (!o[l]) { + n = l; + break + } + a = !0 } - a = !0 } + if (a && null == n) return void this.StopAutoAttack(); + if (!n) + for (var u in t.Monsters) { + var d = Number.parseInt(u); + if (t.Monsters[d] && !o[d]) { + n = d; + break + } + } } - if (a && null == n) return console.error("AutoBattleTag", "\u6709\u9632\u5b88\u653e\u73a9\u5bb6\u5728\u6218\u6597 \u4e14\u672a\u627e\u5230\u5176\u4ed6\u53ef\u653b\u51fb\u73a9\u5bb6"), void this.StopAutoAttack(); - if (!n) - for (var u in t.Monsters) { - var d = Number.parseInt(u); - if (t.Monsters[d] && !o[d]) { - n = d; - break - } - } + if (null != n) { + this._isCurBattling = !0, this._needFindTarget = !1; + var y = p.Req_AssaultOperation_ChallengeResourcePoint.create(); + y.ActivityId = I.default.ActivityId, h.RpcComponent.Instance.Call(y, function(t) { + 0 == t.Code ? (e._isCurBattling = !1, e.StopAutoAttack(), e.AutoAttack.isChecked = !1, D.UIUtlity.ShowFloatingHint("AssaultOperation_stopAutoHint".ToUILocale())) : t.BattleInfo && t.BattleInfo.length > 0 ? b.AssaultOperationModel.OnBattleStart([{ + Items: t.BattleInfo + }]) : (e._isCurBattling = !1, e._autoBattleCoolDown = 1) + }) + } else this.StopAutoAttack() } - if (null == n) return console.error("AutoBattleTag", "\u6ca1\u627e\u5230\u76ee\u6807"), void this.StopAutoAttack(); - console.error("AutoBattleTag", "\u76ee\u6807uid", n), this._isCurBattling = !0, this._needFindTarget = !1; - var y = p.Req_AssaultOperation_ChallengeResourcePoint.create(); - y.ActivityId = I.default.ActivityId, h.RpcComponent.Instance.Call(y, function(t) { - console.error("AutoBattleTag \u63a5\u53e3\u8fd4\u56decode", t), 0 == t.Code ? (e._isCurBattling = !1, e.StopAutoAttack(), e.AutoAttack.isChecked = !1, D.UIUtlity.ShowFloatingHint("AssaultOperation_stopAutoHint".ToUILocale())) : t.BattleInfo && t.BattleInfo.length > 0 ? b.AssaultOperationModel.OnBattleStart([{ - Items: t.BattleInfo - }]) : (e._isCurBattling = !1, e._autoBattleCoolDown = 1) - }) } } }, t.prototype.StopAutoAttack = function() { @@ -82329,8 +82330,8 @@ window.__require = function e(t, n, o) { }, t.prototype.CheckIsSelfBattling = function() { if (b.AssaultOperationModel.GetPlayerMoveInfo(f.DataCenter.Instance.Uid)) return this._isCurBattling = !1, void(this._autoBattleCoolDown = 1); var e = this._delayActions[f.DataCenter.Instance.Uid]; - if (!e) return this._isCurBattling = !1, this._autoBattleCoolDown = 1, void console.error("AutoBattleTag", "\u81ea\u5df1\u662f\u5426\u5728\u6218\u6597\u4e2d", this._isCurBattling); - e.EndTsTime > h.RpcComponent.Instance.ServerTime ? this._isCurBattling = !0 : (this._isCurBattling = !1, this._autoBattleCoolDown = 1), console.error("AutoBattleTag", "\u81ea\u5df1\u662f\u5426\u5728\u6218\u6597\u4e2d1", this._isCurBattling) + if (!e) return this._isCurBattling = !1, void(this._autoBattleCoolDown = 1); + e.EndTsTime > h.RpcComponent.Instance.ServerTime ? this._isCurBattling = !0 : (this._isCurBattling = !1, this._autoBattleCoolDown = 1) }, t.prototype.OnResourceItemChange = function(e, t, n) { if (t && t.length > 0) { if (b.AssaultOperationModel.IsSelfAllianceLose()) return D.UIUtlity.ShowFloatingHint("assaultOperation_allianceEliminate".ToUILocale()), l.Game.EventDispatcher.Emit(_.EventKeys.EVENT_ASSAULT_OPERATION_REFRESH, !0), void this.Close(); @@ -82347,7 +82348,7 @@ window.__require = function e(t, n, o) { var p, d = this._resourceInfoItems[c]; d && d.ShowTakeOverEffect(), (t[a] == i || p.NeighborIds.includes(i)) && (o = !0, r = !0) } - o && this.RefreshResourceItemSubPanelInfo(r), n && (this._isCurBattling = !1, this._autoBattleCoolDown = 1, console.error("AutoBattleTag", "\u8bbe\u7f6e\u5f00\u59cb\u6218\u6597\u72b6\u6001", this._isCurBattling), !this._isCurBattling && this.AutoAttack.isChecked && (this._needFindTarget = !0)) + o && this.RefreshResourceItemSubPanelInfo(r), n && (this._isCurBattling = !1, this._autoBattleCoolDown = 1, !this._isCurBattling && this.AutoAttack.isChecked && (this._needFindTarget = !0)) }, t.prototype.ConfigResourceBlock = function(e, t, n) { var o, r, i = this._mapComponent.NodesInstance[e].getComponent(L.default); i.InitNormalMapGrid(this._allianceColorMap[t.OccupyAllianceId], t); @@ -82478,7 +82479,7 @@ window.__require = function e(t, n, o) { SpriteFrame: this.PanelAtlas.getSpriteFrame("memberIcon"), ResourceId: t, ResourceType: e.Type - }), console.error(n, "=====\u7b80\u6613\u6218\u6597\u961f\u5217\u4fe1\u606f"), this.SimpleQueueItems[b.AssaultOperationQueueType.Battling].Init(this, { + }), this.SimpleQueueItems[b.AssaultOperationQueueType.Battling].Init(this, { BattleArray: n.BattleQueue, SpriteFrame: this.PanelAtlas.getSpriteFrame("battleIcon3"), ResourceId: t, @@ -83791,13 +83792,13 @@ window.__require = function e(t, n, o) { var t, n, o, r, a, c = p.RpcComponent.Instance.ServerTime, u = this.Data.SimpleResourceInfos[e], d = []; - if (console.error("AutoBattleTag", "\u6218\u6597\u7ed3\u675f", u), u && u.DefenderDeadTs) + if (u && u.DefenderDeadTs) for (var h = 0; h < u.DefenderDeadTs.length; h++) if (u.DefenderDeadTs[h].Items) { var g = null === (t = u.DefenderDeadTs[h]) || void 0 === t ? void 0 : t.Items[1], m = null === (n = u.DefenderDeadTs[h]) || void 0 === n ? void 0 : n.Items[0]; g <= c ? this.RemoveUidHeader(m, u.Id) : d.push(u.DefenderDeadTs[h]) - } if (u.DefenderDeadTs = d, console.error("AutoBattleTag", "\u6218\u6597\u7ed3\u675f\u7b80\u6613\u4fe1\u606f\u66f4\u65b0", u), this.Data.CurLookingResourceInfo && this.Data.CurLookingResourceInfo.Id == e && (r = this.Data.CurLookingResourceInfo, console.error("AutoBattleTag", "\u6218\u6597\u7ed3\u675f\u5f53\u524d\u67e5\u770b\u8d44\u6e90\u70b9", r)), !r && this.Data.CurLocateResourceInfo && this.Data.CurLocateResourceInfo.Id == e && (r = this.Data.CurLocateResourceInfo, console.error("AutoBattleTag", "\u6218\u6597\u7ed3\u675f\u5f53\u524d\u6240\u5728\u8d44\u6e90\u70b9", r)), r) { + } if (u.DefenderDeadTs = d, this.Data.CurLookingResourceInfo && this.Data.CurLookingResourceInfo.Id == e && (r = this.Data.CurLookingResourceInfo), !r && this.Data.CurLocateResourceInfo && this.Data.CurLocateResourceInfo.Id == e && (r = this.Data.CurLocateResourceInfo), r) { var I = [], _ = [], C = void 0, @@ -83820,7 +83821,7 @@ window.__require = function e(t, n, o) { var T; T = C < 0 ? "assaultOperation_monsterName".ToUILocale() : null === (o = this.GetPlayerInfo(C)) || void 0 === o ? void 0 : o.Name, s.UIManager.Instance.CloseUIPanel(f.PanelConfig.AssaultOperationQueuePanel.Path), s.UIManager.Instance.ShowUIPanel(f.PanelConfig.AssaultOperationDeadHintPanel.Path, this.GetResouceCurrentName(e), T) } - r.BattleQueue = I, s.Game.EventDispatcher.Emit(l.EventKeys.EVENT_ASSAULT_OPERATION_ENERGY_CHANGE, _), console.error("AutoBattleTag", "\u6218\u6597\u7ed3\u675f\u5f53\u524d\u67e5\u770b\u8d44\u6e90\u70b9-\u66f4\u65b0\u540e", r) + r.BattleQueue = I, s.Game.EventDispatcher.Emit(l.EventKeys.EVENT_ASSAULT_OPERATION_ENERGY_CHANGE, _) } s.Game.EventDispatcher.Emit(l.EventKeys.EVENT_ASSAULT_OPERATION_RESOURCE_CHANGE, [e], null, a) }, e.OnBattleStart = function(e, t) { @@ -83835,7 +83836,7 @@ window.__require = function e(t, n, o) { f = e[r].Items[i.ResourceId]; a._basePanel.AddDelayAction(d ? p.DataCenter.Instance.Uid : s, h, function() { n.CheckBattleEnd(f) - }), console.error("AutoBattleTag", "\u6218\u6597\u5f00\u59cb", e[r]), a.Data.CurLookingResourceInfo && a.Data.CurLookingResourceInfo.Id == f ? (a.AddBattleQueue(a.Data.CurLookingResourceInfo, e[r]), console.error("AutoBattleTag", "\u6218\u6597\u5f00\u59cb-\u5f53\u524d\u67e5\u770b\u8d44\u6e90\u70b9", a.Data.CurLookingResourceInfo)) : a.Data.CurLocateResourceInfo && a.Data.CurLocateResourceInfo.Id == f && (a.AddBattleQueue(a.Data.CurLocateResourceInfo, e[r]), console.error("AutoBattleTag", "\u6218\u6597\u5f00\u59cb-\u5f53\u524d\u6240\u5728\u8d44\u6e90\u70b9", a.Data.CurLocateResourceInfo)); + }), a.Data.CurLookingResourceInfo && a.Data.CurLookingResourceInfo.Id == f ? a.AddBattleQueue(a.Data.CurLookingResourceInfo, e[r]) : a.Data.CurLocateResourceInfo && a.Data.CurLocateResourceInfo.Id == f && a.AddBattleQueue(a.Data.CurLocateResourceInfo, e[r]); var y = void 0, g = a.Data.SimpleResourceInfos[f]; u <= 0 && (y = l), !y && c <= 0 && (y = s), y && g.DefenderDeadTs.push({ @@ -83984,19 +83985,19 @@ window.__require = function e(t, n, o) { var n = this, o = c.Req_AssaultOperation_GetResourcePointInfo.create(); o.ActivityId = h.default.ActivityId, o.Id = e, p.RpcComponent.Instance.Call(o, function(e) { - console.error("AutoBattleTag", "\u8d44\u6e90\u70b9\u63a5\u53e3\u8fd4\u56de", e), n.Data.CurLocateResourceInfo && n.Data.CurLookingResourceInfo && n.Data.CurLookingResourceInfo.Id == n.Data.CurLocateResourceInfo.Id && (n.Data.CurLocateResourceInfo = n.Data.CurLookingResourceInfo, console.error("AutoBattleTag", "\u67e5\u770b\u8d44\u6e90\u70b9\u6539\u53d8 \u6240\u5728\u8d44\u6e90\u70b9\u8d4b\u503c", n.Data.CurLocateResourceInfo)), n.Data.CurLookingResourceInfo = e.ResourcePoint, n.StorePlayerInfo(e), t && t() + n.Data.CurLocateResourceInfo && n.Data.CurLookingResourceInfo && n.Data.CurLookingResourceInfo.Id == n.Data.CurLocateResourceInfo.Id && (n.Data.CurLocateResourceInfo = n.Data.CurLookingResourceInfo), n.Data.CurLookingResourceInfo = e.ResourcePoint, n.StorePlayerInfo(e), t && t() }) }, e.GetSelfLocateResourceInfo = function() { var e = this, t = this.GetSelfLocation(); if (t) { - if (this.Data.CurLookingResourceInfo && t == this.Data.CurLookingResourceInfo.Id) return console.error("AutoBattleTag", "\u5f53\u524d\u6240\u5728\u8d44\u6e90\u70b9\u65e7", this.Data.CurLocateResourceInfo), this.Data.CurLocateResourceInfo = this.Data.CurLookingResourceInfo, console.error("AutoBattleTag", "\u5f53\u524d\u6240\u5728\u8d44\u6e90\u70b9\u65b0", this.Data.CurLocateResourceInfo), this.Data.CurLocateResourceInfo; + if (this.Data.CurLookingResourceInfo && t == this.Data.CurLookingResourceInfo.Id) return this.Data.CurLocateResourceInfo = this.Data.CurLookingResourceInfo, this.Data.CurLocateResourceInfo; if (!this.Data.CurLocateResourceInfo || this.Data.CurLocateResourceInfo && this.Data.CurLocateResourceInfo.Id != t) { if (!this._isReqSent) { this.Data.CurLocateResourceInfo = null; var n = c.Req_AssaultOperation_GetResourcePointInfo.create(); n.ActivityId = h.default.ActivityId, n.Id = t, this._isReqSent = !0, p.RpcComponent.Instance.Call(n, function(t) { - e.Data.CurLocateResourceInfo = t.ResourcePoint, console.error("AutoBattleTag", "\u5f53\u524d\u6240\u5728\u8d44\u6e90\u70b9\u63a5\u53e3\u8fd4\u56de", e.Data.CurLocateResourceInfo), e.StorePlayerInfo(t), e._isReqSent = !1 + e.Data.CurLocateResourceInfo = t.ResourcePoint, e.StorePlayerInfo(t), e._isReqSent = !1 }, function() { e._isReqSent = !1 }) @@ -84273,7 +84274,9 @@ window.__require = function e(t, n, o) { if (f.DataCenter.Instance.GetSpecialRedDot(u.SpecialRedDotType.AllianceId)) { var t = p.Req_AssaultOperation_EnterGameModule.create(); t.ActivityId = this._activityConfig._id, f.RpcComponent.Instance.Call(t, function(t) { - e._allianceRankInfo = t, t.AllianceRank <= e._activityConfig.CustomPart.AllianceCount ? e.SignUpHint.string = "RankMatchArena_signed".ToUILocale() : e.SignUpHint.string = "notSigned".ToUILocale(), e.AllianceRankNum.string = "myAllianceRank".ToUILocale() + ": " + t.AllianceRank + "" + e._allianceRankInfo = t, t.AllianceRank > 0 && t.AllianceRank <= e._activityConfig.CustomPart.AllianceCount ? e.SignUpHint.string = "RankMatchArena_signed".ToUILocale() : e.SignUpHint.string = "notSigned".ToUILocale(); + var n = t.AllianceRank <= 0 ? "100+" : t.AllianceRank.toString(); + e.AllianceRankNum.string = "myAllianceRank".ToUILocale() + ": " + n + "" }) } else this.AllianceRankNum.string = "myAllianceRank".ToUILocale() + ": " + "chatting_privateNotInAnyAlliance".ToUILocale() + "", this.SignUpHint.string = "notSigned".ToUILocale() }, t.prototype.ShowPreparingState = function() { @@ -84441,7 +84444,7 @@ window.__require = function e(t, n, o) { if (!f.DataCenter.Instance.GetSpecialRedDot(u.SpecialRedDotType.SlgSignUp)) return this.AllianceChargeBtn.node.active = !1, this.AccomplishmentBtn.node.active = !1, void(this.ScheduleBtn.node.active = !1); this.AllianceChargeBtn.node.active = !0, this.AccomplishmentBtn.node.active = !0, this.ScheduleBtn.node.active = !0 }, t.prototype.ShowGameGuid = function(e) { - if (!e || e == this._guideGroupId) { + if (this._curState != l.GetReward && (!e || e == this._guideGroupId)) { var t = w.default.Instance.GetCurrentGroupId(this._moduleGuideGroupIds); if (!(t <= 0)) { this._guideGroupId && this._guideGroupId == t || (this._guideGroupId = t, this._guideStepIndex = 0); @@ -86426,7 +86429,7 @@ window.__require = function e(t, n, o) { if (this.GetBtn.node.active = !1, this.NoGetBtn.node.active = !1, p.RpcComponent.Instance.ServerTime < g.default.ActivityEndSettlementTime) return this.NoGetBtn.node.active = !0, this._btnState = l.NotTime, void(this.NoGetBtnLabel.string = "GiftCode_receive".ToUILocale()); if (!this._isJoinActivity) return this.NoGetBtn.node.active = !0, this._btnState = l.NotJoin, void(this.NoGetBtnLabel.string = "GiftCode_receive".ToUILocale()); var e; - if (0 == this._nowPage ? 0 != this._activityConfig.PlayerRank[this._activityConfig.PlayerRank.length - 1].Rank[1] && this._myRank[this._nowPage] > this._activityConfig.PlayerRank[this._activityConfig.PlayerRank.length - 1].Rank[1] && (e = !0) : 0 != this._activityConfig.AllianceRankRewards[this._activityConfig.AllianceRankRewards.length - 1].Rank[1] && this._myRank[this._nowPage] > this._activityConfig.AllianceRankRewards[this._activityConfig.AllianceRankRewards.length - 1].Rank[1] && (e = !0), e) return this.NoGetBtn.node.active = !0, this._btnState = l.NotRank, void(this.NoGetBtnLabel.string = "GiftCode_receive".ToUILocale()); + if (0 == this._nowPage ? 0 != this._activityConfig.PlayerRank[this._activityConfig.PlayerRank.length - 1].Rank[1] && this._myRank[this._nowPage] > this._activityConfig.PlayerRank[this._activityConfig.PlayerRank.length - 1].Rank[1] && (e = !0) : 0 != this._activityConfig.AllianceRankRewards[this._activityConfig.AllianceRankRewards.length - 1].Rank[1] && this._myRank[this._nowPage] > this._activityConfig.AllianceRankRewards[this._activityConfig.AllianceRankRewards.length - 1].Rank[1] && (e = !0), e || this._myRank[this._nowPage] <= 0) return this.NoGetBtn.node.active = !0, this._btnState = l.NotRank, void(this.NoGetBtnLabel.string = "GiftCode_receive".ToUILocale()); var t = p.DataCenter.Instance.GetDataById(u.UserActivity_Model, g.default.ActivityId); return !t || !t.Int2DArray || t.Int2DArray.length < 4 || !t.Int2DArray[3].Items ? (this.NoGetBtn.node.active = !0, this._btnState = l.HasGot, void(this.NoGetBtnLabel.string = "already_receive".ToUILocale())) : 0 != t.Int2DArray[3].Items[this._nowPage] ? (this.NoGetBtn.node.active = !0, this._btnState = l.HasGot, void(this.NoGetBtnLabel.string = "already_receive".ToUILocale())) : (this.GetBtn.node.active = !0, void(this._btnState = l.CanGet)) }, i([S(cc.Label)], t.prototype, "Title", void 0), i([S(d.default)], t.prototype, "PageBtnToggles", void 0), i([S(cc.Button)], t.prototype, "GetBtn", void 0), i([S(cc.Label)], t.prototype, "GetBtnLabel", void 0), i([S(cc.Button)], t.prototype, "NoGetBtn", void 0), i([S(cc.Label)], t.prototype, "NoGetBtnLabel", void 0), i([S(cc.RichText)], t.prototype, "RankLabel", void 0), i([b], t) @@ -324672,7 +324675,7 @@ window.__require = function e(t, n, o) { }) }) }, e.BeforeInit = function() { - switch (l.GlobalConfigComponent.Instance.Channel = i.GameChannels.G123JP_WebMobile, l.GlobalConfigComponent.Instance.ClientVersion = "1.0.0", l.GlobalConfigComponent.Instance.AssetVersion = 546, l.GlobalConfigComponent.Instance.Channel) { + switch (l.GlobalConfigComponent.Instance.Channel = i.GameChannels.G123JP_WebMobile, l.GlobalConfigComponent.Instance.ClientVersion = "1.0.0", l.GlobalConfigComponent.Instance.AssetVersion = 550, l.GlobalConfigComponent.Instance.Channel) { case i.GameChannels.G123JP_WebMobile: l.GlobalConfigComponent.Instance.Locale = i.GameLocales.Jp, h.default.Instance.IsG123Live() ? l.GlobalConfigComponent.Instance.ServerAddress = i.GameServerAddresses.HighSchoolLive : h.default.Instance.IsG123DEV ? l.GlobalConfigComponent.Instance.ServerAddress = i.GameServerAddresses.HighSchoolPublicTest2 : l.GlobalConfigComponent.Instance.ServerAddress = i.GameServerAddresses.HighSchoolPublicTest1; break; @@ -337641,7 +337644,7 @@ window.__require = function e(t, n, o) { return s(this, function(e) { switch (e.label) { case 0: - return this.VNAccountAutoLogin() || _.default.Instance.UseSeflLoginSystem() ? (p.EZLog.Debug("use self account"), [3, 4]) : [3, 1]; + return this._useUidLogin || _.default.Instance.UseSeflLoginSystem() ? (p.EZLog.Debug("use self account"), [3, 4]) : [3, 1]; case 1: return _.default.Instance.IsVNChannel() || _.default.Instance.IsMainlandCheckChannel() ? [4, this.VNAccountAutoLogin()] : [3, 3]; case 2: @@ -386907,7 +386910,7 @@ window.__require = function e(t, n, o) { n.OpType = a.Push_OnAssaultOperationMessage, n.Handler = function(e) { return o(this, void 0, Promise, function() { return r(this, function() { - return i.EZLog.Log("Push_OnAssaultOperationMessage", e), l.AssaultOperationModel.Data && (console.error("AutoBattleTag", "\u63a8\u9001\u6d88\u606f", e), e.BattleInfo && e.BattleInfo.length > 0 && l.AssaultOperationModel.OnBattleStart(e.BattleInfo, !0), e.EnergyValueInfo && e.EnergyValueInfo.length > 0 && l.AssaultOperationModel.OnPlayerEnergyChange(e.EnergyValueInfo), e.Routes && e.Routes.length > 0 && l.AssaultOperationModel.OnPlayerMove(e.Routes), e.Routes && e.ChangedResourcePoint.length > 0 && l.AssaultOperationModel.OnResourceInfoChange(e.ChangedResourcePoint), e.winningStreaKInfo && e.winningStreaKInfo.length > 0 && i.Game.EventDispatcher.Emit(s.EventKeys.EVENT_ASSAULT_OPERATION_WIN_STEAK, e.winningStreaKInfo)), [2] + return i.EZLog.Log("Push_OnAssaultOperationMessage", e), l.AssaultOperationModel.Data && (e.BattleInfo && e.BattleInfo.length > 0 && l.AssaultOperationModel.OnBattleStart(e.BattleInfo, !0), e.EnergyValueInfo && e.EnergyValueInfo.length > 0 && l.AssaultOperationModel.OnPlayerEnergyChange(e.EnergyValueInfo), e.Routes && e.Routes.length > 0 && l.AssaultOperationModel.OnPlayerMove(e.Routes), e.Routes && e.ChangedResourcePoint.length > 0 && l.AssaultOperationModel.OnResourceInfoChange(e.ChangedResourcePoint), e.winningStreaKInfo && e.winningStreaKInfo.length > 0 && i.Game.EventDispatcher.Emit(s.EventKeys.EVENT_ASSAULT_OPERATION_WIN_STEAK, e.winningStreaKInfo)), [2] }) }) }, cc._RF.pop() @@ -433723,6 +433726,7 @@ window.__require = function e(t, n, o) { var t = p.DataCenter.Instance.GetDataById(u.UserActivity_Model, e.Value1); if (!t || !t.Int2DArray || t.Int2DArray.length <= 0) return !1; if (t.Int2DArray[3] && 1 == t.Int2DArray[3].Items[0]) return !1; + if (!t.Int2DArray[4].Items[1] || 0 == t.Int2DArray[4].Items[1]) return !1; if (t.Int2DArray[4].Items[1]) { var n = t.Int2DArray[4].Items[1], o = p.DataCenter.Instance.ActivityConfigs[e.Value1]; @@ -433734,7 +433738,8 @@ window.__require = function e(t, n, o) { if (m.default.Instance.ComputeAssaultOperationLastSettlementTime(e.Value1) > y.RpcComponent.Instance.ServerTime) return !1; var t = p.DataCenter.Instance.GetDataById(u.UserActivity_Model, e.Value1); if (!t || !t.Int2DArray || 1 == t.Int2DArray[3].Items[1]) return !1; - if (t.Int2DArray[4].Items[1]) { + if (!t.Int2DArray[4].Items[2] || 0 == t.Int2DArray[4].Items[2]) return !1; + if (t.Int2DArray[4].Items[2]) { var n = t.Int2DArray[4].Items[2], o = p.DataCenter.Instance.ActivityConfigs[e.Value1]; if (o.AllianceRankRewards[o.AllianceRankRewards.length - 1].Rank.length > 1 && o.AllianceRankRewards[o.AllianceRankRewards.length - 1].Rank[1] < n) return !1