snxxz_scripts.git

parent: 118735a1 | 补丁 | 提交 | ignore whitespace

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

client_linchunjie

2018-11-23 9d152214c12eb814bfe66f35453ac878c95b63bd

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

9个文件已修改

	Core/GameEngine/Model/Config/ModelResConfig.cs	114 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Model/Config/ModelResConfig.cs.meta	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/GameActor/GA_Hero.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/GameActor/GA_NpcFunc.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/GameActor/GActorPlayerBase.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FindPrecious/FindPreciousBossRebornBehaviour.cs	69 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/PlayerBuffDatas.cs	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/PlayerDead/PlayerDeadModel.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/PlayerDead/ReliveWin.cs	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/GameEngine/Model/Config/ModelResConfig.cs

@@ -1,62 +1,68 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Wednesday, June 20, 2018
//--------------------------------------------------------

using UnityEngine;
using System;

namespace TableConfig {

    
    public partial class ModelResConfig : ConfigBase {

//--------------------------------------------------------

//    [Author]:            第二世界

//    [  Date ]:           Friday, November 23, 2018

//--------------------------------------------------------



        public int ID { get ; private set ; }

        public string Name { get ; private set; } 
        public int Type { get ; private set ; }

        public string ResourcesName { get ; private set; } 
        public string BindPoint { get ; private set; } 
        public string EffFileName { get ; private set; } 
        public Vector3 UIOffset { get ; private set; } 
        public Vector3 UIRotation { get ; private set; } 
        public float UIScale { get ; private set; } 

        public override string getKey()

using UnityEngine;

using System;



namespace TableConfig

{





    public partial class ModelResConfig : ConfigBase

    {



        public int ID { get; private set; }

        public string Name { get; private set; }

        public int Type { get; private set; }

        public string ResourcesName { get; private set; }

        public string BindPoint { get; private set; }

        public string EffFileName { get; private set; }

        public Vector3 UIOffset { get; private set; }

        public Vector3 UIRotation { get; private set; }

        public float UIScale { get; private set; }

        public Vector3 Scale { get; private set; }



        public override string getKey()

        {

            return ID.ToString();

        }

        public override void Parse() {
            try

        }



        public override void Parse()

        {

            try

            {

                ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
			
                Name = rawContents[1].Trim();

			
                Type=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
			
                ResourcesName = rawContents[3].Trim();

			
                BindPoint = rawContents[4].Trim();

			
                EffFileName = rawContents[5].Trim();

			
                UIOffset=rawContents[6].Vector3Parse();

			
                UIRotation=rawContents[7].Vector3Parse();

			
                UIScale=IsNumeric(rawContents[8]) ? float.Parse(rawContents[8]):0; 
                ID = IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]) : 0;



                Name = rawContents[1].Trim();



                Type = IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]) : 0;



                ResourcesName = rawContents[3].Trim();



                BindPoint = rawContents[4].Trim();



                EffFileName = rawContents[5].Trim();



                UIOffset = rawContents[6].Vector3Parse();



                UIRotation = rawContents[7].Vector3Parse();



                UIScale = IsNumeric(rawContents[8]) ? float.Parse(rawContents[8]) : 0;



                Scale = rawContents[9].Vector3Parse();

            }

            catch (Exception ex)

            {

                DebugEx.Log(ex);

            }
        }
	
    }

}




            }

        }



    }



}










 Core/GameEngine/Model/Config/ModelResConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 290b3d02a826d6b4daabb2e80dfaa3ab
timeCreated: 1529459208
timeCreated: 1542940485
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Fight/GameActor/GA_Hero.cs

@@ -830,6 +830,8 @@
    #region 自动开启自动战斗逻辑



    private float m_CalculAutoFightTime;

    public float calculAutoFightTime { get { return m_CalculAutoFightTime; } }



    PlayerTaskDatas m_TaskModel;

    PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } }

    private void UpdateAutoStartFight()


 Fight/GameActor/GA_NpcFunc.cs

@@ -222,6 +222,9 @@
        m_WingModel.transform.SetParent(_bindNode);

        m_WingModel.transform.localPosition = Vector3.zero;

        m_WingModel.transform.localRotation = Quaternion.identity;



        ModelResConfig _resConfig = Config.Instance.Get<ModelResConfig>(m_WingID);

        m_WingModel.transform.localScale = _resConfig.Scale;

    }



    private void OnSecondaryLoaded(bool result, UnityEngine.Object prefab)


 Fight/GameActor/GActorPlayerBase.cs

@@ -738,6 +738,9 @@
            m_WingModel.transform.localPosition = Vector3.zero;

            m_WingModel.transform.localRotation = Quaternion.identity;



            ModelResConfig _resConfig = Config.Instance.Get<ModelResConfig>(_itemConfig.ChangeOrd);

            m_WingModel.transform.localScale = _resConfig.Scale;



            OnPutonWing(itemID, m_WingModel);



            // 处理动画相关


 System/FindPrecious/FindPreciousBossRebornBehaviour.cs

@@ -139,17 +139,37 @@
                return false;

            }



            var surplusTimes = demonJarModel.GetSurplusTimes();

            var needTimes = demonJarModel.isDoubleAward ? 2 : 1;

            if (surplusTimes < needTimes)

            if (DTCB105_tagMCPlayerWallow.forceOffLine)

            {

                return false;

            }



            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = Config.Instance.Get<MapConfig>(mapId);

            if (NewBieCenter.Instance.inGuiding)

            {

                return false;

            }



            if (mapConfig.MapFBType != (int)MapType.OpenCountry)

            if (PlayerTaskDatas.IsOPenAutoResolve())

            {

                return false;

            }



            if (PlayerDatas.Instance.hero != null && PlayerDatas.Instance.hero.CurMapArea == (int)MapArea.E_Type.Boss)

            {

                return false;

            }



            if (PlayerDatas.Instance.hero != null && Time.realtimeSinceStartup - PlayerDatas.Instance.hero.calculAutoFightTime < 60f)

            {

                return false;

            }



            if (PlayerDatas.Instance.hero != null && PlayerDatas.Instance.hero.ActorInfo.serverDie)

            {

                return false;

            }



            if (PlayerDatas.Instance.hero != null && PlayerDatas.Instance.hero.IsDaZuo())

            {

                return false;

            }

@@ -164,6 +184,43 @@
                return false;

            }



            if (MapTransferUtility.Instance.NpcID != 0)

            {

                return false;

            }



            var surplusTimes = demonJarModel.GetSurplusTimes();

            var needTimes = demonJarModel.isDoubleAward ? 2 : 1;

            if (surplusTimes < needTimes)

            {

                return false;

            }



            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = Config.Instance.Get<MapConfig>(mapId);



            if (GeneralDefine.neutralMaps.Contains(mapId))

            {

                return false;

            }



            if (mapConfig.MapFBType != (int)MapType.OpenCountry)

            {

                return false;

            }



            var grabBossLine = 0;

            ModelCenter.Instance.GetModel<FairyGrabBossModel>().TryGetFairyGrabBossLine(out grabBossLine);

            if (grabBossLine != 0 && PlayerDatas.Instance.baseData.FBID == grabBossLine)

            {

                return false;

            }



            if (WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())

            {

                return false;

            }



            if (WindowCenter.Instance.IsOpen("DemonJarWin") || WindowCenter.Instance.IsOpen("DemonJarAutoDoubleSettingWin"))

            {

                return false;


 System/MainInterfacePanel/PlayerBuffDatas.cs

@@ -366,8 +366,8 @@
        {

            return;

        }

        if (getWorldLV != 0 && worldExpRate>0)

        {

        if (getWorldLV != 0 && worldExpRate>0)//添加世界等级buff

        {       
            var skillconfig = Config.Instance.Get<SkillConfig>(20047);

            if (_BuffDic.ContainsKey(20047))

            {

@@ -390,7 +390,21 @@
                _BuffDic.Add(20047, _ObjBuff);

            }

            if (Even_ObjAddBuf != null)

            {

                Even_ObjAddBuf();

            }            
        }

        if (worldExpRate<=0)//删除世界等级Buff

        {

            if (_BuffDic.ContainsKey(20047))

            {

                _BuffDic.Remove(20047);

                if (Even_ObjDelBuff != null)

                {

                    Even_ObjDelBuff();

                }

            }

            return;

        }

    }




 System/PlayerDead/PlayerDeadModel.cs

@@ -11,6 +11,7 @@
{

    public int[]dungeonKillArray { get; private set; }

    public int deadBuffId { get; private set;}

    public int maxDeadBuffLV { get; private set;}



    public override void Init()

    {

@@ -22,6 +23,7 @@
        duplicatesRebornDict = ConfigParse.GetDic<int, int>(RebornTime.Numerical1);

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

        deadBuffId = int.Parse(ElderBattlefieldRobot.Numerical3);

        maxDeadBuffLV = int.Parse(ElderBattlefieldRobot.Numerical4);

        SysNotifyMgr.Instance.sysNotifyEvent += RefreshPlayerDieInfo;

    }




 System/PlayerDead/ReliveWin.cs

@@ -60,8 +60,17 @@
                        SkillConfig skillConfig = Config.Instance.Get<SkillConfig>(buffId);

                        if(skillConfig.SkillTypeID == DeadModel.deadBuffId)

                        {

                            skillName = skillConfig.SkillName;

                            buffLv = skillConfig.SkillLV + 1;

                            buffLv = buffLv > DeadModel.maxDeadBuffLV ? DeadModel.maxDeadBuffLV : buffLv;

                            for (int j = 0; j < skillConfigs.Count; j++)

                            {

                                var config = skillConfigs[j];

                                if(config.SkillLV == buffLv)

                                {

                                    skillName = config.SkillName;

                                    break;

                                }

                            }

                            break;

                        }

                    }

@@ -85,8 +94,6 @@
                    dieDesText.text = msg;

                }

            }

         
         
        }



        protected override void OnAfterOpen()

			@@ -1,62 +1,68 @@
			//--------------------------------------------------------
			// [Author]: 第二世界
			// [ Date ]: Wednesday, June 20, 2018
			//--------------------------------------------------------

			using UnityEngine;
			using System;

			namespace TableConfig {


			public partial class ModelResConfig : ConfigBase {
			//--------------------------------------------------------
			// [Author]: 第二世界
			// [ Date ]: Friday, November 23, 2018
			//--------------------------------------------------------

			public int ID { get ; private set ; }
			public string Name { get ; private set; }
			public int Type { get ; private set ; }
			public string ResourcesName { get ; private set; }
			public string BindPoint { get ; private set; }
			public string EffFileName { get ; private set; }
			public Vector3 UIOffset { get ; private set; }
			public Vector3 UIRotation { get ; private set; }
			public float UIScale { get ; private set; }

			public override string getKey()
			using UnityEngine;
			using System;

			namespace TableConfig
			{


			public partial class ModelResConfig : ConfigBase
			{

			public int ID { get; private set; }
			public string Name { get; private set; }
			public int Type { get; private set; }
			public string ResourcesName { get; private set; }
			public string BindPoint { get; private set; }
			public string EffFileName { get; private set; }
			public Vector3 UIOffset { get; private set; }
			public Vector3 UIRotation { get; private set; }
			public float UIScale { get; private set; }
			public Vector3 Scale { get; private set; }

			public override string getKey()
			{
			return ID.ToString();
			}

			public override void Parse() {
			try
			}

			public override void Parse()
			{
			try
			{
			ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;

			Name = rawContents[1].Trim();

			Type=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;

			ResourcesName = rawContents[3].Trim();

			BindPoint = rawContents[4].Trim();

			EffFileName = rawContents[5].Trim();

			UIOffset=rawContents[6].Vector3Parse();

			UIRotation=rawContents[7].Vector3Parse();

			UIScale=IsNumeric(rawContents[8]) ? float.Parse(rawContents[8]):0;
			ID = IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]) : 0;

			Name = rawContents[1].Trim();

			Type = IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]) : 0;

			ResourcesName = rawContents[3].Trim();

			BindPoint = rawContents[4].Trim();

			EffFileName = rawContents[5].Trim();

			UIOffset = rawContents[6].Vector3Parse();

			UIRotation = rawContents[7].Vector3Parse();

			UIScale = IsNumeric(rawContents[8]) ? float.Parse(rawContents[8]) : 0;

			Scale = rawContents[9].Vector3Parse();
			}
			catch (Exception ex)
			{
			DebugEx.Log(ex);
			}
			}

			}

			}




			}
			}

			}

			}

			@@ -1,6 +1,6 @@
			fileFormatVersion: 2
			guid: 290b3d02a826d6b4daabb2e80dfaa3ab
			timeCreated: 1529459208
			timeCreated: 1542940485
			licenseType: Pro
			MonoImporter:
			serializedVersion: 2

			@@ -830,6 +830,8 @@
			#region 自动开启自动战斗逻辑

			private float m_CalculAutoFightTime;
			public float calculAutoFightTime { get { return m_CalculAutoFightTime; } }

			PlayerTaskDatas m_TaskModel;
			PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } }
			private void UpdateAutoStartFight()

			@@ -222,6 +222,9 @@
			m_WingModel.transform.SetParent(_bindNode);
			m_WingModel.transform.localPosition = Vector3.zero;
			m_WingModel.transform.localRotation = Quaternion.identity;

			ModelResConfig _resConfig = Config.Instance.Get<ModelResConfig>(m_WingID);
			m_WingModel.transform.localScale = _resConfig.Scale;
			}

			private void OnSecondaryLoaded(bool result, UnityEngine.Object prefab)

			@@ -738,6 +738,9 @@
			m_WingModel.transform.localPosition = Vector3.zero;
			m_WingModel.transform.localRotation = Quaternion.identity;

			ModelResConfig _resConfig = Config.Instance.Get<ModelResConfig>(_itemConfig.ChangeOrd);
			m_WingModel.transform.localScale = _resConfig.Scale;

			OnPutonWing(itemID, m_WingModel);

			// 处理动画相关

			@@ -139,17 +139,37 @@
			return false;
			}

			var surplusTimes = demonJarModel.GetSurplusTimes();
			var needTimes = demonJarModel.isDoubleAward ? 2 : 1;
			if (surplusTimes < needTimes)
			if (DTCB105_tagMCPlayerWallow.forceOffLine)
			{
			return false;
			}

			var mapId = PlayerDatas.Instance.baseData.MapID;
			var mapConfig = Config.Instance.Get<MapConfig>(mapId);
			if (NewBieCenter.Instance.inGuiding)
			{
			return false;
			}

			if (mapConfig.MapFBType != (int)MapType.OpenCountry)
			if (PlayerTaskDatas.IsOPenAutoResolve())
			{
			return false;
			}

			if (PlayerDatas.Instance.hero != null && PlayerDatas.Instance.hero.CurMapArea == (int)MapArea.E_Type.Boss)
			{
			return false;
			}

			if (PlayerDatas.Instance.hero != null && Time.realtimeSinceStartup - PlayerDatas.Instance.hero.calculAutoFightTime < 60f)
			{
			return false;
			}

			if (PlayerDatas.Instance.hero != null && PlayerDatas.Instance.hero.ActorInfo.serverDie)
			{
			return false;
			}

			if (PlayerDatas.Instance.hero != null && PlayerDatas.Instance.hero.IsDaZuo())
			{
			return false;
			}
			@@ -164,6 +184,43 @@
			return false;
			}

			if (MapTransferUtility.Instance.NpcID != 0)
			{
			return false;
			}

			var surplusTimes = demonJarModel.GetSurplusTimes();
			var needTimes = demonJarModel.isDoubleAward ? 2 : 1;
			if (surplusTimes < needTimes)
			{
			return false;
			}

			var mapId = PlayerDatas.Instance.baseData.MapID;
			var mapConfig = Config.Instance.Get<MapConfig>(mapId);

			if (GeneralDefine.neutralMaps.Contains(mapId))
			{
			return false;
			}

			if (mapConfig.MapFBType != (int)MapType.OpenCountry)
			{
			return false;
			}

			var grabBossLine = 0;
			ModelCenter.Instance.GetModel<FairyGrabBossModel>().TryGetFairyGrabBossLine(out grabBossLine);
			if (grabBossLine != 0 && PlayerDatas.Instance.baseData.FBID == grabBossLine)
			{
			return false;
			}

			if (WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())
			{
			return false;
			}

			if (WindowCenter.Instance.IsOpen("DemonJarWin") \|\| WindowCenter.Instance.IsOpen("DemonJarAutoDoubleSettingWin"))
			{
			return false;

			@@ -366,8 +366,8 @@
			{
			return;
			}
			if (getWorldLV != 0 && worldExpRate>0)
			{
			if (getWorldLV != 0 && worldExpRate>0)//添加世界等级buff
			{
			var skillconfig = Config.Instance.Get<SkillConfig>(20047);
			if (_BuffDic.ContainsKey(20047))
			{
			@@ -390,7 +390,21 @@
			_BuffDic.Add(20047, _ObjBuff);
			}
			if (Even_ObjAddBuf != null)
			{
			Even_ObjAddBuf();
			}
			}
			if (worldExpRate<=0)//删除世界等级Buff
			{
			if (_BuffDic.ContainsKey(20047))
			{
			_BuffDic.Remove(20047);
			if (Even_ObjDelBuff != null)
			{
			Even_ObjDelBuff();
			}
			}
			return;
			}
			}

			@@ -11,6 +11,7 @@
			{
			public int[]dungeonKillArray { get; private set; }
			public int deadBuffId { get; private set;}
			public int maxDeadBuffLV { get; private set;}

			public override void Init()
			{
			@@ -22,6 +23,7 @@
			duplicatesRebornDict = ConfigParse.GetDic<int, int>(RebornTime.Numerical1);
			FuncConfigConfig ElderBattlefieldRobot = Config.Instance.Get<FuncConfigConfig>("ElderBattlefieldRobot");
			deadBuffId = int.Parse(ElderBattlefieldRobot.Numerical3);
			maxDeadBuffLV = int.Parse(ElderBattlefieldRobot.Numerical4);
			SysNotifyMgr.Instance.sysNotifyEvent += RefreshPlayerDieInfo;
			}

			@@ -60,8 +60,17 @@
			SkillConfig skillConfig = Config.Instance.Get<SkillConfig>(buffId);
			if(skillConfig.SkillTypeID == DeadModel.deadBuffId)
			{
			skillName = skillConfig.SkillName;
			buffLv = skillConfig.SkillLV + 1;
			buffLv = buffLv > DeadModel.maxDeadBuffLV ? DeadModel.maxDeadBuffLV : buffLv;
			for (int j = 0; j < skillConfigs.Count; j++)
			{
			var config = skillConfigs[j];
			if(config.SkillLV == buffLv)
			{
			skillName = config.SkillName;
			break;
			}
			}
			break;
			}
			}
			@@ -85,8 +94,6 @@
			dieDesText.text = msg;
			}
			}


			}

			protected override void OnAfterOpen()