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

client_linchunjie

2018-11-12 9967d931d3454041fb621673c1b0220d397345ba

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

 System/Loading/LoadingWin.cs

@@ -51,7 +51,7 @@


            if (useDefautBackGround)

            {

                var sprite = BuiltInLoader.LoadSprite("Launch");

                var sprite = BuiltInLoader.LoadSprite("Launch_1");

                m_BackGround.overrideSprite = sprite;

                m_ContainerMapName.gameObject.SetActive(false);

                m_ContainerMapDescription.gameObject.SetActive(false);


 System/PlayerDead/PlayerDeadModel.cs

@@ -79,6 +79,8 @@
        get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); }

    }



    ActivityModel activityModel { get { return ModelCenter.Instance.GetModel<ActivityModel>(); } }



    private DungeonOpenTimeConfig _dungeonOpenTimeModel;



    public bool IsCanReborn { get; private set; }

@@ -116,6 +118,16 @@
                    isKillByPlayer = false;

                }

                break;

            case "RobotKill_1":

                if (infolist.Count > 1)

                {                
                    int objId = int.Parse(infolist[0].ToString());

                    int npcId = int.Parse(infolist[1].ToString());

                    killerName = activityModel.GetAncientRobotName(objId,npcId);

                    isKillByPlayer = false;

                }

              
                break;

        }

    }