10349 【越南】【英文】【BT】【砍树】跨服竞技场优化 战力显示不全 记录界面优化 自身战力显示 结算界面优化 赛季名次显示 血量和护盾

hch

2025-02-17 20e96e179bbf43662d946e0bb8522bd3be9df283

10349 【越南】【英文】【BT】【砍树】跨服竞技场优化
战力显示不全
记录界面优化
自身战力显示
结算界面优化
赛季名次显示
血量和护盾

 Fight/GameActor/PersonalEnemy.cs

@@ -195,7 +195,7 @@

    public static void Bind(GA_Player player)

    {

        if (ArenaManager.isArenaClient)

        if (ArenaManager.isArenaClient || CrossServerUtility.IsCrossServerOneVsOne())

        {

            if (OnMirrorPlayerAppear != null)

            {


 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -17,9 +17,10 @@
        CrossServerOneVsOneRewardModel rewardModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneRewardModel>(); } }

        public event Action UpdateDayAwardsEvent;

        public const int CrossServerDataMapId = 32010;

        public event Action UpdatePlayerAppearEventForWindow;



        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }



        public DateTime roundEndTime { get; private set; }

        StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }

        public string LocalSaveThirdTypeKey = string.Empty;

        private int recordDataMapId;

@@ -53,6 +54,9 @@
            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdateDayAwardState;

            TimeMgr.Instance.OnDayEvent -= OnDay;

            InitData();

            robots.Clear();

            matchPlayers.Clear();

            loginQueryMatch = false;

        }



        public void OnAfterPlayerDataInitialize()

@@ -127,7 +131,7 @@
                }

            }

            recordDataMapId = dataMapId;

            if (dataMapId == CrossServerDataMapId || dataMapId == 1000)

            if (dataMapId == CrossServerDataMapId)

            {

                PersonalEnemy.OnMirrorPlayerAppear += OnPlayerAppear;

            }

@@ -138,7 +142,7 @@
            CrossServerLogin.Instance.UpdatePKPlayerInfo(player);

            PersonalEnemy.OnMirrorPlayerAppear -= OnPlayerAppear;

            dungeonModel.dungeonFightStage = DungeonFightStage.Normal;



            UpdatePlayerAppearEventForWindow?.Invoke();

        }



        private void UpdateMinute()


 System/CrossServerOneVsOne/CrossServerOneVsOnePKPlayerCell.cs

@@ -32,6 +32,13 @@


            challengeBtn.AddListener(() =>

            {

                int remainNum = CrossServerOneVsOnePlayerInfo.Instance.GetDayRemainNum();

                if (remainNum <= 0)

                {

                    SysNotifyMgr.Instance.ShowTip("TryEnterJadeDynastyBossError_4");

                    return;

                }



                if (matchPlayer.PlayerID > 10000)

                {

                    var teamModel = ModelCenter.Instance.GetModel<TeamModel>();


 System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs

@@ -9,6 +9,7 @@
        [SerializeField] AvatarCell avatarCell;

        [SerializeField] Text nameText;

        [SerializeField] Text lvText;

        [SerializeField] Text fightPowerTxt;

        [SerializeField] Text rankText;

        [SerializeField] Text curScoreText;

        [SerializeField] Text honorText;

@@ -95,8 +96,9 @@


            avatarCell.InitUI(AvatarHelper.GetMyAvatarModel());



            nameText.text = playerData.PlayerName;

            lvText.text = StringUtility.Contact("Lv.", playerData.LV);

            //nameText.text = playerData.PlayerName;

            //lvText.text = StringUtility.Contact("Lv.", playerData.LV);

            fightPowerTxt.text = UIHelper.ReplaceLargeArtNum(playerData.FightPoint);

            scoreSlider.minValue = 0;

            scoreSlider.maxValue = 1;

            UpdateScore();


 System/CrossServerOneVsOne/CrossServerSettlementWin.cs

@@ -21,13 +21,6 @@
        [SerializeField] Button m_DropOutBtn;

        [SerializeField] Text m_DropOutBtnText;



        [SerializeField] GameObject m_Normal;

        [SerializeField] GameObject m_RoundWinOne;

        [SerializeField] Text m_m_RoundWinOneTxt;

        [SerializeField] GameObject m_RoundWinTwo;

        [SerializeField] Text m_m_RoundWinTwo;

        [SerializeField] GameObject m_RoundWinThree;

        [SerializeField] Text m_m_RoundWinThree;

        [SerializeField] GameObject m_SessionObj;

        [SerializeField] Text m_SessionTxt;

        [SerializeField] GameObject m_SegmentObj;

@@ -36,16 +29,6 @@


        [SerializeField] Text m_SorceText;







        [SerializeField] GameObject m_BrokenLine;

        [SerializeField] Text m_BrokenLineText;

        [SerializeField] GameObject m_SessionObj1;

        [SerializeField] Text m_SessionTxt1;

        [SerializeField] GameObject m_SegmentObj1;

        [SerializeField] Text m_Segment_Txt1;

        [SerializeField] Text m_Segment_Txt2;

        [SerializeField] Text m_Sorce_Txt;

        #region Built-in

        CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }

        DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

@@ -78,18 +61,8 @@
                m_BackFailure.SetActive(true);

                m_BackWin.SetActive(false);

            }

            if (crossServerModel.pkResultInfo.OverType == 0)

            {

                m_Normal.SetActive(true);

                m_BrokenLine.SetActive(false);

                SetNormal();

            }

            else

            {

                SetBrokenLine();

                m_Normal.SetActive(false);

                m_BrokenLine.SetActive(true);

            }



            SetNormal();



        }



@@ -141,140 +114,38 @@


        private void SetNormal()

        {

            m_RoundWinOne.SetActive(false);

            m_RoundWinTwo.SetActive(false);

            m_RoundWinThree.SetActive(false);

            m_SessionObj.SetActive(false);

            m_SegmentObj.SetActive(false);

            int WinnerID = crossServerModel.pkResultInfo.WinnerID;

            int PlayerId = (int)PlayerDatas.Instance.baseData.PlayerID;

            for (int i = 0; i < crossServerModel.pkResultInfo.RoundCount; i++)

            {

                int winID = (int)crossServerModel.pkResultInfo.RoundWinnerIDs[i];

                if (i == 0)

                {

                    m_RoundWinOne.SetActive(true);

                    if (winID == PlayerId)

                    {

                        m_m_RoundWinOneTxt.text = Language.Get("CrossServer113");

                        m_m_RoundWinOneTxt.color = new Color32(255, 239, 71, 255);

                    }

                    else

                    {

                        m_m_RoundWinOneTxt.text = Language.Get("CrossServer114");

                        m_m_RoundWinOneTxt.color = new Color32(255, 244, 205, 255);

                    }

                }

                else if (i == 1)

                {

                    m_RoundWinTwo.SetActive(true);

                    if (winID == PlayerId)

                    {

                        m_m_RoundWinTwo.text = Language.Get("CrossServer113");

                        m_m_RoundWinTwo.color = new Color32(255, 239, 71, 255);

                    }

                    else

                    {

                        m_m_RoundWinTwo.text = Language.Get("CrossServer114");

                        m_m_RoundWinTwo.color = new Color32(255, 244, 205, 255);

                    }

                }

                else if (i == 2)

                {

                    m_RoundWinThree.SetActive(true);

                    if (winID == PlayerId)

                    {

                        m_m_RoundWinThree.text = Language.Get("CrossServer113");

                        m_m_RoundWinThree.color = new Color32(255, 239, 71, 255);

                    }

                    else

                    {

                        m_m_RoundWinThree.text = Language.Get("CrossServer114");

                        m_m_RoundWinThree.color = new Color32(255, 244, 205, 255);

                    }

                }



            }

            if (crossServerModel.pkResultInfo.WinStreak > 1)

            {

                m_SessionObj.SetActive(true);

                m_SessionTxt.text = crossServerModel.pkResultInfo.WinStreak.ToString();

            }

            if (crossServerModel.pkResultInfo.DanLV != CrossServerOneVsOneRewardModel.PkDanLvNow)

            else

            {

                var config1 = CrossServerArenaConfig.Get(CrossServerOneVsOneRewardModel.PkDanLvNow);

                m_SegmentObj.SetActive(true);

                m_SegmentTxt1.text = config1.Name;

                var config2 = CrossServerArenaConfig.Get(crossServerModel.pkResultInfo.DanLV);

                m_SegmentTxt2.text = config2.Name;



                m_SessionObj.SetActive(false);

            }



            var config1 = CrossServerArenaConfig.Get(CrossServerOneVsOneRewardModel.PkDanLvNow);

            m_SegmentTxt1.text = config1.Name;

            var config2 = CrossServerArenaConfig.Get(crossServerModel.pkResultInfo.DanLV);

            m_SegmentTxt2.text = config2.Name;



            if (crossServerModel.pkResultInfo.WinStreak > 1)

            {

                m_SorceText.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore);//, (crossServerModel.pkResultInfo.AddScore - WinSorce));

                int virtualWinStreak = crossServerModel.pkResultInfo.WinStreak - 1;

                Equation.Instance.Clear();

                Equation.Instance.AddKeyValue("cWinCount", virtualWinStreak);

                int score = Equation.Instance.Eval<int>(crossServerModel.winStreakScoreFormula);



                m_SorceText.text = Language.Get("CrossServer_Z1", crossServerModel.pkResultInfo.AddScore, score);

            }

            else

            {

                if (WinnerID == PlayerId)

                {

                    m_SorceText.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore);

                }

                else

                {

                    m_SorceText.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore);

                }

                m_SorceText.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore);

            }

        }



        private void SetBrokenLine()

        {

            int WinnerID = crossServerModel.pkResultInfo.WinnerID;

            int playerID = (int)PlayerDatas.Instance.baseData.PlayerID;

            if (WinnerID == playerID)

            {

                m_BrokenLineText.text = Language.Get("CrossServer_Z6");

            }

            else

            {

                m_BrokenLineText.text = Language.Get("CrossServer_Z7");

            }

            if (crossServerModel.pkResultInfo.WinStreak > 1)

            {

                m_SessionObj1.SetActive(true);

                m_SessionTxt1.text = crossServerModel.pkResultInfo.WinStreak.ToString();

            }

            else

            {

                m_SessionObj1.SetActive(false);

            }

            if (crossServerModel.pkResultInfo.DanLV != CrossServerOneVsOneRewardModel.PkDanLvNow)

            {

                var config1 = CrossServerArenaConfig.Get(CrossServerOneVsOneRewardModel.PkDanLvNow);

                m_SegmentObj1.SetActive(true);

                m_Segment_Txt1.text = config1.Name;

                var config2 = CrossServerArenaConfig.Get(crossServerModel.pkResultInfo.DanLV);

                m_Segment_Txt2.text = config2.Name;

            }

            else

            {

                m_SegmentObj1.SetActive(false);

            }

            if (crossServerModel.pkResultInfo.WinStreak > 1)

            {

                m_Sorce_Txt.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore);//, (crossServerModel.pkResultInfo.AddScore - WinSorce));

            }

            else

            {

                if (WinnerID == playerID)

                {

                    m_Sorce_Txt.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore);

                }

                else

                {

                    m_Sorce_Txt.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore);

                }

            }

        }

        
    }



}


 System/CrossServerOneVsOne/FightingPKWin.cs

@@ -40,6 +40,8 @@
        BuffModel m_BuffModel;

        BuffModel Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>()); } }



        CrossServerOneVsOneModel model { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }



        private int positionType = 1;

        #region Built-in

        protected override void BindController()

@@ -61,6 +63,7 @@


        protected override void OnPreOpen()

        {

            model.UpdatePlayerAppearEventForWindow += Model_UpdatePlayerAppearEventForWindow;

            positionType = CrossServerLogin.Instance.oneVsOnePlayerData.myBornPoint;

            CrossServerOneVsOneRewardModel.PkDanLvNow = CrossServerOneVsOnePlayerInfo.Instance.DanLV;

            PlayerDatas.Instance.playerDataRefreshEvent += Updatefighting;//数据的刷新(h0418)

@@ -83,6 +86,11 @@
            IsShowMyBuffBtn();

            IsShowOpponentBuffBtn();



        }



        private void Model_UpdatePlayerAppearEventForWindow()

        {

            PlaceOfBirth(positionType);//从出生位置设置信息

        }



        protected override void OnActived()

@@ -110,6 +118,7 @@


        protected override void OnPreClose()

        {

            model.UpdatePlayerAppearEventForWindow -= Model_UpdatePlayerAppearEventForWindow;

            PlayerDatas.Instance.playerDataRefreshEvent -= Updatefighting;//数据的刷新(h0418)

            GA_Player.s_OnRefreshLife -= OnRefreshPlayerLifeBar;

            if (PlayerDatas.Instance.hero != null)

@@ -202,8 +211,7 @@
        private void BuffUpdateEvent(int playerID)

        {



            int opponentPlayerId = CrossServerLogin.Instance.oneVsOnePlayerData.opponentPlayerId;

            if (playerID == opponentPlayerId)

            if (playerID != PlayerDatas.Instance.baseData.PlayerID)

            {

                GetopponentBuff();

                UpdateControllerPositionOppoent();

@@ -259,17 +267,7 @@


        private void ShieldUpdate(int playerID, int maxShield, int shieldNow)

        {

            if (playerID == CrossServerLogin.Instance.oneVsOnePlayerData.opponentPlayerId)

            {

                if (positionType == 1)

                {

                    m_RoleInformation2.SetShieldNumber(maxShield, shieldNow);

                }

                else

                {

                    m_RoleInformation1.SetShieldNumber(maxShield, shieldNow);

                }

            }

            m_RoleInformation2.SetShieldNumber(maxShield, shieldNow);

        }



        private void OnHeroHandupAIStopPassive()


 System/Login/CrossServerLogin.cs

@@ -17,7 +17,6 @@
        public bool reconnectBackGround { get; set; }



        Clock loginOverTimeClock;

        float lastLoginTime = 0f;

        int reLoginTimes = 0;



        public CrossServerOneVsOne oneVsOnePlayerData { get; private set; }