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

client_Wu Xijin

2019-04-22 bbc7f3ac0c7a56d37a22ed8744dc0a62a5934e5c

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

 Fight/GameActor/GA_NpcClientCollect.cs

@@ -202,7 +202,7 @@
        WindowCenter.Instance.Close<NormalCollectWin>();
        m_StartCollect = false;
        var _hero = PlayerDatas.Instance.hero;
        if (_hero != null && _hero.ActorInfo.serverDie)
        if (_hero != null && !_hero.ActorInfo.serverDie)
        {
            if (_hero.IsCollect())
            {

 Fight/GameActor/GActor.cs

@@ -238,6 +238,7 @@


        OnUnit();



        belongEventID = -1;

        State = E_ActorState.Idle;

        DestPos = Vector3.zero;

        ActorInfo.serverDie = true;


 Fight/Stage/Dungeon/DungeonStage.cs

@@ -143,6 +143,12 @@
            CameraController.Instance.StopZoom();

            CameraController.Instance.StopShake();

        }



        if (AdventureStage.Instance.IsInAdventureStage)

        {

            AdventureStage.Instance.Exit();

        }



        ClientSceneManager.Instance.UnInit();

        GAMgr.Instance.UnInit();

        DropItemManager.ReleaseAll();


 System/HazyRegion/DungeonCollectItemSuccWin.cs

@@ -87,7 +87,7 @@
                var config = ItemConfig.Get(item.id);

                if (config != null)

                {

                    m_GainRemind.text = string.Format("获得{0}个{1}", item.count, config.ItemName);

                    m_GainRemind.text = Language.Get("DungeonCollectSucc", item.count, config.ItemName);

                }



                if (clock != null)