Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
| | |
| | | return;
|
| | | }
|
| | |
|
| | | if (_hero.LockTarget != null)
|
| | | if (_hero.LockTarget != null && !(_hero.LockTarget is GA_NpcCollect))
|
| | | {
|
| | | // 判断是否要清空锁定目标
|
| | | DoIfClearLockTarget();
|
| | |
| | | {
|
| | | if (NpcConfig.NPCID == 33409001)
|
| | | {
|
| | | m_Model.transform.localPosition = new Vector3(0,0.132f,0);
|
| | | m_Model.transform.localPosition = new Vector3(0, 0.132f, 0);
|
| | | }
|
| | | else if (NpcConfig.NPCID == 33409002)
|
| | | {
|
| | | m_Model.transform.localPosition = new Vector3(0,0.142f,0);
|
| | | m_Model.transform.localPosition = new Vector3(0, 0.142f, 0);
|
| | | }
|
| | | }
|
| | | }
|
| | |
| | | public override void OnUnSelect()
|
| | | {
|
| | | base.OnUnSelect();
|
| | |
|
| | | if (m_ArrivedList.Contains(ServerInstID))
|
| | | {
|
| | | if (OnLeave != null)
|