From 83db3aea3852cec0d6cd70355c17c3b5b57fb72a Mon Sep 17 00:00:00 2001 From: FPGA Date: Mon, 29 Sep 2025 16:48:15 +0800 Subject: [PATCH] 929 --- lua_probject/base_project/Game/Controller/LoginController.lua | 2 +- .../base_project/Game/Controller/NewGroupController.lua | 1 + lua_probject/base_project/Game/View/Common/BaseWindow.lua | 2 +- .../Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua | 2 ++ .../Game/View/NewGroup/MngView/GroupMngMemberInviteView.lua | 1 + .../Game/View/NewGroup/MngView/GroupMngMemberListView.lua | 1 + .../Game/View/NewGroup/MngView/GroupMngMemberListView1.lua | 1 + .../Game/View/NewGroup/MngView/GroupMngMenKangView.lua | 1 + .../Game/View/NewGroup/MngView/GroupMngPartnerListView.lua | 1 + .../Game/View/NewGroup/MngView/GroupMngPartnerListView1.lua | 1 + .../Game/View/NewGroup/MngView/GroupMngPartnerListView2.lua | 1 + .../Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua | 2 ++ wb_unity_pro/Assets/Scripts/VerCheck.cs | 2 +- 13 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lua_probject/base_project/Game/Controller/LoginController.lua b/lua_probject/base_project/Game/Controller/LoginController.lua index d4a0f851..52404240 100644 --- a/lua_probject/base_project/Game/Controller/LoginController.lua +++ b/lua_probject/base_project/Game/Controller/LoginController.lua @@ -87,7 +87,7 @@ local function __getCode(cmd, _data, callBack) end function __getCode_test(cmd, _data, callBack) - printlog("__getCode_test") + local _client = ControllerManager.WebClient _client:send(Protocol.WEB_GET_CODE, { id = _data.id }, function(res) if (res.ReturnCode == 0) then diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 375e89e8..1630ebab 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -1357,6 +1357,7 @@ end -- 改变体力值 function M:FG_ChangeFag(group_id, member_id, fag, callback) + local _client = ControllerManager.GroupClient local _data = {} _data.id = group_id diff --git a/lua_probject/base_project/Game/View/Common/BaseWindow.lua b/lua_probject/base_project/Game/View/Common/BaseWindow.lua index f85d7ee2..94ef51c0 100644 --- a/lua_probject/base_project/Game/View/Common/BaseWindow.lua +++ b/lua_probject/base_project/Game/View/Common/BaseWindow.lua @@ -15,7 +15,7 @@ BaseWindow = { _close_destroy = false, --点击窗口以外关闭 - _close_zone = true, + _close_zone = false, --队列 _queue = true, diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua index fdec4d37..e4ac292b 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua @@ -270,6 +270,7 @@ end -- 修改体力值 local function __change_fag(gid, pid, is_add, cur_hp, callback) + local gniv = GroupNumberInputView.new( nil, @@ -288,6 +289,7 @@ local function __change_fag(gid, pid, is_add, cur_hp, callback) -- end if (res1.ReturnCode == 0) then callback(res1.Data) + ViewUtil.ErrorTip(res1.ReturnCode, '更新成功!') else ViewUtil.ErrorTip(res1.ReturnCode, '更改积分失败!') end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberInviteView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberInviteView.lua index 5a8424e9..9d69334c 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberInviteView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberInviteView.lua @@ -134,6 +134,7 @@ end -- 修改体力值 local function __change_fag(gid, pid, is_add, cur_hp, callback) + local gniv = GroupNumberInputView.new( nil, diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua index 7567252e..955abcd2 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua @@ -217,6 +217,7 @@ end -- 修改体力值 local function __change_fag(gid, pid, is_add, cur_hp, callback) + local gniv = GroupNumberInputView.new( nil, diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua index 9c8b336f..d555210d 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua @@ -253,6 +253,7 @@ end -- 修改体力值 local function __change_fag(gid, pid, is_add, cur_hp, callback) + local gniv = GroupNumberInputView.new( nil, diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua index c4cf8afb..033b94ea 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua @@ -292,6 +292,7 @@ end -- 修改体力值 local function __change_fag(gid, pid, is_add, cur_hp, callback) + local gniv = GroupNumberInputView.new( nil, diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua index bc5da61f..a4e63af2 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua @@ -199,6 +199,7 @@ end -- 修改体力值 local function __change_fag(gid, pid, is_add, cur_hp, callback) + local gniv = GroupNumberInputView.new(nil, function(num) num = ad2d((is_add and num or -num)) ViewUtil.ShowModalWait() diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView1.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView1.lua index ec6321df..4d58c0d2 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView1.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView1.lua @@ -210,6 +210,7 @@ end -- 修改体力值 local function __change_fag(gid, pid, is_add, cur_hp, callback) + local gniv = GroupNumberInputView.new(nil, function(num) num = ad2d((is_add and num or -num)) ViewUtil.ShowModalWait() diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView2.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView2.lua index b8fd2761..ddb55058 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView2.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView2.lua @@ -123,6 +123,7 @@ end -- 修改体力值 local function __change_fag(gid, pid, is_add, cur_hp, callback) + local gniv = GroupNumberInputView.new(nil, function(num) num = ad2d((is_add and num or -num)) ViewUtil.ShowModalWait() diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua index 8f99fa68..f0cfa149 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua @@ -304,6 +304,7 @@ end -- 修改体力值 local function __change_fag(gid, pid, is_add, cur_hp, callback) + local gniv = GroupNumberInputView.new( nil, @@ -322,6 +323,7 @@ local function __change_fag(gid, pid, is_add, cur_hp, callback) -- end if (res1.ReturnCode == 0) then callback(res1.Data) + else ViewUtil.ErrorTip(res1.ReturnCode, '更改积分失败!') end diff --git a/wb_unity_pro/Assets/Scripts/VerCheck.cs b/wb_unity_pro/Assets/Scripts/VerCheck.cs index a69b2745..3b4d3be7 100644 --- a/wb_unity_pro/Assets/Scripts/VerCheck.cs +++ b/wb_unity_pro/Assets/Scripts/VerCheck.cs @@ -91,7 +91,7 @@ public class VerCheck : MonoBehaviour //公用 - string init_url = "http://8.138.120.167:19898/NewFK/config/init2_1.json"; + string init_url = "http://8.148.219.235:19898/NewFK/config/init2_1.json";