From a3e360c0d81df728f9aa7d8acf0681e8dcb55da7 Mon Sep 17 00:00:00 2001 From: ChenX Date: Thu, 27 Sep 2018 10:55:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=BE=93=E5=85=A5=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=BF=98=E5=8E=9F=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Editor/GetEntityServices.ts | 4 ++-- src/Editor/GetSelectionServices.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Editor/GetEntityServices.ts b/src/Editor/GetEntityServices.ts index 0b1fd630b..590d7858e 100644 --- a/src/Editor/GetEntityServices.ts +++ b/src/Editor/GetEntityServices.ts @@ -43,7 +43,7 @@ export class GetEntityServices implements EditorService prompt = prompt || {}; this.m_prompt = prompt; - this.m_Editor.m_InputState &= InputState.Entsel; + this.m_Editor.m_InputState |= InputState.Entsel; if (!prompt.IsSelect) this.m_Editor.m_SelectCtrl.Cancel(); @@ -168,7 +168,7 @@ export class GetEntityServices implements EditorService this.IsReady = false; this.m_prompt = undefined; - this.m_Editor.m_InputState &= ~InputState.None; + this.m_Editor.m_InputState &= ~InputState.Entsel; this.m_Viewer.m_PreViewer.ToSelect(); this.removeCalls.forEach(f => f()); this.removeCalls.length = 0; diff --git a/src/Editor/GetSelectionServices.ts b/src/Editor/GetSelectionServices.ts index 01ef59a05..657c674b6 100644 --- a/src/Editor/GetSelectionServices.ts +++ b/src/Editor/GetSelectionServices.ts @@ -169,6 +169,7 @@ export class SsgetServiecs { if (!this.promisResolve) return; this.promisResolve(res); + this.m_Editor.m_InputState &= ~InputState.Select; this.m_Editor.m_SelectCtrl.Cancel(); this.m_Editor.m_SelectCtrl.m_Filter = undefined; this.m_Editor.m_SelectCtrl.SelectType = SelectType.None;