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

Client_PangDeRong

2018-12-28 87a2f0e66af54d5d6020bbc50d30e1477d4fa9ee

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/FightingPKWin.cs

@@ -85,6 +85,7 @@


        protected override void OnActived()

        {

            dungeonEndTime = dungeonModel.GetCoolDownEndTime(DungeonCoolDownType.TowerTake);

            Viewport1.gameObject.SetActive(false);
            Viewport2.gameObject.SetActive(false);

        }

 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/RankingWin.cs

@@ -197,14 +197,22 @@
        {

            int danlv = CrossServerOneVsOnePlayerInfo.Instance.DanLV;

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

            if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100)

            {

                m_TextMyRank.text = (crossServerRewardModel.MyRank + 1).ToString();

            }

            else

            if (CrossServerOneVsOnePKSeason.Instance.ZoneID != crossServerRewardModel.ZoneID)

            {

                m_TextMyRank.text = Language.Get("CrossServer122");

            }

            else

            {

                if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100)

                {

                    m_TextMyRank.text = (crossServerRewardModel.MyRank + 1).ToString();

                }

                else

                {

                    m_TextMyRank.text = Language.Get("CrossServer123");

                }

            }

            
        }

        private void SetZoneAndSeasonNum()


 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,6 +187,7 @@
            if (config != null)

            {

                m_Segmenttext.text = config.Name;

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

            }

            if (CrossServerOneVsOnePKSeason.Instance.SeasonState != 2)

            {

@@ -224,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/FairyAu/FairyFeastModel.cs

@@ -17,6 +17,7 @@
        public event Action fairyFeastPlayerUpdate;



        public float transmitCostSeconds { get; private set; }

        public float transmitExpSeconds { get; private set; }

        string expFormula { get; set; }

        public int riseLevel { get; private set; }

        public int expFlyStage { get; private set; }

@@ -47,7 +48,8 @@
        void ParseConfig()

        {

            var config = Config.Instance.Get<FuncConfigConfig>("FairyFeastTransmit");

            transmitCostSeconds = 15;

            transmitCostSeconds = 8.5f;

            transmitExpSeconds = 7.7f;

            expFlyCount = 3;

            expFlyStage = 3;

            if (config != null)

@@ -55,6 +57,7 @@
                transmitCostSeconds = float.Parse(config.Numerical2) / 1000;

                expFlyStage = int.Parse(config.Numerical3);

                expFlyCount = int.Parse(config.Numerical4);

                transmitExpSeconds = float.Parse(config.Numerical5) / 1000;

            }

            config = Config.Instance.Get<FuncConfigConfig>("FamilyPartySitAward");

            expFormula = config.Numerical1;


 System/FairyAu/FairyFeastTransmitShow.cs

@@ -60,7 +60,7 @@
        {

            get

            {

                return timer / model.transmitCostSeconds;

                return timer / model.transmitExpSeconds;

            }

        }



@@ -144,7 +144,7 @@
                    Stop();

                    return;

                }

                if (timer >= stage * model.transmitCostSeconds / (model.expFlyStage + 1))

                if (timer >= stage * model.transmitExpSeconds / (model.expFlyStage + 1))

                {

                    StepStage();

                    stage++;