| Fight/GameActor/GA_NpcFightNorm.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/CrossServerRewardModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/FightingPKWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/SeasonRewardCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/SegmentRewardCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/MainInterfaceWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Fight/GameActor/GA_NpcFightNorm.cs
@@ -108,7 +108,10 @@ } } RequestLifeBar(); if (PlayerDatas.Instance.baseData.MapID == 31340) { RequestLifeBar(); } } public override void RequestShadow() System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -126,8 +126,8 @@ WindowCenter.Instance.Open<CrossServerOneVsOneRoundWin>(); } } if(mission.isStart == 1) DebugEx.LogFormat("副本帮助信息回合是否开始：：{0}",mission.isStart); if (mission.isStart == 1) { if(WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>()) { @@ -170,6 +170,7 @@ public string priceFormula { get;private set;} //购买匹配次数需要价格公式 public string winStreakScoreFormula { get; private set; } //连胜积分公式 public List<AwardType> dayAwardTypelist { get; private set; } public int afterOpenDayOpenCross { get; private set;} private void ParseFuncConfig() { var CrossRealmPKAward = Config.Instance.Get<FuncConfigConfig>("CrossRealmPKAward"); @@ -241,6 +242,9 @@ var CrossRealmPKScore = Config.Instance.Get<FuncConfigConfig>("CrossRealmPKScore"); winStreakScoreFormula = CrossRealmPKScore.Numerical3; var CrossRealmCfg = Config.Instance.Get<FuncConfigConfig>("CrossRealmCfg"); afterOpenDayOpenCross = int.Parse(CrossRealmCfg.Numerical1); } public class AwardType @@ -363,6 +367,20 @@ return true; } var teamModel = ModelCenter.Instance.GetModel<TeamModel>(); bool isTeamMatch = teamModel.isMatching; if(isTeamMatch) { SysNotifyMgr.Instance.ShowTip("CrossMatching6"); return true; } bool isDungeonPrepare = teamModel.teamPrepare.isPreparing; if(isDungeonPrepare) { SysNotifyMgr.Instance.ShowTip("CrossMatching7"); return true; } return false; } System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs
@@ -87,7 +87,7 @@ public string DisplayWinningRate() { float rate = PKCount != 0 ? (float)WinCount / PKCount : 0; return StringUtility.Contact((float)Math.Round(rate,1)*100,"%"); return StringUtility.Contact((float)Math.Round(rate*100,1),"%"); } } System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -70,7 +70,7 @@ private int SeasonAwardState; // 赛季结算奖励是否已领取 public int ZoneID = 0;//赛区ID public int SeasonID = 0;//赛季ID public int MyRank = 0;//我的排名 public int MyRank = -1;//我的排名 public override void Init() { GetSeasonAward(); System/CrossServerOneVsOne/FightingPKWin.cs
@@ -63,6 +63,7 @@ protected override void OnPreOpen() { positionType = (int)PlayerDatas.Instance.baseData.faction; CrossServerRewardModel.PkDanLvNow = CrossServerOneVsOnePlayerInfo.Instance.DanLV; PlaceOfBirth(positionType);//从出生位置设置信息 _MyBuffSortList.Clear(); @@ -123,7 +124,7 @@ { if (PlayerDatas.Instance.hero.aiHandler.IsAuto()) { m_AutoImg.SetActive(false); m_AutoImg.SetActive(true); } else { @@ -230,17 +231,17 @@ } private void OnHeroHandupAIStopPassive() { if (!m_AutoImg.activeSelf) { m_AutoImg.SetActive(true); } //if (!m_AutoImg.activeSelf) //{ // m_AutoImg.SetActive(true); //} } void OnHeroHandupAIStarted() { if (m_AutoImg.activeSelf) { m_AutoImg.SetActive(false); } //if (m_AutoImg.activeSelf) //{ // m_AutoImg.SetActive(false); //} } private void AutoButton() { System/CrossServerOneVsOne/SeasonRewardCell.cs
@@ -89,7 +89,42 @@ } else { if (IsOnTheList()) { if (ListIndex(crossServerRewardModel.MyRank) == Index) { bool isbool = crossServerRewardModel.IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState, -1); if (isbool) { m_IsReachImage.SetActive(false); m_ReceiveBtn.gameObject.SetActive(false); m_IsDrawImage.SetActive(true); } else { m_ReceiveBtn.gameObject.SetActive(true); m_IsReachImage.SetActive(false); m_IsDrawImage.SetActive(false); m_ReceiveBtn.SetListener(() => { crossServerRewardModel.CrossRealmPKGetAward(CrossRealmPKAwardStateEnum.SeasonAwardState, 0); }); } } else { m_IsReachImage.SetActive(true); m_ReceiveBtn.gameObject.SetActive(false); m_IsDrawImage.SetActive(false); } } else { m_IsReachImage.SetActive(true); m_ReceiveBtn.gameObject.SetActive(false); m_IsDrawImage.SetActive(false); } } ReceiveItemH(id); } @@ -145,7 +180,41 @@ } else { if (!IsOnTheList()) { if (CrossServerOneVsOnePlayerInfo.Instance.DanLV == Id) { bool isbool = crossServerRewardModel.IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState, -1); if (isbool) { m_IsReachImage.SetActive(false); m_ReceiveBtn.gameObject.SetActive(false); m_IsDrawImage.SetActive(true); } else { m_ReceiveBtn.gameObject.SetActive(true); m_IsReachImage.SetActive(false); m_IsDrawImage.SetActive(false); m_ReceiveBtn.SetListener(()=> { crossServerRewardModel.CrossRealmPKGetAward(CrossRealmPKAwardStateEnum.SeasonAwardState,0); }); } } else { m_IsReachImage.SetActive(true); m_ReceiveBtn.gameObject.SetActive(false); m_IsDrawImage.SetActive(false); } } else { m_IsReachImage.SetActive(true); m_ReceiveBtn.gameObject.SetActive(false); m_IsDrawImage.SetActive(false); } } ReceiveItemN(Id); } @@ -173,6 +242,29 @@ ObjChild.SetActive(false); } } } private bool IsOnTheList() { bool Isbool = false; if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100) { Isbool = true; } return Isbool; } private int ListIndex(int myRank) { int type = 0; var keyList = crossServerRewardModel.SeasonRewardDic.AwardDic.Keys.ToList(); for (int i = 0; i < keyList.Count; i++) { if (myRank <= keyList[i]) { type= i; } } return type; } }
@@ -107,6 +107,8 @@ } } } System/MainInterfacePanel/MainInterfaceWin.cs
@@ -1142,7 +1142,8 @@ private void IsShowTaskPanel()//是否显示任务面板 { var inDungeon = IsDungeon(); if (inDungeon || fairyGrabBossModel.grabBossHintOpen) var IsCrossServerOneVsOne = GameNetSystem.Instance.crossServerConnected_Loigc; if (inDungeon || fairyGrabBossModel.grabBossHintOpen || IsCrossServerOneVsOne) { m_TaskAndTeamTip.SetActive(false); m_TaskSwithButton.gameObject.SetActive(false); @@ -1269,7 +1270,7 @@ private void IsCrossServerOneVsOne() { if (CrossServerRewardModel.IsCrossServerOneVsOne())//是否再跨服副本中 if (GameNetSystem.Instance.crossServerConnected_Loigc)//是否再跨服副本中 { if (!WindowCenter.Instance.IsOpen("FightingPKWin")) { @@ -1284,7 +1285,6 @@ m_InGamePusher.gameObject.SetActive(false); m_RedBag.gameObject.SetActive(false); m_MailObj.SetActive(false); m_TaskAndTeamTip.SetActive(false); if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)//技能面板收起状态 { ShowCastSkill();//显示技能组,隐藏按钮组(强制切换) @@ -1301,7 +1301,6 @@ m_InGamePusher.gameObject.SetActive(true); OnRedBagGet(); m_MailObj.SetActive(true); m_TaskAndTeamTip.SetActive(true); } }
