Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2019-01-10 ece908d80d139de8136d2ac44c1faca549348dad

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/CrossServerOneVsOne/RankCellCtrl.cs

@@ -10,7 +10,8 @@
using UnityEngine.UI;
using System;



namespace Snxxz.UI {
namespace Snxxz.UI

{

    public class RankCellCtrl : ScrollerUI

    {

@@ -19,7 +20,7 @@
        [SerializeField] Image m_RankNumBottom;

        [SerializeField] Text m_NameTxt;

        [SerializeField] Text m_JobTxt;

       // [SerializeField] Text m_RankWhatTxt;

        // [SerializeField] Text m_RankWhatTxt;

        [SerializeField] Text m_SegmentTxt;

        [SerializeField] Text m_IntegralTxt;

        [SerializeField] Image m_RealmImage;

@@ -55,7 +56,7 @@
            m_RealmImage.gameObject.SetActive(false);

            RankingInformationClass data = null;

            ZoneRankingStruct zoneRanking = new ZoneRankingStruct();

            zoneRanking.ZoneID= crossServerRewardModel.ZoneID;

            zoneRanking.ZoneID = crossServerRewardModel.ZoneID;

            zoneRanking.SeasonID = crossServerRewardModel.SeasonID;

            Dictionary<int, RankingInformationClass> rankDic = new Dictionary<int, RankingInformationClass>();

            if (crossServerRewardModel.ZoneRankingDic.ContainsKey(zoneRanking))

@@ -68,11 +69,22 @@
            }

            if (data != null)

            {

                m_RankButton.SetListener(()=> 
                m_RankButton.SetListener(() =>

                {

                    //DebugEx.LogError(data.PlayerID);

                    roleParticularModel.ViewFairyCrossServerOneVsOne(data.PlayerID);

                });



                if (data.PlayerID == PlayerDatas.Instance.baseData.PlayerID)

                {

                    m_JobTxt.color = new Color32(16, 157, 6, 255);

                    m_NameTxt.color = new Color32(16, 157, 6, 255);

                }

                else

                {

                    m_JobTxt.color = new Color32(64, 28, 6, 255);

                    m_NameTxt.color = new Color32(64, 28, 6, 255); ;

                }

                m_NameTxt.text = data.PlayerName;

                m_JobTxt.text = OccupationNameConfig.GetOccupationName(data.Job, 1);

                RealmConfig presentCfg = Config.Instance.Get<RealmConfig>(data.Realm);

@@ -81,7 +93,7 @@
                    m_RealmImage.gameObject.SetActive(true);

                    m_RealmImage.SetSprite(presentCfg.Img);

                }

              //  m_RankWhatTxt.text = data.Power.ToString();

                //  m_RankWhatTxt.text = data.Power.ToString();

                Segment(data.DanLv);

                m_IntegralTxt.text = data.PkScore.ToString();

            }

@@ -89,23 +101,23 @@
            {

                m_NameTxt.text = Language.Get("L1046");

                m_JobTxt.text = "-";

              //  m_RankWhatTxt.text = "-";

                m_SegmentTxt.text= "-";

                m_IntegralTxt.text= "-";

                //  m_RankWhatTxt.text = "-";

                m_SegmentTxt.text = "-";

                m_IntegralTxt.text = "-";



                m_NameTxt.color = UIHelper.GetUIColor(TextColType.NavyBrown);

                m_JobTxt.color = UIHelper.GetUIColor(TextColType.NavyBrown);

               // m_RankWhatTxt.color = UIHelper.GetUIColor(TextColType.NavyBrown);

                // m_RankWhatTxt.color = UIHelper.GetUIColor(TextColType.NavyBrown);

                m_SegmentTxt.color = UIHelper.GetUIColor(TextColType.NavyBrown);

                m_RankButton.RemoveAllListeners();

            }

        }



        private void  Segment(int Danlv)

        private void Segment(int Danlv)

        {

            var config = Config.Instance.Get<CrossServerArenaConfig>(Danlv);

            m_SegmentTxt.text = config.Name;

            m_SegmentTxt.color= UIHelper.GetDanLVColor(Danlv, false);

            m_SegmentTxt.color = UIHelper.GetDanLVColor(Danlv, false);

            //if (Danlv >= 24)

            //{

            //    m_SegmentTxt.color = new Color32(255, 3, 3, 255);

@@ -124,9 +136,9 @@
            //}

        }



    }

   
    }





}