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

client_linchunjie

2018-12-28 66e9c66af22feaf1c8238af9bc073b3028e80ff6

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

 Fight/GameActor/GA_Player.cs

@@ -153,6 +153,11 @@
        ActorInfo.Hp = m_H0434.HP;

        ActorInfo.MaxHp = m_H0434.MaxHP;



        if (s_OnRefreshLife != null)

        {

            s_OnRefreshLife(ServerInstID, ActorInfo.RealHp, ActorInfo.RealMaxHp);

        }



        RequestName();



        m_CmdManager = new CmdManager();


 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -475,8 +475,10 @@
        #endregion



        #region 红点

        public const int CrossServerRedKey = 213;

        public Redpoint crossServerRedpoint = new Redpoint(CrossServerRedKey);

        public const int CrossOneVsOneRedKey = 21301;

        public Redpoint crossOneVsOneRedpoint = new Redpoint(CrossOneVsOneRedKey);

        public Redpoint crossOneVsOneRedpoint = new Redpoint(CrossServerRedKey,CrossOneVsOneRedKey);

        public const int CrossArenaRedKey = 2130101;

        public Redpoint crossArenaRedpoint = new Redpoint(CrossOneVsOneRedKey, CrossArenaRedKey);

        public const int CrossDayAwardsRedKey = 21301011;

@@ -519,6 +521,16 @@
            {

                crossDayAwardsRedpoint.state = RedPointState.None;

            }



            if(crossMatchRedpoint.state != RedPointState.None)

            {

                crossServerRedpoint.count = playerInfo.GetDayRemainNum();

                crossServerRedpoint.state = RedPointState.Quantity;

            }

            else

            {

                crossServerRedpoint.count = 0;

            }

        }

        #endregion

    }


 System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs

@@ -77,12 +77,14 @@


        public int GetDayRemainNum()

        {

           return DayBuyCount + crossServerModel.freeMaxMatchNum - DayPKCount;

            int remainNum = DayBuyCount + crossServerModel.freeMaxMatchNum - DayPKCount;

            return remainNum > 0 ? remainNum : 0;

        }



        public int GetDayRemainBuyNum()

        {

            return crossServerModel.buyMaxMatchNum - DayBuyCount;

            int remainNum = crossServerModel.buyMaxMatchNum - DayBuyCount;

            return remainNum > 0 ? remainNum : 0;

        }



        public string DisplayWinningRate()


 System/CrossServerOneVsOne/CrossSeverOneVsOneDayAwardCell.cs

@@ -105,7 +105,7 @@


        private void ClickRecieve()

        {

            if (awardType == null) return;

            if (awardType == null || m_CrossServerCyclicScroll.showing) return;



            isLineMove = true;

            switch (awardType.type)


 System/CrossServerOneVsOne/KingRewardItem.cs

New file
@@ -0,0 +1,30 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Friday, December 28, 2018
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using UnityEngine.UI;

namespace Snxxz.UI {

    public class KingRewardItem:MonoBehaviour {

        [SerializeField] ItemCell m_ItemCell;
        [SerializeField] Text m_KingText;
        public ItemCell ItemCell

        {

            get { return m_ItemCell; }

            set { m_ItemCell = value; }

        }

        public Text KingText

        {

            get { return m_KingText; }

            set { m_KingText = value; }

        }
    }

}




 System/CrossServerOneVsOne/KingRewardItem.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 1df826046c779c545b19c4a08452d77c
timeCreated: 1545963952
licenseType: Free
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/CrossServerOneVsOne/SeasonRewardCell.cs

@@ -135,10 +135,26 @@
            for (int i = 0; i < m_Itemlist.childCount; i++)

            {

                GameObject ObjChild = m_Itemlist.GetChild(i).gameObject;

                KingRewardItem kingRewardItem = ObjChild.GetComponent<KingRewardItem>();

                if (i < List.Count)

                {

                    ObjChild.SetActive(true);

                    ItemCell _ItemCell = ObjChild.GetComponent<ItemCell>();

                    var config = Config.Instance.Get<KingTreasureItemConfig>(List[i].item.id);

                    if (config != null)

                    {

                        kingRewardItem.KingText.gameObject.SetActive(true);

                        kingRewardItem.KingText.text = config.qualityName;

                        var Itemconfig = Config.Instance.Get<ItemConfig>(List[i].item.id);

                        if (Itemconfig != null)

                        {

                            kingRewardItem.KingText.color = UIHelper.GetUIColor(Itemconfig.ItemColor,false);                      
                        }

                    }

                    else

                    {

                        kingRewardItem.KingText.gameObject.SetActive(false);

                    }

                    ItemCell _ItemCell = kingRewardItem.ItemCell;

                    ItemCellModel cellModel = new ItemCellModel(List[i].item.id, true, (ulong)List[i].item.count, List[i].isBind);

                    _ItemCell.Init(cellModel);

                    int type = i;

@@ -171,7 +187,7 @@
            if (config != null)

            {

                m_Segmenttext.text = config.Name;

                m_Segmenttext.color = UIHelper.GetDanLVColor(config.DanLV, true);

               // m_Segmenttext.color = UIHelper.GetDanLVColor(config.DanLV, false);

            }

            if (CrossServerOneVsOnePKSeason.Instance.SeasonState != 2)

            {

@@ -225,10 +241,26 @@
            for (int i = 0; i < m_Itemlist.childCount; i++)

            {

                GameObject ObjChild = m_Itemlist.GetChild(i).gameObject;

                KingRewardItem kingRewardItem = ObjChild.GetComponent<KingRewardItem>();

                if (i < List.Count)

                {

                    ObjChild.SetActive(true);

                    ItemCell _ItemCell = ObjChild.GetComponent<ItemCell>();

                    var config = Config.Instance.Get<KingTreasureItemConfig>(List[i].ItemId);

                    if (config != null)

                    {

                        kingRewardItem.KingText.gameObject.SetActive(true);

                        kingRewardItem.KingText.text = config.qualityName;

                        var Itemconfig = Config.Instance.Get<ItemConfig>(List[i].ItemId);

                        if (Itemconfig != null)

                        {

                            kingRewardItem.KingText.color = UIHelper.GetUIColor(Itemconfig.ItemColor, false);

                        }

                    }

                    else

                    {

                        kingRewardItem.KingText.gameObject.SetActive(false);

                    }

                    ItemCell _ItemCell = kingRewardItem.ItemCell;

                    ItemCellModel cellModel = new ItemCellModel(List[i].ItemId, true, (ulong)List[i].ItemNumber, List[i].Isbind);

                    _ItemCell.Init(cellModel);

                    int type = i;


 System/MainInterfacePanel/ChatFrame.cs

@@ -71,8 +71,8 @@
            myTeamRefreshEvent();

            OnRefreshFairyInfo();

            CheckRealmSfx();





            MailCountChange();

            GetRealmLevel();

            if (PlayerDatas.Instance.hero != null)

            {

                if (PlayerDatas.Instance.hero.aiHandler.IsAuto())

@@ -80,8 +80,8 @@
                    OnHeroHandupAIStopPassive();

                }

            }

            MailCountChange();

            GetRealmLevel();

          
          
        }



        public void OnAfterOpen()


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -1284,6 +1284,7 @@
                m_TaskSwithButton.gameObject.SetActive(false);

                m_InGamePusher.gameObject.SetActive(false);

                m_RedBag.gameObject.SetActive(false);

                IsShowTaskPanel();

                if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)//技能面板收起状态

                {

                    ShowCastSkill();//显示技能组,隐藏按钮组(强制切换)