Merge remote-tracking branch 'origin/dong' into yi
This commit is contained in:
commit
11b0a8b3e4
BIN
Yosin_Engine.exe
BIN
Yosin_Engine.exe
Binary file not shown.
|
|
@ -475,7 +475,12 @@ function _Yosin_Windows_Mouse_Logic_(MouseState, Wheel, MousePos_X, MousePos_Y)
|
||||||
_Imm_Input_Func_ <- {};
|
_Imm_Input_Func_ <- {};
|
||||||
//输入逻辑入口
|
//输入逻辑入口
|
||||||
function _Yosin_Imm_Input_Logic_(Str) {
|
function _Yosin_Imm_Input_Logic_(Str) {
|
||||||
foreach(Func in _Imm_Input_Func_) {
|
|
||||||
Func(Str);
|
foreach(Key, Func in _Imm_Input_Func_) {
|
||||||
|
local Ret = Func(Str);
|
||||||
|
//主体对象释放 删除自己
|
||||||
|
if (Ret == -1) {
|
||||||
|
_Imm_Input_Func_.rawdelete(Key);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -69,6 +69,7 @@ class Yosin_InputBox extends Yosin_CommonUi {
|
||||||
|
|
||||||
//接收文本数据
|
//接收文本数据
|
||||||
function Imm_Input(str) {
|
function Imm_Input(str) {
|
||||||
|
if (!this) return -1;
|
||||||
if (!IsFocus) return;
|
if (!IsFocus) return;
|
||||||
//退格键
|
//退格键
|
||||||
if (str == "\b") {
|
if (str == "\b") {
|
||||||
|
|
|
||||||
|
|
@ -86,11 +86,11 @@ class _Login_Window extends Yosin_Window {
|
||||||
|
|
||||||
function RegisterWidget() {
|
function RegisterWidget() {
|
||||||
//账号输入框
|
//账号输入框
|
||||||
local AccountInputBox = Yosin_InputBox(752, 240, 200);
|
AccountInputBox = Yosin_InputBox(752, 240, 200);
|
||||||
AddUIChild(AccountInputBox);
|
AddUIChild(AccountInputBox);
|
||||||
|
|
||||||
//密码输入框
|
//密码输入框
|
||||||
local PasswordInputBox = Yosin_InputBox(752, 280, 200);
|
PasswordInputBox = Yosin_InputBox(752, 280, 200);
|
||||||
AddUIChild(PasswordInputBox);
|
AddUIChild(PasswordInputBox);
|
||||||
|
|
||||||
//登录按钮
|
//登录按钮
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue