diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 5ea817e..95432fd 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -18,11 +18,8 @@ end --获取圈列表 function M:FG_GroupList(callback) local _client = ControllerManager.GroupClient - printlog("aaaaaaaaaaaaaaaaawwwwwwwwwwwwww") --pt(_client) _client:send(Protocol.WEB_FG_GROUP_LIST, nil, function(res) - printlog("aaaaaaaaaaaaaaaaawwwwwwwwwwwwww1111111111111") - pt(res) if res.ReturnCode == 0 then local r_groups = res.Data.groups local l_groups = DataManager.groups diff --git a/lua_probject/base_project/Game/View/Lobby/LobbyHeadView.lua b/lua_probject/base_project/Game/View/Lobby/LobbyHeadView.lua index 9f27904..24f3c14 100644 --- a/lua_probject/base_project/Game/View/Lobby/LobbyHeadView.lua +++ b/lua_probject/base_project/Game/View/Lobby/LobbyHeadView.lua @@ -141,7 +141,7 @@ function M:init(url) view:GetChild("tex_nickname").text = self._user.nick_name local str_playerid = self._user.account_id view:GetChild("tex_id").text = "ID:"..str_playerid - + view:GetChild("tex_FANGfei").text = self._user.diamo local btn_head = view:GetChild("btn_head") ImageLoad.Load(self._user.head_url, btn_head._iconObject) diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index 975ba15..8b1007e 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -14,6 +14,7 @@ local GroupMngSettingView = import('.GroupMngSettingView') local GroupPartnerRobotGames = import('./MngView/GroupPartnerRobotGames') -- local HeadView = require('Game/View/LobbyHeadView') GroupNumberInputView_Game = import(".MngView.GroupNumberInputView") +local GroupMngPersonStatAloneView = import(".MngView.GroupMngPersonStatAloneView") local GroupInfoView = {} local M = GroupInfoView @@ -1963,6 +1964,12 @@ function M:__refreshManager() gl_view:Show() -- self:SetRoomListVisible(false) end) + local bth_record = self._view:GetChild('bth_record') + bth_record.onClick:Set(function() + local gl_bth_record = GroupMngPersonStatAloneView.new(self.curGroup.id) + gl_bth_record:InitView() + gl_bth_record:Show() + end) local btn_fginfo = self._view:GetChild('btn_fginfo') btn_fginfo.onClick:Set( function() diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua index 083dfcd..a57dea3 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua @@ -57,8 +57,6 @@ function M:init(url, btn_type) end self.page_config = MngPageConfig.Config[btn_type][lev] - printlog("------------page_config-------------:" ) -pt(self.page_config) -- 初始化标题列表 for i = 1, #self.page_config do -- print("page_config:"..self.page_config[i]) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua index ef6f0b2..c292a90 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua @@ -35,9 +35,8 @@ function M:init(url) BaseWindow.init(self,url) self.hpData = {} - -- 【新增】初始化游戏类型筛选控制器 View_GroupGameSetting_fennlieM + -- View_GroupGameSetting_fennlieM self.View_GroupGameSetting_ctr_fennlieM = self._view:GetController('View_GroupGameSetting_fennlieM') - printlog("------ssss------") if self.View_GroupGameSetting_ctr_fennlieM then -- 默认选中"麻将" (index 0)，对应 gameType=1 @@ -48,7 +47,6 @@ function M:init(url) -- 重新填充游戏列表数据（根据新的分类筛选） self:FillGameData() - printlog("------ssss------",self.View_GroupGameSetting_ctr_fennlieM.selectedIndex) end) end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngAddMemberView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngAddMemberView.lua index 121001c..68236ae 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngAddMemberView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngAddMemberView.lua @@ -8,7 +8,7 @@ function GroupMngAddMemberView.new(gid) local self = M self.class = "GroupMngAddMemberView" self.group_id = gid - self:FillView() + self:FillView() return self end @@ -38,37 +38,55 @@ function M:FillView() local group = DataManager.groups:get(self.group_id) local perm_array = MngPermission.getPermData(group.permission) - self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupAddMember") + self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupAddMember") self.tex_num = self._view:GetChild("tex_num") self:ClearNumTex() - + -- 设置最大长度 + if self.tex_num then + self.tex_num.maxLength = 6 -- 限制最大输入长度为6位 + end + local cnt = self._view.numChildren - 1 - - for i = 0 ,9 do - local obj = self._view:GetChild("btn_"..i) - obj.onClick:Add(handler(self , self.OnNumButtonAction)) + + for i = 0, 9 do + local obj = self._view:GetChild("btn_" .. i) + obj.onClick:Add(handler(self, self.OnNumButtonAction)) i = i + 1 end local btn_ok = self._view:GetChild("btn_ok") btn_ok.onClick:Set(function() - if not CheckPermission(group.lev, perm_array[2]) then + if not CheckPermission(group.lev, perm_array[2]) then return end - if self._texnum_str == "" then return end - ViewUtil.ShowModalWait() + --获取输入内容 + local inputText = self.tex_num.text + if inputText == "" or inputText == nil then + -- 可选：给出提示 + return + end + + -- 校验是否为数字 + local numId = tonumber(inputText) + if not numId then + ViewUtil.ErrorTip(nil, "请输入有效的数字ID", 1) + return + end + --if self._texnum_str == "" then return end + ViewUtil.ShowModalWait() local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_AddMember(self.group_id, tonumber(self._texnum_str), function(response) + fgCtr:FG_AddMember(self.group_id, numId, function(response) ViewUtil.CloseModalWait() if (response.ReturnCode == 0) then ViewUtil.ShowBannerOnScreenCenter("添加成功！", 1) + self:ClearNumTex() -- 成功后清空 else - ViewUtil.ErrorTip(response.ReturnCode,"邀请玩家失败！") + ViewUtil.ErrorTip(response.ReturnCode, "邀请玩家失败！") end end) end) local btn_del = self._view:GetChild("btn_del") - btn_del.onClick:Add(handler(self , self.OnNumButtonAction)) + btn_del.onClick:Add(handler(self, self.OnNumButtonAction)) local ctr_mng = self._view:GetController("mng") if group.lev < 3 then @@ -78,7 +96,7 @@ function M:FillView() ctr_page.onChanged:Set(function() if ctr_page.selectedIndex == 1 then self:GetJoinsData() - end + end end) end @@ -98,7 +116,7 @@ function M:GetJoinsData() end self:FillJoinList(joins) else - ViewUtil.ErrorTip(res.ReturnCode,"获取申请列表失败！") + ViewUtil.ErrorTip(res.ReturnCode, "获取申请列表失败！") self:FillJoinList({}) end end) @@ -139,28 +157,50 @@ function M:VerifyPlayerJoin(id, allow) end) end +-- function M:OnNumButtonAction(context) +-- local typer = string.sub(context.sender.name ,5) +-- if typer == "del" then +-- if (self._currenIndex > 0) then +-- self._currenIndex = self._currenIndex - 1 +-- self._texnum_str = string.sub(self._texnum_str,0,self._currenIndex) +-- self.tex_num.text = self._texnum_str +-- end +-- else +-- if (self._currenIndex < 6) then +-- self._currenIndex = self._currenIndex + 1 +-- self._texnum_str = self._texnum_str .. typer +-- self.tex_num.text = self._texnum_str + +-- end +-- end +-- end +-- 【修改4】调整数字按钮动作，使其操作输入框而非内部变量 function M:OnNumButtonAction(context) - local typer = string.sub(context.sender.name ,5) + local typer = string.sub(context.sender.name, 5) + local currentText = self.tex_num.text or "" + if typer == "del" then - if (self._currenIndex > 0) then - self._currenIndex = self._currenIndex - 1 - self._texnum_str = string.sub(self._texnum_str,0,self._currenIndex) - self.tex_num.text = self._texnum_str + -- 删除最后一个字符 + if #currentText > 0 then + self.tex_num.text = string.sub(currentText, 1, #currentText - 1) end else - if (self._currenIndex < 6) then - self._currenIndex = self._currenIndex + 1 - self._texnum_str = self._texnum_str .. typer - self.tex_num.text = self._texnum_str - + -- 添加数字，检查长度限制 + if #currentText < 6 then + self.tex_num.text = currentText .. typer end end end +-- function M:ClearNumTex() +-- self._texnum_str = "" +-- self._currenIndex = 0 +-- self.tex_num.text = self._texnum_str +-- end + +-- 【修改5】清空输入框 function M:ClearNumTex() - self._texnum_str = "" - self._currenIndex = 0 - self.tex_num.text = self._texnum_str + self.tex_num.text = "" end -return M \ No newline at end of file +return M 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 2f4fe8a..b9212b0 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView1.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView1.lua @@ -43,8 +43,16 @@ function M:InitView() local btn_search = self._view:GetChild("btn_search") btn_search.onClick:Set(function() local text = self._view:GetChild("tex_id").text - local query_id = tonumber(text) or 0 - local query_nick = text + local query_id = tonumber(text) + local query_nick = "" + + -- 如果输入的是纯数字，只按ID搜索，清空昵称参数，避免后端混淆 + if query_id then + query_nick = "" + else + query_id = 0 + query_nick = text + end self._view:GetChild("tex_id").text = "" self:QueryPartnerData(query_id, query_nick) end) @@ -165,7 +173,6 @@ function M:QueryPartnerData(query_id,query_nick) query_nick = query_nick or "" query_id = query_id or 0 - local group = DataManager.groups:get(self.group_id) ViewUtil.ShowModalWait(nil) @@ -190,6 +197,8 @@ function M:QueryPartnerData(query_id,query_nick) end end end) + + end -- 管理员权限 @@ -329,8 +338,7 @@ function M:FillItem(obj, partner) end - obj:GetChild("tex_kickOutM").text = ViewUtil.stringEllipsis(partner.nick).."被踢出了亲友圈，操作人："..partner.opnick - + obj:GetChild("tex_kickOutM").text = partner.id.."被踢出了亲友圈，操作人："..partner.opid obj:GetChild("btn_percent").onClick:Set(function() self:ShowPartnerRewards(partner.uid, partner.partnerLev) end) diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPersonStatAloneView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPersonStatAloneView.lua new file mode 100644 index 0000000..2da1bc1 --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPersonStatAloneView.lua @@ -0,0 +1,344 @@ +local TimeSettingPanel = import(".TimeSettingPanel") +-- 开桌统计 +local GroupMngPersonStatAloneView = {} + +local M = GroupMngPersonStatAloneView + +function GroupMngPersonStatAloneView.new(gid) + setmetatable(M, {__index = BaseWindow}) + local self = setmetatable({}, {__index = M}) + self.class = "GroupMngPersonStatAloneView" + self.group_id = gid + self:init("ui://NewGroup/View_GroupPersonStat") + + self:InitView() + return self +end + +function M:initData() + self.lst_record.numItems = 0 + self.record_data = {} + self._view:GetController("record").selectedIndex = 0 + self:GetRecordData(0) +end + +function M:InitView() + self.lst_record = self._view:GetChild("lst_record") + self.lst_record:SetVirtual() + self.lst_record.itemRenderer = function(index, obj) + self:OnRenderRecordItem(index, obj) + end + self.lst_record.scrollPane.onPullUpRelease:Set(function() + self:GetRecordData(self.lst_record.numItems) + end) + + self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0) + self.begin_time, self.end_time = self.time_panel:GetDate() + local ctr_page = self._view:GetController("type") + ctr_page.onChanged:Set(function() + self.record_data = {} + self.lst_record.numItems = 0 + self.begin_time = nil + self.end_time = nil + self:GetRecordData(0) + end) + + self._view:GetChild("btn_search").onClick:Set(function() + self.record_data = {} + self.lst_record.numItems = 0 + + self.begin_time, self.end_time = self.time_panel:GetDate() + self:GetRecordData(0) + end) +end + +function M:GetRecordData(index) + + ViewUtil.ShowModalWait() + + local time_type = self._view:GetController("type").selectedIndex + + if self.begin_time ~= nil and self.end_time ~= nil then + time_type = 3 + end + + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetGroupPersonRecord(self.group_id, GetPlatform(), DataManager.SelfUser.account_id, time_type, self.begin_time, self.end_time, index, 6, function(res) + + if self._is_destroy then + return + end + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取回放数据失败") + else + local records = res.Data.records + for i = 1, #records do + self.record_data[#self.record_data + 1] = records[i] + end + self.lst_record.numItems = #self.record_data + + printlog("ccccccccccccccccccccccccccccccccccc2222223333333333333333333333333333333",res.Data.total_round," ",res.Data.valid_round) + pt(res.Data) + if index == 0 then + --self._view:GetChild("tex_num1").text = ""..res.Data.total + --self._view:GetChild("tex_num3").text = ""..d2ad(res.Data.consume) + self._view:GetChild("tex_winner_count").text = res.Data.total_round + self._view:GetChild("tex_valid_count").text = res.Data.valid_round / 100 + + self._view:GetChild("tex_total_proportion").text = d2ad(res.Data.total_win) + end + end + end) +end + +function M:FillRecordItem(data, obj) + local game_id = data.game_id + local room_id = data.room_id + local create_time = data.create_time + local room_type_str = data.game_info.name + local time =tonumber(create_time) + local room_time_str = os.date("%Y-%m-%d %H:%M:%S", time) + local totalScore = json.decode(data.totalScore) + local hpOnOff = data.hpOnOff + local hpType = data.game_info.hpType + local player_list = {} + for i = 1, #totalScore do + local p = totalScore[i] + player_list[i] = {} + player_list[i].id = p.accId + local score = p.score + if hpOnOff == 1 and hpType > 1 then + score = score / 10 + end + player_list[i].score = score + player_list[i].house = 0 + player_list[i].nick = p.nick + end + local play_name = DataManager.groups:get(self.group_id):getPlayName(data.groupPid) + + obj:GetChild("tex_time").text = room_time_str + obj:GetChild("tex_roomid").text = room_id + obj:GetChild("tex_times").text = d2ad(data.hp_times).."倍" + obj:GetChild("tex_game").text = play_name + local lst_total = obj:GetChild("lst_total") + lst_total:RemoveChildrenToPool() + local ids = {} + for j=1,#totalScore do + local titem = lst_total:AddItemFromPool() + local trdata = totalScore[j] + titem:GetChild("tex_name").text = ViewUtil.stringEllipsis(trdata.nick) + titem:GetChild("tex_id").text = "ID:"..trdata.accId + table.insert( ids, trdata.accId ) + + local score = trdata.score + if trdata.hp == nil then + if hpOnOff == 1 and hpType > 1 then + score = score / 10 + end + else + score = d2ad(trdata.hp) + end + + titem:GetChild("tex_score").text = score + + if score >= 0 then + titem:GetController("num_color").selectedIndex = 0 + else + titem:GetController("num_color").selectedIndex = 1 + end + end + + if #totalScore >= 6 then + obj:GetController("person_num").selectedIndex = 1 + else + obj:GetController("person_num").selectedIndex = 0 + end + + obj:GetChild("btn_screenshot").onClick:Set(function() + self:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore, hpOnOff, hpType) + end) + + obj:GetChild("btn_share").onClick:Set(function() + ShareChatRoom(room_id, tostring(os.time()), data.round, room_type_str, self.group_id, player_list) + end) + obj.onClick:Set(function() + self:OnShowRecordInfo(data,ids) + end) +end + +function M:OnRenderRecordItem(index, obj) + local data = self.record_data[index + 1] + self:FillRecordItem(data, obj) +end + + +function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore, hpOnOff, hpType) + ViewUtil.ShowModalWait(self._view, "正在分享...") + UIPackage.AddPackage("base/rank/ui/Rank") + local result_view = UIPackage.CreateObjectFromURL("ui://Rank/ResultView") + result_view.visible = false + self._view:AddChild(result_view) + result_view.x = -308 + result_view.y = -47 + result_view:GetChild("tex_roomnum").text = "房间号:" .. room_id .. " " .. room_type_str + result_view:GetChild("tex_data").text = room_time_str + result_view:GetChild("btn_confirm").onClick:Set(function() result_view:Dispose() end) + local lst_p = result_view:GetChild("list_result") + local load_head_num = #totalScore + for j = 1, #totalScore do + local p = totalScore[j] + local item = lst_p:AddItemFromPool() + item:GetChild("name").text = ViewUtil.stringEllipsis(p.nick) + local score = p.score + if hpOnOff == 1 and hpType > 1 then + score = score / 10 + end + item:GetChild("score").text = score + if score < 0 then item:GetController("di").selectedIndex = 1 end + if p.portrait and p.portrait ~= "" then + ImageLoad.Load(p.portrait, item:GetChild("n9")._iconObject, self.class, function( ... ) + load_head_num = load_head_num - 1 + end) + else + load_head_num = load_head_num - 1 + end + end + coroutine.start(function ( ... ) + local left_time = 4 + while (true) do + if load_head_num == 0 or left_time == 0 then + result_view.visible = true + coroutine.wait(0.2) + ShareScreenShotWithOption(function() + result_view:Dispose() + end) + ViewUtil.CloseModalWait() + break + end + coroutine.wait(1) + left_time = left_time - 1 + end + end) +end + +function M:OnShowRecordInfo(rdata,ids) + local ctr_record = self._view:GetController("record") + ctr_record.selectedIndex = 1 + + local lst_recordInfo = self._view:GetChild("lst_recordInfo") + lst_recordInfo:RemoveChildrenToPool() + -- lst_recordInfo.scrollPane.currentPageX = 0 + local round_count = tonumber(rdata.round) + local game_id = rdata.game_info.game_id + local playback_id = rdata.military_id + local hpOnOff = rdata.hpOnOff + local hpType = rdata.game_info.hpType + for i = 1,round_count do + local item = lst_recordInfo:AddItemFromPool() + item:GetChild("tex_num").text = tostring(i) + + local play_name = DataManager.groups:get(self.group_id):getPlayName(rdata.groupPid) + item:GetChild("tex_game").text = play_name + + item:GetChild("tex_roomid").text = rdata.room_id + + item:GetChild("tex_times").text = d2ad(rdata.hp_times).."倍" + + local round_score_str = rdata["round_"..i] + local round_score_item = json.decode(round_score_str) + local lst_total = item:GetChild("lst_total") + lst_total:RemoveChildrenToPool() + for k=1,#round_score_item do + local titem = lst_total:AddItemFromPool() + local trdata = round_score_item[k] + titem:GetChild("tex_name").text = ViewUtil.stringEllipsis(trdata.nick) + titem:GetChild("tex_id").text = "ID:".. ids[k] + + local score = trdata.score + if trdata.hp == nil then + if hpOnOff == 1 and hpType > 1 then + score = score / 10 + end + else + score = d2ad(trdata.hp) + end + + + titem:GetChild("tex_score").text = score + end + + if #round_score_item >= 6 then + item:GetController("person_num").selectedIndex = 1 + else + item:GetController("person_num").selectedIndex = 0 + end + local btn_play =item:GetChild("btn_play") + btn_play.onClick:Set(function() + local group = DataManager.groups:get(self.group_id) + if DataManager.SelfUser.playback[playback_id] ~= nil and DataManager.SelfUser.playback[playback_id][i] ~= nil then + local room = ExtendManager.GetExtendConfig(game_id):NewRoom() + DataManager.CurrenRoom = room + room.lev = group.lev + room.game_id = game_id + local extend = ExtendManager.GetExtendConfig(game_id) + extend:FillPlayBackData(DataManager.SelfUser.playback[playback_id][i]) + if not room.self_player then + room.self_player = room:GetPlayerBySeat(1) + end + local main = self:GenaratePlayBack(ViewManager.View_PlayBack, game_id) + main._currentId = playback_id + main._currentRound = i + main._totalRound = tonumber(rdata.round) + main:FillRoomData(DataManager.SelfUser.playback[playback_id][i]) + else + ViewUtil.ShowModalWait(self._view) + local _data = {} + _data["military_id"] = playback_id + _data["round"] = tostring(i) + local loddyCtr1 = ControllerManager.GetController(LoddyController) + loddyCtr1:RequestPlayBack(_data,function(code,data) + ViewUtil.CloseModalWait() + if code == 0 then + if DataManager.SelfUser.playback[playback_id] ~= nil then + DataManager.SelfUser.playback[playback_id][i] = data + else + local playback_data = {} + playback_data[i] = data + DataManager.SelfUser.playback[playback_id] = playback_data + end + + local main = self:GenaratePlayBack(ViewManager.View_PlayBack, game_id) + main._currentId = playback_id + main._currentRound = i + main._totalRound = tonumber(rdata.round) + main:FillRoomData(data) + main._room.lev = group.lev + elseif code == 25 then + ViewUtil.ErrorTip(-1, "回放未找到！") + -- btn_play_back.grayed = true + end + end, rdata.game_info) + end + end) + end +end + +function M:GenaratePlayBack(id, game_id, ...) + local tem =nil + local dview_class = nil + if not dview_class then + local exconfig = ExtendManager.GetExtendConfig(game_id) + dview_class = exconfig:GetView(id) + end + if not dview_class then + return + end + local arg = {...} + tem = dview_class.new(...) + tem.Id = id + tem:Show() + return tem +end + +return M \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua index c4e7eb3..66b7090 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua @@ -27,7 +27,7 @@ MngPageConfig.PageList = { {id = 2, title = "成员列表", view = GroupMngMemberListView, refresh = true, clear_image = true,anchorOffset = 300}, {id = 3, title = "赢家管理费", view = GroupMngProportionView, refresh = true, clear_image = false,anchorOffset = 300}, {id = 4, title = "房间玩法", view = GroupMngGameListView, refresh = true, clear_image = false,anchorOffset = 300}, - {id = 5, title = "添加玩家", view = GroupMngAddMemberView, refresh = true, clear_image = false,anchorOffset = 300}, + {id = 5, title = "添加成员", view = GroupMngAddMemberView, refresh = true, clear_image = false,anchorOffset = 300}, {id = 6, title = "--del--", view = GroupMngMemberListView, refresh = false, clear_image = false,anchorOffset = 300}, {id = 7, title = "积分记录", view = GroupMngFagListView, refresh = true, clear_image = false,anchorOffset = 300}, {id = 8, title = "开桌明细", view = GroupMngRoomStatView, refresh = true, clear_image = true,anchorOffset = 300}, @@ -40,8 +40,8 @@ MngPageConfig.PageList = { {id = 17, title = "个人战绩", view = GroupMngPersonStatView, refresh = true, clear_image = true,anchorOffset = 300}, {id = 18, title = "成员战绩", view = GroupMngMemberStatView, refresh = true, clear_image = true,anchorOffset = 300}, {id = 19, title = "合伙人统计", view = GroupMngPartnerStatView, refresh = true, clear_image = true,anchorOffset = 300}, - {id = 20, title = "亲友圈队员", view = GroupMngMemberListView1, refresh = true, clear_image = true,anchorOffset = 300}, - {id = 21, title = "踢出队员", view = GroupMngPartnerListView1, refresh = true, clear_image = true,anchorOffset = 300}, + {id = 20, title = "成员列表", view = GroupMngMemberListView1, refresh = true, clear_image = true,anchorOffset = 300}, + {id = 21, title = "成员记录", view = GroupMngPartnerListView1, refresh = true, clear_image = true,anchorOffset = 300}, {id = 22, title = "数据统计", view = GroupMngMemberInfoView, refresh = true, clear_image = true,anchorOffset = 300}, {id = 23, title = "玩家数据", view = GroupMngXingYunStatView, refresh = true, clear_image = true,anchorOffset = 300}, {id = 24, title = "局数统计", view = GroupMngZuanShiStatView, refresh = true, clear_image = true,anchorOffset = 300}, @@ -95,9 +95,9 @@ MngPageConfig.Config = { }, { - {20,10,21}, - {20,10,21}, - {20,10,21}, + {20,21,5}, + {20,21,5}, + {20,21,5}, }, } diff --git a/wb_new_ui/.objs/metas/27vd145b/kio210.info b/wb_new_ui/.objs/metas/27vd145b/kio210.info index b2af1c1..9e26dfe 100644 --- a/wb_new_ui/.objs/metas/27vd145b/kio210.info +++ b/wb_new_ui/.objs/metas/27vd145b/kio210.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n4_csp4": { - "hidden": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/27vd145b/ofsx1e.info b/wb_new_ui/.objs/metas/27vd145b/ofsx1e.info index 2217847..0abf66c 100644 --- a/wb_new_ui/.objs/metas/27vd145b/ofsx1e.info +++ b/wb_new_ui/.objs/metas/27vd145b/ofsx1e.info @@ -1,3 +1,8 @@ { + "objectStatus": { + "n17_vtgq": { + "hidden": true + } + }, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/75efd6.info b/wb_new_ui/.objs/metas/2d9xdj6z/75efd6.info new file mode 100644 index 0000000..d84cf08 --- /dev/null +++ b/wb_new_ui/.objs/metas/2d9xdj6z/75efd6.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n3_9i21": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/ab5pcji.info b/wb_new_ui/.objs/metas/2d9xdj6z/ab5pcji.info new file mode 100644 index 0000000..a972810 --- /dev/null +++ b/wb_new_ui/.objs/metas/2d9xdj6z/ab5pcji.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n52_igbb": { + "hidden": true + }, + "n4_r6cy": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info index 6ac0fea..f72d045 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info @@ -18,14 +18,11 @@ "n142_syg7": { "hidden": true }, - "n120_g8kk": { - "hidden": true - }, "n139_csp4": { "hidden": true }, - "n111_ker3": { - "locked": true + "n120_g8kk": { + "hidden": true }, "n100_lumr": { "hidden": true diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/l0lzb.info b/wb_new_ui/.objs/metas/2d9xdj6z/l0lzb.info index 3001a86..83324c8 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/l0lzb.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/l0lzb.info @@ -1,15 +1,15 @@ { "objectStatus": { - "n60_ovii": { - "hidden": true - }, - "n65_omkm": { - "hidden": true - }, "n62_omkm": { "hidden": true }, - "n66_omkm": { + "n67_omkm": { + "hidden": true + }, + "n24": { + "hidden": true + }, + "n23": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/naupkn.info b/wb_new_ui/.objs/metas/2d9xdj6z/naupkn.info new file mode 100644 index 0000000..7deef63 --- /dev/null +++ b/wb_new_ui/.objs/metas/2d9xdj6z/naupkn.info @@ -0,0 +1,13 @@ +{ + "objectStatus": { + "n2_naup": { + "hidden": true + }, + "n1_naup": { + "hidden": true + }, + "n5_igbb": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info b/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info index 3e0c712..62d44bb 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info @@ -1,16 +1,22 @@ { "objectStatus": { - "n0_naup": { - "hidden": true - }, "n2_naup": { "hidden": true }, - "n1_naup": { - "hidden": true - }, "n5_naup": { "hidden": true + }, + "n6_naup": { + "hidden": true + }, + "n4_naup": { + "hidden": true + }, + "n0_naup": { + "hidden": true + }, + "n1_naup": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/ngxlck7.info b/wb_new_ui/.objs/metas/2d9xdj6z/ngxlck7.info new file mode 100644 index 0000000..b492b11 --- /dev/null +++ b/wb_new_ui/.objs/metas/2d9xdj6z/ngxlck7.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n13_j046": { + "hidden": true + }, + "n5_ngxl": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/oviicm4.info b/wb_new_ui/.objs/metas/2d9xdj6z/oviicm4.info new file mode 100644 index 0000000..8a160c1 --- /dev/null +++ b/wb_new_ui/.objs/metas/2d9xdj6z/oviicm4.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n2_ovii": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info b/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info index 318a3d7..693b24a 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info @@ -1,14 +1,17 @@ { "objectStatus": { - "n27_nuxq": { - "hidden": true - }, "n14_naup": { "hidden": true }, "n13_naup": { "hidden": true }, + "n17_nld2": { + "hidden": true + }, + "n22_cvc8": { + "hidden": true + }, "n8_naup": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/8kzvhbo.info b/wb_new_ui/.objs/metas/m7iejg46/8kzvhbo.info new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/8kzvhbo.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/dzx8hbf.info b/wb_new_ui/.objs/metas/m7iejg46/dzx8hbf.info new file mode 100644 index 0000000..0535d10 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/dzx8hbf.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n4_dzx8": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info b/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info index 2434dfa..a2d7967 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info +++ b/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info @@ -2,11 +2,7 @@ "objectStatus": { "n79_ovii": { "hidden": true - }, - "n65_hsbh": { - "hidden": true } }, - "adaptiveTest": true, "fitScreen": "FitSize" } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hld.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hld.info new file mode 100644 index 0000000..901047e --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hld.info @@ -0,0 +1,43 @@ +{ + "objectStatus": { + "n40_5lrk": { + "hidden": true + }, + "n41_5lrk": { + "hidden": true + }, + "n36_5lrk": { + "hidden": true + }, + "n37_5lrk": { + "hidden": true + }, + "n44_5lrk": { + "hidden": true + }, + "n35_5lrk": { + "hidden": true + }, + "n38_5lrk": { + "hidden": true + }, + "n39_5lrk": { + "hidden": true + }, + "n45_5lrk": { + "hidden": true + }, + "n47_5lrk": { + "collapsed": true + }, + "n42_5lrk": { + "hidden": true + }, + "n43_5lrk": { + "hidden": true + }, + "n33_utix": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hmc.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hmc.info index 0a57789..21fc040 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hmc.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hmc.info @@ -1,12 +1,12 @@ { "objectStatus": { - "n47_j120": { + "n41_e8zl": { "hidden": true }, "n46_j120": { "hidden": true }, - "n48_hp03": { + "n47_j120": { "hidden": true } }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hmd.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hmd.info index 9e26dfe..ee8455d 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hmd.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hmd.info @@ -1 +1,7 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n43_g21o": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info index 178964c..efacf4f 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/l679hws.info +++ b/wb_new_ui/.objs/metas/m7iejg46/l679hws.info @@ -1,6 +1,6 @@ { "objectStatus": { - "n122_j120": { + "n115_l679": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/m7iejg46/n5sxha2.info b/wb_new_ui/.objs/metas/m7iejg46/n5sxha2.info index 9e26dfe..0189c48 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/n5sxha2.info +++ b/wb_new_ui/.objs/metas/m7iejg46/n5sxha2.info @@ -1 +1,7 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n3_dzx8": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/t1hqhxw.info b/wb_new_ui/.objs/metas/m7iejg46/t1hqhxw.info index 0bbe154..9e26dfe 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/t1hqhxw.info +++ b/wb_new_ui/.objs/metas/m7iejg46/t1hqhxw.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n3_ovii": { - "hidden": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info b/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info index e6f1e90..78bd4cb 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info +++ b/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info @@ -2,6 +2,15 @@ "objectStatus": { "n68_tqi8": { "hidden": true + }, + "n70_tqi8": { + "hidden": true + }, + "n64_tqi8": { + "hidden": true + }, + "n58_hsbh": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info index f8cdcfd..43e6be1 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info @@ -1,39 +1,42 @@ { "objectStatus": { - "n60_ovii": { - "hidden": true - }, - "n47_rpaz": { - "hidden": true - }, - "n70_k5m9": { - "hidden": true - }, - "n65_et16": { - "hidden": true - }, "n59_ovii": { "hidden": true }, - "n69_z384": { - "hidden": true - }, - "n68_z384": { - "hidden": true - }, - "n1_kwi0": { - "hidden": true - }, "n72_mtk5": { "hidden": true }, - "n2_kwi0": { + "n60_ovii": { + "hidden": true + }, + "n24_kwi0": { "hidden": true }, "n26_kwi0": { "hidden": true }, - "n24_kwi0": { + "n51_t1hq": { + "collapsed": true + }, + "n1_kwi0": { + "hidden": true + }, + "n68_z384": { + "hidden": true + }, + "n47_rpaz": { + "hidden": true + }, + "n2_kwi0": { + "hidden": true + }, + "n65_et16": { + "hidden": true + }, + "n70_k5m9": { + "hidden": true + }, + "n69_z384": { "hidden": true } } diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info index 6e89392..b7fd056 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info @@ -1,16 +1,28 @@ { "objectStatus": { - "n79_nk4v": { + "n74_cioe": { "hidden": true }, - "n78_nk4v": { + "n137_otck": { + "hidden": true + }, + "n79_nk4v": { "hidden": true }, "n134_b8zx": { "hidden": true }, + "n138_otck": { + "hidden": true + }, + "n136_otck": { + "hidden": true + }, "n20_gls1": { "hidden": true + }, + "n78_nk4v": { + "hidden": true } }, "adaptiveTest": true diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6s.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6s.info index 42fe47a..58fc380 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6s.info +++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6s.info @@ -1,8 +1,10 @@ { "objectStatus": { + "n42_ozaz": { + "hidden": true + }, "n31_oj7k": { - "hidden": true, - "collapsed": true + "hidden": true }, "n49_et16": { "hidden": true @@ -10,14 +12,8 @@ "n35_oj7k": { "hidden": true }, - "n56_otck": { - "hidden": true - }, "n21_oj7k": { "hidden": true - }, - "n42_ozaz": { - "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 164c923..6d9605e 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,39 +2,26 @@ "libview.firstColumnWidth": 384, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://2d9xdj6zfn7fao", - "ui://2zlli80mw9te0", - "ui://m7iejg46kwi0hkb", - "ui://m7iejg4610snh5j", - "ui://m7iejg46hsbhhjn", - "ui://m7iejg46z3847i6m", - "ui://m7iejg46z3847i6r" + "ui://m7iejg46l679hws", + "ui://m7iejg46kwi0hmc", + "ui://m7iejg46kwi0hme", + "ui://m7iejg46kwi0hmd" ], "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46hsbhhjn", + "doc.activeDoc": "ui://m7iejg46kwi0hmc", "libview.twoColumn": false, "libview.expandedNodes": [ - "2d9xdj6z", - "/", - "2d9xdj6z", - "/component/", - "2d9xdj6z", - "/component/games/", - "2d9xdj6z", - "/component/games/component/", - "2d9xdj6z", - "/component/group/", - "2d9xdj6z", - "/images/", - "2d9xdj6z", - "/images/LobbyMui/", "m7iejg46", "/", "m7iejg46", "/component/", "m7iejg46", + "/component/Btn/", + "m7iejg46", + "/component/Btn/date_set/", + "m7iejg46", "/component/Lst_info/", "m7iejg46", "/component/nav/", @@ -43,7 +30,11 @@ "m7iejg46", "/images/NGXiangTangMui/", "m7iejg46", - "/mgr/" + "/mgr/", + "m7iejg46", + "/mgr/imgs/", + "m7iejg46", + "/mgr/imgs/member/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/MessageBox.xml b/wb_new_ui/assets/Common/MessageBox.xml index 1c4694d..f73dce2 100644 --- a/wb_new_ui/assets/Common/MessageBox.xml +++ b/wb_new_ui/assets/Common/MessageBox.xml @@ -1,21 +1,21 @@ - + - + - - -