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

client_Zxw

2018-09-28 bfa73f860bfcde5d905910dd767390671024efa8

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

 Core/GameEngine/Model/ConfigManager.cs

@@ -14,8 +14,7 @@
    bool isPlaying = true;



    bool m_Inited = false;

    public bool inited

    {

    public bool inited {

        get { return m_Inited; }

        private set { m_Inited = value; }

    }

@@ -376,7 +375,7 @@
        }

        else

        {

            path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, "config/", fileName, ".txt");

            path = AssetVersionUtility.GetAssetFilePath(StringUtility.Contact("config/", fileName, ".txt"));

        }



        var task = new ConfigTask(typeof(T), AssetSource.refdataFromEditor ? AssetPath.ResourceOut : AssetPath.External, path);


 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0439_tagPlayerChangeDienstgrad.cs

@@ -1,38 +1,39 @@
using UnityEngine;
using System.Collections;
using System;
using Snxxz.UI;

//04 39 周围玩家当前装备头衔刷新#tagPlayerChangeDienstgrad
public class DTC0439_tagPlayerChangeDienstgrad : DtcBasic
{
    public static event Action<int, int> playerDienstgradChangeEvent;

    public override void Done(GameNetPackBasic vNetPack)
    {

        base.Done(vNetPack);

        H0439_tagPlayerChangeDienstgrad vNetData = vNetPack as H0439_tagPlayerChangeDienstgrad;
        if (vNetData != null)
        {
            if (vNetData.PlayerID == PlayerDatas.Instance.baseData.PlayerID)
            {
                ModelCenter.Instance.GetModel<TitleModel>().OnRoleTitleRefresh(vNetData);
            }
        }

        if (playerDienstgradChangeEvent != null)
        {
            playerDienstgradChangeEvent((int)vNetData.PlayerID, (int)vNetData.GradID);
        }

        GActorPlayerBase _player = GAMgr.Instance.GetBySID(vNetData.PlayerID) as GActorPlayerBase;
        if (_player != null)
        {
            _player.SwitchTitle(vNetData.GradID);
        }
    }

}

using UnityEngine;

using System.Collections;

using System;

using Snxxz.UI;



//04 39 周围玩家当前装备头衔刷新#tagPlayerChangeDienstgrad

public class DTC0439_tagPlayerChangeDienstgrad : DtcBasic

{

    public static event Action<int, int> playerDienstgradChangeEvent;



    public override void Done(GameNetPackBasic vNetPack)

    {



        base.Done(vNetPack);



        H0439_tagPlayerChangeDienstgrad vNetData = vNetPack as H0439_tagPlayerChangeDienstgrad;

        if (vNetData != null)

        {

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

            {

                ModelCenter.Instance.GetModel<TitleModel>().OnRoleTitleRefresh(vNetData);

            }

        }



        if (playerDienstgradChangeEvent != null)

        {

            playerDienstgradChangeEvent((int)vNetData.PlayerID, (int)vNetData.GradID);

        }



        GActorPlayerBase _player = GAMgr.Instance.GetBySID(vNetData.PlayerID) as GActorPlayerBase;

        if (_player != null)

        {

            var titleId = PlayerDatas.Instance.baseData.MapID == 31160 ? 0 : vNetData.GradID;//上古战场不显示称号

            _player.SwitchTitle(titleId);

        }

    }



}




 Fight/GameActor/GA_Hero.cs

@@ -395,7 +395,8 @@
        var titleModel = ModelCenter.Instance.GetModel<TitleModel>();

        var _title = titleModel.GetTitleEquip();

        uint _titleID = 0;

        if (_title != null && titleModel.IsTitleGain(_title.id))

        if (_title != null && titleModel.IsTitleGain(_title.id)

            && PlayerDatas.Instance.baseData.MapID != 31160)//上古战场不显示称号

        {

            _titleID = (uint)_title.id;

        }

@@ -415,6 +416,7 @@
        }



        base.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON);

        CheckAncientHeadUp();

    }



    public sealed override void SwitchRedName(bool on)


 Fight/GameActor/GA_Player.cs

@@ -352,7 +352,8 @@
            m_HeadUpName = HeadUpName.RequireHeadUpName(HeadUpName.Pattern.Player, MP_Name, 0, CameraController.Instance.CameraObject);

        }



        m_HeadUpName.SetPlayerInfo((int)ActorInfo.realm, ActorInfo.titleID, ActorInfo.PlayerName, ActorInfo.familyName, m_H0434.State == 1);

        var titleId = PlayerDatas.Instance.baseData.MapID == 31160 ? 0 : ActorInfo.titleID;

        m_HeadUpName.SetPlayerInfo((int)ActorInfo.realm, titleId, ActorInfo.PlayerName, ActorInfo.familyName, m_H0434.State == 1);



        if (StatusMgr.Instance.IsExist(ServerInstID, StatusMgr.Instance.bossBelongBuffID))

        {

@@ -360,6 +361,7 @@
        }



        base.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON);

        CheckAncientHeadUp();

    }



    public sealed override void SwitchRedName(bool on)


 Fight/GameActor/GActorPlayerBase.cs

@@ -43,6 +43,8 @@


    public JobSetupConfig JobSetup { get; protected set; }



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



    public override int NextAction

    {

        get

@@ -216,6 +218,7 @@
        MovingState = E_MovingState.Normal;



        SystemSetting.Instance.qualityLevelChangeEvent += OnGameQualityChange;

        dungeonModel.updateMissionEvent += CheckAncientHeadUp;

        base.OnInit(package);

    }



@@ -337,6 +340,7 @@
        JobSetup = null;



        SystemSetting.Instance.qualityLevelChangeEvent -= OnGameQualityChange;

        dungeonModel.updateMissionEvent -= CheckAncientHeadUp;



        base.OnUnit();

    }

@@ -346,6 +350,21 @@
    protected override void OnLateUpdate()

    {

        UpdateRush();

    }



    public void CheckAncientHeadUp()

    {

        if (PlayerDatas.Instance.baseData.MapID == 31160)

        {

            var help = dungeonModel.mission;

            SwitchAncientKing(help.topPlayerID == ServerInstID);

            SwitchAncientEnemy(help.enemyID == ServerInstID && ServerInstID != PlayerDatas.Instance.baseData.PlayerID);

        }

        else

        {

            SwitchAncientKing(false);

            SwitchAncientEnemy(false);

        }

    }



    #region 装备穿戴相关

@@ -435,6 +454,26 @@
        m_HeadUpName.SetFairyLeague(on, ActorInfo.faction);

    }



    public void SwitchAncientKing(bool on)

    {

        if (m_HeadUpName == null)

        {

            return;

        }



        m_HeadUpName.SetAncientKing(on);

    }



    public void SwitchAncientEnemy(bool on)

    {

        if (m_HeadUpName == null)

        {

            return;

        }



        m_HeadUpName.SetAncientEnemy(on);

    }



    public virtual void SwitchYellowName(bool on)

    {

        if (m_HeadUpName == null)


 Fight/Stage/StageManager.cs

@@ -559,6 +559,15 @@
        _hero.IdleImmediate();



        _hero.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON);

        _hero.CheckAncientHeadUp();

        var titleId = 0;

        if (PlayerDatas.Instance.baseData.MapID != 31160)

        {

            var titelModel = ModelCenter.Instance.GetModel<TitleModel>();

            var title = titelModel.GetTitleEquip();

            titleId = title != null && titelModel.IsTitleGain(title.id) ? title.id : 0;

        }

        _hero.SwitchTitle((uint)titleId);



        // 判断buff

        if (StatusMgr.Instance.IsExist(PlayerDatas.Instance.PlayerId, StatusMgr.Instance.redNameBuffID))


 System/DogzDungeon/DogzDungeonModel.cs

@@ -219,46 +219,61 @@
                return;
            }

            var updatedBox = false;
            var updatedBigBox = false;
            var updatedSmallBox = false;
            var updatedElite = false;
            var updatedEliteNpcIds = new List<int>();

            for (int i = 0; i < _npcInfoes.NPCInfoList.Length; i++)
            {
                var npcInfo = _npcInfoes.NPCInfoList[i];
                if (npcInfo.NPCID == bigBoxNpcId)
                {
                    dogzDungeonBox.bigBoxSurplus = (int)npcInfo.Cnt;
                    updatedBox = true;
                    updatedBigBox = true;
                }

                if (npcInfo.NPCID == smallBoxNpcId)
                {
                    dogzDungeonBox.smallBoxSurplus = (int)npcInfo.Cnt;
                    updatedBox = true;
                    updatedSmallBox = true;
                }

                if (eliteMonsters.Contains((int)npcInfo.NPCID))
                {
                    dogzDungeonElite.UpdateEliteInfo((int)npcInfo.NPCID, (int)npcInfo.Cnt);
                    updatedEliteNpcIds.Add((int)npcInfo.NPCID);
                    updatedElite = true;
                }
            }

            if (updatedBox)
            if (!updatedBigBox)
            {
                if (boxSurplusChangeEvent != null)
                dogzDungeonBox.bigBoxSurplus = 0;
            }

            if (!updatedSmallBox)
            {
                dogzDungeonBox.smallBoxSurplus = 0;
            }

            if (boxSurplusChangeEvent != null)
            {
                boxSurplusChangeEvent();
            }

            foreach (var item in eliteMonsters)
            {
                if (!updatedEliteNpcIds.Contains(item))
                {
                    boxSurplusChangeEvent();
                    dogzDungeonElite.UpdateEliteInfo(item, 0);
                }
            }

            if (updatedElite)
            if (eliteSurplusChangeEvent != null)
            {
                if (eliteSurplusChangeEvent != null)
                {
                    eliteSurplusChangeEvent();
                }
                eliteSurplusChangeEvent();
            }

        }

        public void UpdateBoxOrEliteRefreshTime(HA904_tagGCDogzNPCRefreshTime _refreshTimes)

 System/Dungeon/DungeonData.cs

@@ -106,6 +106,8 @@
        public int leaderID;

        public FairyFeastRank[] familyPartyRank;

        public FairyFeastTop familyPartyTop;

        public int topPlayerID;

        public int enemyID;



        public long totalExp

        {


 System/RolePromote/RolePromoteModel.cs

@@ -138,6 +138,7 @@
        public Dictionary<int, int> wingLv2GenerDict = new Dictionary<int, int>();

        public Dictionary<int, List<RoleStrongerConfig>> roleStrongerDic = new Dictionary<int, List<RoleStrongerConfig>>();

        List<int> promotePercents = new List<int>();

        public List<int> fightPowerPercents = new List<int>();

        void ParseConfig()

        {

            var dict = Config.Instance.GetAllValues<RoleStrongerConfig>();

@@ -160,6 +161,7 @@
            }

            funcConfig = Config.Instance.Get<FuncConfigConfig>("FightpowerUp");

            promotePercents.AddRange(ConfigParse.GetMultipleStr<int>(funcConfig.Numerical1));

            fightPowerPercents.AddRange(ConfigParse.GetMultipleStr<int>(funcConfig.Numerical2));

        }



        public List<RoleStrongerConfig> GetStrongerConfigs(int funcType)


 System/RolePromote/RolePromoteWin.cs

@@ -151,46 +151,45 @@
        {

            var _playerLvCfg = Config.Instance.Get<PlayerLVConfig>(PlayerDatas.Instance.baseData.LV);

            var _rate = (float)PlayerDatas.Instance.baseData.FightPoint / _playerLvCfg.fightPower;

            var _grade = GetGrade(_rate);

            m_PresentGradeImgs[1].gameObject.SetActive(_rate > 1.2f);

            m_PresentGradeImgs[2].gameObject.SetActive(_rate > 1.2f);

            var index = 0;

            var iconKey = GetGrade(_rate, out index);

            m_PresentGradeImgs[1].gameObject.SetActive(index > 4);

            m_PresentGradeImgs[2].gameObject.SetActive(index > 5);

            for (int i = 0; i < m_PresentGradeImgs.Count; i++)

            {

                if (_rate <= 1.2f && i > 0)

                {

                    continue;

                }

                m_PresentGradeImgs[i].SetSprite(GetGrade(_rate));

                m_PresentGradeImgs[i].SetSprite(iconKey);

            }

        }



        private string GetGrade(float _rate)

        private string GetGrade(float _rate,out int index)

        {

            if (_rate <= 0.6)

            index = 0;

            for (int i = 0; i < model.fightPowerPercents.Count; i++)

            {

                return "Remark_D";

                if ((int)(_rate * 100) <= model.fightPowerPercents[i])

                {

                    index = i;

                    break;

                }

                index++;

            }

            if (_rate <= 0.75)

            switch (index)

            {

                return "Remark_C";

                case 0:

                    return "Remark_D";

                case 1:

                    return "Remark_C";

                case 2:

                    return "Remark_B";

                case 3:

                    return "Remark_A";

                case 4://s

                case 5://ss

                case 6://sss

                    return "Remark_S";

                default:

                    return "Remark_D";

            }

            if (_rate <= 0.85)

            {

                return "Remark_B";

            }

            if (_rate <= 1)

            {

                return "Remark_A";

            }

            if (_rate <= 1.2)

            {

                return "Remark_S";

            }

            if (_rate <= 1.5)

            {

                return "Remark_S";

            }

            return "Remark_S";

        }

    }




 UI/HUD/HeadUpName.cs

@@ -27,6 +27,8 @@
        [SerializeField] TextImage m_AllianceName;

        [SerializeField] TextImage m_FairyTitle;

        [SerializeField] TextImage m_FairyFlag;

        [SerializeField] TextImage m_AncientKing;

        [SerializeField] TextImage m_AncientEnemy;

        [SerializeField] ElderGodAngerBehaviour m_ElderAnger;

        [SerializeField] IceCrystalScoreBehaviour m_IceCrystalScore;

        [SerializeField] Transform m_BossDropout;

@@ -144,6 +146,34 @@
            }

        }



        public void SetAncientKing(bool isAncientKing)

        {

            if (m_AncientKing == null)

            {

                return;

            }

            m_AncientKing.gameObject.SetActive(isAncientKing);

            if (isAncientKing)

            {

                m_AncientKing.SetSprite("IntegralKing");

                m_AncientKing.SetNativeSize();

            }

        }



        public void SetAncientEnemy(bool isAncientEnemy)

        {

            if (m_AncientEnemy == null)

            {

                return;

            }

            m_AncientEnemy.gameObject.SetActive(isAncientEnemy);

            if (isAncientEnemy)

            {

                m_AncientEnemy.SetSprite("Enemy");

                m_AncientEnemy.SetNativeSize();

            }

        }



        public void SetAlliance(string _alliance)

        {

            if (string.IsNullOrEmpty(_alliance) || _alliance.Length == 0 || _alliance == "")