snxxz_scripts.git

parent: 36fa5f4d | 补丁 | 提交 | ignore whitespace

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

client_linchunjie

2018-11-27 655407b88c6884226d3be928996b155dc4573a22

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

8个文件已修改

	Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0406_tagNPCAppear.cs	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA127_tagMCStartChangeMap.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/NetworkPackage/DTCFile/ServerPack/HB2_ActionMap/DTCB206_tagMCHelpBattleCallResult.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/GameActor/GA_NpcFightZZPlayer.cs	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/DungeonChaosVictoryWin.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/DungeonData.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/DungeonNuwaVictoryWin.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/DungeonVictoryWin.cs	35 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -117,14 +117,19 @@


                    if (_findedInfo == null)

                    {

                        if (!GA_NpcFightZZPlayer.s_UnCreateObjIDList.Contains(vNetData.ObjID))

                        var _valueInfo = LocalSave.GetString("GA_NpcFightZZPlayer_" + vNetData.ObjID);



                        if (string.IsNullOrEmpty(_valueInfo))

                        {

                            GA_NpcFightZZPlayer.s_UnCreateObjIDList.Add(vNetData.ObjID);

                            //Debug.Log("尚未有助战对象信息. 加入未创建缓存");

                        }

                        else

                        {

                            Debug.LogErrorFormat("不应该存在出现目标再次出现的时候未创建列表中还存在该目标的现象: {0}", vNetData.ObjID);

                            if (!GA_NpcFightZZPlayer.s_UnCreateObjIDList.Contains(vNetData.ObjID))

                            {

                                GA_NpcFightZZPlayer.s_UnCreateObjIDList.Add(vNetData.ObjID);

                                Debug.LogFormat("添加: {0}", vNetData.ObjID);

                            }

                            else

                            {

                                Debug.LogErrorFormat("不应该存在出现目标再次出现的时候未创建列表中还存在该目标的现象: {0}", vNetData.ObjID);

                            }

                        }

                    }




 Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA127_tagMCStartChangeMap.cs

@@ -149,6 +149,7 @@
                    LocalSave.DeleteKey("GA_NpcFightZZPlayer_" + _id);
                }
                DTCB206_tagMCHelpBattleCallResult.s_CacheObjIdList.Clear();
                GA_NpcFightZZPlayer.s_UnCreateObjIDList.Clear();
                break;
            default:
                ModelCenter.Instance.GetModel<DungeonModel>().ResetBufData();

 Core/NetworkPackage/DTCFile/ServerPack/HB2_ActionMap/DTCB206_tagMCHelpBattleCallResult.cs

@@ -19,18 +19,22 @@
        HB206_tagMCHelpBattleCallResult vNetData = vNetPack as HB206_tagMCHelpBattleCallResult;

        assistModel.UpdataAssistPlayer(vNetData);



        string _content = string.Format("{0}|{1}", vNetData.PlayerID, vNetData.job);

        int _job = vNetData.job == 0 ? 1 : vNetData.job;



        string _content = string.Format("{0}|{1}", vNetData.PlayerID, _job);

        LocalSave.SetString("GA_NpcFightZZPlayer_" + vNetData.ObjID, _content);



        if (!s_CacheObjIdList.Contains(vNetData.ObjID))

        {

            s_CacheObjIdList.Add(vNetData.ObjID);

            // Debug.LogFormat("--------{0}:  _content : " + _content, vNetData.ObjID);

            Debug.LogFormat("--------{0}:{1}", vNetData.ObjID, _content);

        }



        if (GA_NpcFightZZPlayer.s_UnCreateObjIDList.Contains(vNetData.ObjID))

        {

            GA_NpcFightZZPlayer.s_UnCreateObjIDList.Remove(vNetData.ObjID);

            
            Debug.LogFormat("移除: {0}", vNetData.ObjID);

            var _zzPlayer = GAMgr.Instance.GetBySID(vNetData.ObjID) as GA_NpcFightZZPlayer;

            if (_zzPlayer != null)

            {


 Fight/GameActor/GA_NpcFightZZPlayer.cs

@@ -48,6 +48,8 @@

        m_CmdManager = new CmdManager();

        Debug.LogFormat("-------- 关于助战类型的Init: {0}", m_H0406.ObjID);

        if (!s_UnCreateObjIDList.Contains(m_H0406.ObjID))
        {
            var _valueInfo = LocalSave.GetString("GA_NpcFightZZPlayer_" + m_H0406.ObjID);
@@ -105,6 +107,8 @@
            ActorInfo.PlayerName = "助战NPC";
            ActorInfo.Hp = m_H0406.NPCHP;
            ActorInfo.MaxHp = m_H0406.MaxHP;
            ActorInfo.familyID = 0;
            ActorInfo.familyName = "";
            ActorInfo.realm = (uint)_config.RobotRealmLV;
            JobSetup = Config.Instance.Get<TableConfig.JobSetupConfig>(ActorInfo.Job);

@@ -126,9 +130,9 @@
            }

            ActorInfo.LV = (ushort)m_ViewPlayerData.rolePropData.LV;
            ActorInfo.Job =(byte) m_ViewPlayerData.rolePropData.Job;
            ActorInfo.Job = (byte)m_ViewPlayerData.rolePropData.Job;
            ActorInfo.PlayerName = m_ViewPlayerData.rolePropData.Name;
            ActorInfo.familyID =(uint) m_ViewPlayerData.rolePropData.FamilyID;
            ActorInfo.familyID = (uint)m_ViewPlayerData.rolePropData.FamilyID;
            ActorInfo.familyName = m_ViewPlayerData.rolePropData.FamilyName;
            ActorInfo.Hp = m_H0406.NPCHP;
            ActorInfo.MaxHp = m_H0406.MaxHP;
@@ -292,10 +296,10 @@
        SkinnedMeshRenderer _renderer = clothed.GetComponentInChildren<SkinnedMeshRenderer>();
        _renderer.gameObject.SetLayer(LayerUtility.Player, false);

        if(m_ViewPlayerData != null)
        if (m_ViewPlayerData != null)
        {
            SwitchGodWeapon(1,m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(1));
            SwitchGodWeapon(4,m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(4));
            SwitchGodWeapon(1, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(1));
            SwitchGodWeapon(4, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(4));
        }
    }

@@ -303,10 +307,10 @@
    {
        Renderer _renderer = secondary.GetComponentInChildren<Renderer>();
        _renderer.gameObject.SetLayer(LayerUtility.Player, false);
        
        if(m_ViewPlayerData != null)

        if (m_ViewPlayerData != null)
        {
            SwitchGodWeapon(2,m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(2));
            SwitchGodWeapon(2, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(2));
        }
    }

@@ -314,10 +318,10 @@
    {
        Renderer _renderer = weapon.GetComponentInChildren<Renderer>();
        _renderer.gameObject.SetLayer(LayerUtility.Player, false);
        
        if(m_ViewPlayerData != null)

        if (m_ViewPlayerData != null)
        {
            SwitchGodWeapon(3,m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(3));
            SwitchGodWeapon(3, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(3));
        }
    }


 System/Dungeon/DungeonChaosVictoryWin.cs

@@ -13,6 +13,7 @@
            base.DrawGetExp();
            base.DrawPassGrade();
            base.DrawItemRewards();
            base.DrawGetXianYuanCoins();
        }
    }
}

 System/Dungeon/DungeonData.cs

@@ -55,6 +55,7 @@
        public int runeMagicEssence;

        public ServerItem[] itemInfo;

        public ServerItem[] succItemInfo;

        public int[] xianyuanCoin;

        public int sp;

        public int startRewardLineID;

        public int enterLV;


 System/Dungeon/DungeonNuwaVictoryWin.cs

@@ -116,6 +116,7 @@
            base.DrawSP();

            base.DrawPassTime();

            base.DrawPassGrade();

            base.DrawGetXianYuanCoins();

            DrawItemRewards();



            var hasAssistPoint = false;


 System/Dungeon/DungeonVictoryWin.cs

@@ -26,6 +26,8 @@
        [SerializeField] Text m_Essence;

        [SerializeField, Header("魔晶")] protected Transform m_ContainerMagicEssence;

        [SerializeField] Text m_MagicEssence;

        [SerializeField, Header("仙缘币")] protected Transform m_ContainerXianyuanCoins;

        [SerializeField] Text m_XianyuanCoins;

        [SerializeField, Header("退出按钮")] ButtonEx m_Exit;

        [SerializeField] protected Text m_ExitTimer;

        [SerializeField, Header("评级")] GameObject m_GradeBottom;

@@ -366,6 +368,38 @@
            m_PassTime.text = StringUtility.Contact((int)(dungeonModel.dungeonResult.costTime * 0.001f), Language.Get("RealmWin_Bewrite_35"));

        }



        protected virtual void DrawGetXianYuanCoins()

        {

            var results = dungeonModel.dungeonResult.xianyuanCoin;

            bool isShow = m_ContainerXianyuanCoins == null || results == null || results.Length < 1 ? false : true;

            m_ContainerXianyuanCoins.gameObject.SetActive(isShow);

            if (!isShow) return;

            int getCoins = 0;

            int reason = 0;

            if(results.Length > 1)

            {

                getCoins = results[0];

                reason = results[1];

            }



            if(getCoins > 0 && reason == 0)

            {

                m_XianyuanCoins.text = UIHelper.ReplaceLargeNum((ulong)getCoins);

            }

            else

            {

                switch(reason)

                {

                    case 1:

                        m_XianyuanCoins.text = UIHelper.AppendStringColor(TextColType.Red, Language.Get("DungeonAssist145"));

                        break;

                    case 2:

                        m_XianyuanCoins.text = UIHelper.AppendStringColor(TextColType.Red, Language.Get("DungeonAssist144"));

                        break;

                }

            }

        }



        protected virtual void DrawGetMoney()

        {

            if (m_ContainerMoney != null)

@@ -463,6 +497,7 @@
            DrawSP();

            DrawKillMonster();

            DrawNewRecord();

            DrawGetXianYuanCoins();

        }



        protected int CompareTrialItemIndex(ServerItem x, ServerItem y)

			@@ -117,14 +117,19 @@

			if (_findedInfo == null)
			{
			if (!GA_NpcFightZZPlayer.s_UnCreateObjIDList.Contains(vNetData.ObjID))
			var _valueInfo = LocalSave.GetString("GA_NpcFightZZPlayer_" + vNetData.ObjID);

			if (string.IsNullOrEmpty(_valueInfo))
			{
			GA_NpcFightZZPlayer.s_UnCreateObjIDList.Add(vNetData.ObjID);
			//Debug.Log("尚未有助战对象信息. 加入未创建缓存");
			}
			else
			{
			Debug.LogErrorFormat("不应该存在出现目标再次出现的时候未创建列表中还存在该目标的现象: {0}", vNetData.ObjID);
			if (!GA_NpcFightZZPlayer.s_UnCreateObjIDList.Contains(vNetData.ObjID))
			{
			GA_NpcFightZZPlayer.s_UnCreateObjIDList.Add(vNetData.ObjID);
			Debug.LogFormat("添加: {0}", vNetData.ObjID);
			}
			else
			{
			Debug.LogErrorFormat("不应该存在出现目标再次出现的时候未创建列表中还存在该目标的现象: {0}", vNetData.ObjID);
			}
			}
			}

			@@ -149,6 +149,7 @@
			LocalSave.DeleteKey("GA_NpcFightZZPlayer_" + _id);
			}
			DTCB206_tagMCHelpBattleCallResult.s_CacheObjIdList.Clear();
			GA_NpcFightZZPlayer.s_UnCreateObjIDList.Clear();
			break;
			default:
			ModelCenter.Instance.GetModel<DungeonModel>().ResetBufData();

			@@ -19,18 +19,22 @@
			HB206_tagMCHelpBattleCallResult vNetData = vNetPack as HB206_tagMCHelpBattleCallResult;
			assistModel.UpdataAssistPlayer(vNetData);

			string _content = string.Format("{0}\|{1}", vNetData.PlayerID, vNetData.job);
			int _job = vNetData.job == 0 ? 1 : vNetData.job;

			string _content = string.Format("{0}\|{1}", vNetData.PlayerID, _job);
			LocalSave.SetString("GA_NpcFightZZPlayer_" + vNetData.ObjID, _content);

			if (!s_CacheObjIdList.Contains(vNetData.ObjID))
			{
			s_CacheObjIdList.Add(vNetData.ObjID);
			// Debug.LogFormat("--------{0}: _content : " + _content, vNetData.ObjID);
			Debug.LogFormat("--------{0}:{1}", vNetData.ObjID, _content);
			}

			if (GA_NpcFightZZPlayer.s_UnCreateObjIDList.Contains(vNetData.ObjID))
			{
			GA_NpcFightZZPlayer.s_UnCreateObjIDList.Remove(vNetData.ObjID);

			Debug.LogFormat("移除: {0}", vNetData.ObjID);
			var _zzPlayer = GAMgr.Instance.GetBySID(vNetData.ObjID) as GA_NpcFightZZPlayer;
			if (_zzPlayer != null)
			{

			@@ -48,6 +48,8 @@

			m_CmdManager = new CmdManager();

			Debug.LogFormat("-------- 关于助战类型的Init: {0}", m_H0406.ObjID);

			if (!s_UnCreateObjIDList.Contains(m_H0406.ObjID))
			{
			var _valueInfo = LocalSave.GetString("GA_NpcFightZZPlayer_" + m_H0406.ObjID);
			@@ -105,6 +107,8 @@
			ActorInfo.PlayerName = "助战NPC";
			ActorInfo.Hp = m_H0406.NPCHP;
			ActorInfo.MaxHp = m_H0406.MaxHP;
			ActorInfo.familyID = 0;
			ActorInfo.familyName = "";
			ActorInfo.realm = (uint)_config.RobotRealmLV;
			JobSetup = Config.Instance.Get<TableConfig.JobSetupConfig>(ActorInfo.Job);

			@@ -126,9 +130,9 @@
			}

			ActorInfo.LV = (ushort)m_ViewPlayerData.rolePropData.LV;
			ActorInfo.Job =(byte) m_ViewPlayerData.rolePropData.Job;
			ActorInfo.Job = (byte)m_ViewPlayerData.rolePropData.Job;
			ActorInfo.PlayerName = m_ViewPlayerData.rolePropData.Name;
			ActorInfo.familyID =(uint) m_ViewPlayerData.rolePropData.FamilyID;
			ActorInfo.familyID = (uint)m_ViewPlayerData.rolePropData.FamilyID;
			ActorInfo.familyName = m_ViewPlayerData.rolePropData.FamilyName;
			ActorInfo.Hp = m_H0406.NPCHP;
			ActorInfo.MaxHp = m_H0406.MaxHP;
			@@ -292,10 +296,10 @@
			SkinnedMeshRenderer _renderer = clothed.GetComponentInChildren<SkinnedMeshRenderer>();
			_renderer.gameObject.SetLayer(LayerUtility.Player, false);

			if(m_ViewPlayerData != null)
			if (m_ViewPlayerData != null)
			{
			SwitchGodWeapon(1,m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(1));
			SwitchGodWeapon(4,m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(4));
			SwitchGodWeapon(1, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(1));
			SwitchGodWeapon(4, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(4));
			}
			}

			@@ -303,10 +307,10 @@
			{
			Renderer _renderer = secondary.GetComponentInChildren<Renderer>();
			_renderer.gameObject.SetLayer(LayerUtility.Player, false);

			if(m_ViewPlayerData != null)

			if (m_ViewPlayerData != null)
			{
			SwitchGodWeapon(2,m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(2));
			SwitchGodWeapon(2, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(2));
			}
			}

			@@ -314,10 +318,10 @@
			{
			Renderer _renderer = weapon.GetComponentInChildren<Renderer>();
			_renderer.gameObject.SetLayer(LayerUtility.Player, false);

			if(m_ViewPlayerData != null)

			if (m_ViewPlayerData != null)
			{
			SwitchGodWeapon(3,m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(3));
			SwitchGodWeapon(3, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(3));
			}
			}

			@@ -13,6 +13,7 @@
			base.DrawGetExp();
			base.DrawPassGrade();
			base.DrawItemRewards();
			base.DrawGetXianYuanCoins();
			}
			}
			}

			@@ -55,6 +55,7 @@
			public int runeMagicEssence;
			public ServerItem[] itemInfo;
			public ServerItem[] succItemInfo;
			public int[] xianyuanCoin;
			public int sp;
			public int startRewardLineID;
			public int enterLV;

			@@ -116,6 +116,7 @@
			base.DrawSP();
			base.DrawPassTime();
			base.DrawPassGrade();
			base.DrawGetXianYuanCoins();
			DrawItemRewards();

			var hasAssistPoint = false;

			@@ -26,6 +26,8 @@
			[SerializeField] Text m_Essence;
			[SerializeField, Header("魔晶")] protected Transform m_ContainerMagicEssence;
			[SerializeField] Text m_MagicEssence;
			[SerializeField, Header("仙缘币")] protected Transform m_ContainerXianyuanCoins;
			[SerializeField] Text m_XianyuanCoins;
			[SerializeField, Header("退出按钮")] ButtonEx m_Exit;
			[SerializeField] protected Text m_ExitTimer;
			[SerializeField, Header("评级")] GameObject m_GradeBottom;
			@@ -366,6 +368,38 @@
			m_PassTime.text = StringUtility.Contact((int)(dungeonModel.dungeonResult.costTime * 0.001f), Language.Get("RealmWin_Bewrite_35"));
			}

			protected virtual void DrawGetXianYuanCoins()
			{
			var results = dungeonModel.dungeonResult.xianyuanCoin;
			bool isShow = m_ContainerXianyuanCoins == null \|\| results == null \|\| results.Length < 1 ? false : true;
			m_ContainerXianyuanCoins.gameObject.SetActive(isShow);
			if (!isShow) return;
			int getCoins = 0;
			int reason = 0;
			if(results.Length > 1)
			{
			getCoins = results[0];
			reason = results[1];
			}

			if(getCoins > 0 && reason == 0)
			{
			m_XianyuanCoins.text = UIHelper.ReplaceLargeNum((ulong)getCoins);
			}
			else
			{
			switch(reason)
			{
			case 1:
			m_XianyuanCoins.text = UIHelper.AppendStringColor(TextColType.Red, Language.Get("DungeonAssist145"));
			break;
			case 2:
			m_XianyuanCoins.text = UIHelper.AppendStringColor(TextColType.Red, Language.Get("DungeonAssist144"));
			break;
			}
			}
			}

			protected virtual void DrawGetMoney()
			{
			if (m_ContainerMoney != null)
			@@ -463,6 +497,7 @@
			DrawSP();
			DrawKillMonster();
			DrawNewRecord();
			DrawGetXianYuanCoins();
			}

			protected int CompareTrialItemIndex(ServerItem x, ServerItem y)