snxxz_scripts.git

parent: 64006625 | 补丁 | 提交 | ignore whitespace

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

client_Wu Xijin

2019-05-07 5d4856099c79ed1ee101da82db62dc90fcdc1eb2

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

6个文件已修改

	Core/NetworkPackage/DTCFile/ServerPack/HA8_Item/DTCA813_tagMCVirtualItemDrop.cs	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/Stage/MapEditor/Game/ClientSceneManager.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/DungeonFightWin.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/HazyRegion/HazyRegionIncidentBehaviour.cs	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/HazyRegion/HazyRegionIncidentPanel.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/HazyRegion/HazyRegionModel.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/NetworkPackage/DTCFile/ServerPack/HA8_Item/DTCA813_tagMCVirtualItemDrop.cs

@@ -21,7 +21,16 @@
            return;

        }



        Vector3 _pos = new Vector3((package.PosX - GA_Hero.MapOffset.x) * .5f, 0, (package.PosY - GA_Hero.MapOffset.z) * .5f);

        Vector3 _pos;



        if (package.PosX == 0 && package.PosY == 0)

        {

            _pos = ClientSceneManager.Instance.lastDeadPos;

        }

        else

        {

            _pos = new Vector3((package.PosX - GA_Hero.MapOffset.x) * .5f, 0, (package.PosY - GA_Hero.MapOffset.z) * .5f);

        }



        RaycastHit _hitInfo;

        if (Physics.Raycast(_pos + new Vector3(0, 30, 0), Vector3.down, out _hitInfo, 100, LayerUtility.WalkbleMask))


 Fight/Stage/MapEditor/Game/ClientSceneManager.cs

@@ -90,6 +90,8 @@
        }
    }

    public Vector3 lastDeadPos { get; private set; }

    public void NpcDead(int eventID, GActor npc, int npcID)
    {
        if (eventID < 0 || npc == null)
@@ -110,6 +112,8 @@
                m_EventActorDict[eventID].Remove(npc);
            }
        }

        lastDeadPos = npc.Pos;
    }

    public void Handle_0820(H0820_tagMissionDict package)

 System/Dungeon/DungeonFightWin.cs

@@ -79,7 +79,8 @@
            m_Liquid.gameObject.SetActive(false);

            var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            m_ExitDungeon.gameObject.SetActive(dataMapId != DemonJarModel.DEMONJAR_MAPID

                && !CrossServerUtility.IsCrossServerOneVsOne());

                && !CrossServerUtility.IsCrossServerOneVsOne()

                && !hazyDemonKingModel.IsInDungeon);

            m_ContainerAncient.gameObject.SetActive(dataMapId == 31160);

            m_BossInfosContainer.gameObject.SetActive(

                dataMapId == ElderGodAreaModel.ELDERGODAREA_MAPID

@@ -122,6 +123,7 @@
                    break;

                case JadeDynastyBossModel.JADEDYNASTY_MAP:

                case AllianceBossModel.DATAMAPID:

                case RidingPetBossModel.RIDINGPETBOSS_MAP:

                    m_Inspire.gameObject.SetActive(true);

                    break;

                default:


 System/HazyRegion/HazyRegionIncidentBehaviour.cs

@@ -103,8 +103,12 @@
                m_BossAlive = findPreciousModel.IsBossAlive(config.npcId);

            }



            HazyRegionModel.Incident incident;

            model.TryGetIncident(incidentId, out incident);

            var error = 0;

            redpointAble = model.TryGotoIncident(incidentId, false, out error);

            redpointAble = model.TryGotoIncident(incidentId, false, out error)

                && incident.state == HazyRegionModel.IncidentState.Processing;





            DisplayBase();

            DisplayItems();

@@ -257,8 +261,13 @@
                    bossAlive = findPreciousModel.IsBossAlive(config.npcId);

                }



                var error = 0;

                redpointAble = model.TryGotoIncident(incidentId, false, out error);

                HazyRegionModel.Incident incident;

                if (model.TryGetIncident(incidentId, out incident))

                {

                    var error = 0;

                    redpointAble = model.TryGotoIncident(incidentId, false, out error)

                        && incident.state == HazyRegionModel.IncidentState.Processing;

                }

            }

        }




 System/HazyRegion/HazyRegionIncidentPanel.cs

@@ -63,7 +63,10 @@
                var error = 0;

                foreach (var id in incidents)

                {

                    if (model.TryGotoIncident(id, false, out error))

                    HazyRegionModel.Incident incident;

                    if (model.TryGotoIncident(id, false, out error)

                        && model.TryGetIncident(id, out incident)

                        && incident.state == HazyRegionModel.IncidentState.Processing)

                    {

                        model.selectIncident = id;

                        break;


 System/HazyRegion/HazyRegionModel.cs

@@ -120,8 +120,7 @@
        {

            SnxxzGame.Instance.StartCoroutine(Co_TryOpenHazyRegionWin());

            WindowCenter.Instance.Close<HazyAdventureHintWin>();



            taskModel.AutomaticTripToTask(taskModel.currentMission);

            //taskModel.AutomaticTripToTask(taskModel.currentMission);

        }



        private void OnStageLoadFinish()

			@@ -21,7 +21,16 @@
			return;
			}

			Vector3 _pos = new Vector3((package.PosX - GA_Hero.MapOffset.x) * .5f, 0, (package.PosY - GA_Hero.MapOffset.z) * .5f);
			Vector3 _pos;

			if (package.PosX == 0 && package.PosY == 0)
			{
			_pos = ClientSceneManager.Instance.lastDeadPos;
			}
			else
			{
			_pos = new Vector3((package.PosX - GA_Hero.MapOffset.x) * .5f, 0, (package.PosY - GA_Hero.MapOffset.z) * .5f);
			}

			RaycastHit _hitInfo;
			if (Physics.Raycast(_pos + new Vector3(0, 30, 0), Vector3.down, out _hitInfo, 100, LayerUtility.WalkbleMask))

			@@ -90,6 +90,8 @@
			}
			}

			public Vector3 lastDeadPos { get; private set; }

			public void NpcDead(int eventID, GActor npc, int npcID)
			{
			if (eventID < 0 \|\| npc == null)
			@@ -110,6 +112,8 @@
			m_EventActorDict[eventID].Remove(npc);
			}
			}

			lastDeadPos = npc.Pos;
			}

			public void Handle_0820(H0820_tagMissionDict package)

			@@ -79,7 +79,8 @@
			m_Liquid.gameObject.SetActive(false);
			var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
			m_ExitDungeon.gameObject.SetActive(dataMapId != DemonJarModel.DEMONJAR_MAPID
			&& !CrossServerUtility.IsCrossServerOneVsOne());
			&& !CrossServerUtility.IsCrossServerOneVsOne()
			&& !hazyDemonKingModel.IsInDungeon);
			m_ContainerAncient.gameObject.SetActive(dataMapId == 31160);
			m_BossInfosContainer.gameObject.SetActive(
			dataMapId == ElderGodAreaModel.ELDERGODAREA_MAPID
			@@ -122,6 +123,7 @@
			break;
			case JadeDynastyBossModel.JADEDYNASTY_MAP:
			case AllianceBossModel.DATAMAPID:
			case RidingPetBossModel.RIDINGPETBOSS_MAP:
			m_Inspire.gameObject.SetActive(true);
			break;
			default:

			@@ -103,8 +103,12 @@
			m_BossAlive = findPreciousModel.IsBossAlive(config.npcId);
			}

			HazyRegionModel.Incident incident;
			model.TryGetIncident(incidentId, out incident);
			var error = 0;
			redpointAble = model.TryGotoIncident(incidentId, false, out error);
			redpointAble = model.TryGotoIncident(incidentId, false, out error)
			&& incident.state == HazyRegionModel.IncidentState.Processing;


			DisplayBase();
			DisplayItems();
			@@ -257,8 +261,13 @@
			bossAlive = findPreciousModel.IsBossAlive(config.npcId);
			}

			var error = 0;
			redpointAble = model.TryGotoIncident(incidentId, false, out error);
			HazyRegionModel.Incident incident;
			if (model.TryGetIncident(incidentId, out incident))
			{
			var error = 0;
			redpointAble = model.TryGotoIncident(incidentId, false, out error)
			&& incident.state == HazyRegionModel.IncidentState.Processing;
			}
			}
			}

			@@ -63,7 +63,10 @@
			var error = 0;
			foreach (var id in incidents)
			{
			if (model.TryGotoIncident(id, false, out error))
			HazyRegionModel.Incident incident;
			if (model.TryGotoIncident(id, false, out error)
			&& model.TryGetIncident(id, out incident)
			&& incident.state == HazyRegionModel.IncidentState.Processing)
			{
			model.selectIncident = id;
			break;

			@@ -120,8 +120,7 @@
			{
			SnxxzGame.Instance.StartCoroutine(Co_TryOpenHazyRegionWin());
			WindowCenter.Instance.Close<HazyAdventureHintWin>();

			taskModel.AutomaticTripToTask(taskModel.currentMission);
			//taskModel.AutomaticTripToTask(taskModel.currentMission);
			}

			private void OnStageLoadFinish()