diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngFagListView.lua index fe728c6f..22b75304 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngFagListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngFagListView.lua @@ -9,6 +9,12 @@ function GroupMngFagListView.new(group_id) local self = M self.class = "GroupMngFagListView" self.group_id = group_id + + -- 分页相关变量 + self.page_size = 10 -- 每页显示数量 + self.current_page = 1 -- 当前页码 + self.total_pages = 1 -- 总页数 + -- 体力值数据 self.fag_data = {} -- 体力值查询结果 @@ -24,6 +30,9 @@ function M:initData() self.fag_result_data = {} self.fag_data = {} + self.current_page = 1 + self.total_pages = 1 + self:UpdatePagination() if self._view:GetController("page").selectedIndex < 2 then self:GetFagData(0) @@ -68,6 +77,16 @@ function M:FillView() self.lst_fag_result.scrollPane.onPullUpRelease:Set(function() self:GetFagData(self.lst_fag_result.numItems) end) + + -- 分页按钮事件绑定 + self._view:GetChild("previouspage").onClick:Set(function() + self:OnPreviousPage() + end) + + self._view:GetChild("nextpage").onClick:Set(function() + self:OnNextPage() + end) + local btn_linqu = self._view:GetChild('btn_linqu') btn_linqu.onClick:Set(function() local win2 = GroupOneclickCcollectionView.new() @@ -103,11 +122,14 @@ function M:FillView() self.query_nick = self._view:GetChild("tex_id").text or "" self.fag_result_data = {} self._view:GetChild("tex_id").text = "" + self.current_page = 1 self:GetFagData(0) end) self._view:GetChild("btn_back").onClick:Set(function() self.quary_id = 0 self.query_nick = "" + self.current_page = 1 + self:GetFagData(0) end) self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, function() @@ -160,6 +182,19 @@ function M:GetFagData(index) for i = 1, #data do local_data[#local_data + 1] = data[i] end + + -- 计算总页数 + self.total_pages = math.ceil(#local_data / self.page_size) + if self.total_pages < 1 then self.total_pages = 1 end + + -- 确保当前页不超过总页数 + if self.current_page > self.total_pages then + self.current_page = self.total_pages + end + + -- 更新分页UI + self:UpdatePagination() + lst.numItems = #local_data end end @@ -236,4 +271,69 @@ function M:OnRenderItem(index, obj) obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M",rdata.time) end +-- 更新分页UI显示 +function M:UpdatePagination() + if not self._view or self._view.isDisposed then + return + end + + local pagination_text = self._view:GetChild("pagination") + local previous_btn = self._view:GetChild("previouspage") + local next_btn = self._view:GetChild("nextpage") + + if pagination_text then + pagination_text.text = tostring(self.current_page) + end + + -- if previous_btn then + -- if self.current_page <= 1 then + -- previous_btn.grayed = true + -- previous_btn.touchable = false + -- else + -- previous_btn.grayed = false + -- previous_btn.touchable = true + -- end + -- end + + -- if next_btn then + -- if self.current_page >= self.total_pages then + -- next_btn.grayed = true + -- next_btn.touchable = false + -- else + -- next_btn.grayed = false + -- next_btn.touchable = true + -- end + -- end +end + +-- 上一页 +function M:OnPreviousPage() + if self.current_page <= 1 then + ViewUtil.ErrorTip(nil, "已经是第一页了") + return + end + + self.current_page = self.current_page - 1 + self:UpdatePagination() + + -- TODO: 这里需要根据实际的分页逻辑重新加载数据 + -- 如果服务器支持分页，需要重新请求对应页的数据 + -- 如果是客户端分页，需要调整列表显示范围 +end + +-- 下一页 +function M:OnNextPage() + if self.current_page >= self.total_pages then + ViewUtil.ErrorTip(nil, "已经是最后一页了") + return + end + + self.current_page = self.current_page + 1 + self:UpdatePagination() + + -- TODO: 这里需要根据实际的分页逻辑重新加载数据 + -- 如果服务器支持分页，需要重新请求对应页的数据 + -- 如果是客户端分页，需要调整列表显示范围 +end + return M \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua index 9b6df886..45ae98ec 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGiveFagListView.lua @@ -1,5 +1,5 @@ local TimeSettingPanel = import(".TimeSettingPanel") -local GroupPartnerStatMember = import(".GroupPartnerStatMember") +local GroupPartnerStatMember = import(".GroupPartnerStatPlay") local GroupPartnerStatPlay = import(".GroupPartnerStatPlay") local GroupNumberInputView = import(".GroupNumberInputView") local GroupSetMemberInfoDiaoduView=import('.GroupSetMemberInfoDiaoduView') @@ -13,6 +13,12 @@ function GroupMngGiveFagListView.new(gid) local self = M self.class = "GroupMngGiveFagListView" self.group_id = gid + + -- 分页相关变量 + self.page_size = 10 -- 每页显示数量 + self.current_page = 1 -- 当前页码 + self.total_pages = 1 -- 总页数 + self:InitView() return self end @@ -20,6 +26,9 @@ end function M:initData() self.lst_record.numItems = 0 self.record_data = {} + self.current_page = 1 + self.total_pages = 1 + self:UpdatePagination() local now_time = os.date("*t",now) local today = os.time({year=now_time.year, month=now_time.month, day=now_time.day, hour=0,min=0,sec=0}) @@ -64,12 +73,22 @@ function M:InitView() self.lst_record.scrollPane.onPullUpRelease:Set(function() self:GetRecordData(self.lst_record.numItems) end) + + -- 分页按钮事件绑定 + self._view:GetChild("previouspage").onClick:Set(function() + self:OnPreviousPage() + end) + + self._view:GetChild("nextpage").onClick:Set(function() + self:OnNextPage() + end) self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, nil, true) local ctr_page = self._view:GetController("type") ctr_page.onChanged:Set(function() self.record_data = {} + self.current_page = 1 self.lst_record.numItems = 0 if ctr_page.selectedIndex == 0 then local now_time = os.date("*t",now) @@ -144,6 +163,7 @@ function M:InitView() local btn_back = self._view:GetChild('btn_back') btn_back.onClick:Set( function() + self.current_page = 1 self.lst_record.numItems = #self.record_data end ) @@ -172,6 +192,19 @@ function M:GetRecordData(index) for i = 1, #members do self.record_data[#self.record_data + 1] = members[i] end + + -- 计算总页数 + self.total_pages = math.ceil(#self.record_data / self.page_size) + if self.total_pages < 1 then self.total_pages = 1 end + + -- 确保当前页不超过总页数 + if self.current_page > self.total_pages then + self.current_page = self.total_pages + end + + -- 更新分页UI + self:UpdatePagination() + self.lst_record.numItems = #self.record_data end end) @@ -232,7 +265,8 @@ function M:FillRecordItem(data, obj) local btn_award = obj:GetChild("btn_award") - btn_award.text = d2ad(data.reward_hp)--d2ad(data.reward_hp+data.total_win) + -- btn_award.text = d2ad(data.reward_hp)--d2ad(data.reward_hp+data.total_win) + obj:GetChild("tex_GiftPoints").text = d2ad(data.reward_hp) btn_award.onClick:Set(function() local time_type = self._view:GetController("type").selectedIndex @@ -314,5 +348,70 @@ function M:OnRenderRecordItem(index, obj) self:FillRecordItem(data, obj) end +-- 更新分页UI显示 +function M:UpdatePagination() + if not self._view or self._view.isDisposed then + return + end + + local pagination_text = self._view:GetChild("pagination") + local previous_btn = self._view:GetChild("previouspage") + local next_btn = self._view:GetChild("nextpage") + + if pagination_text then + pagination_text.text = tostring(self.current_page) + end + + -- if previous_btn then + -- if self.current_page <= 1 then + -- previous_btn.grayed = true + -- previous_btn.touchable = false + -- else + -- previous_btn.grayed = false + -- previous_btn.touchable = true + -- end + -- end + + -- if next_btn then + -- if self.current_page >= self.total_pages then + -- next_btn.grayed = true + -- next_btn.touchable = false + -- else + -- next_btn.grayed = false + -- next_btn.touchable = true + -- end + -- end +end + +-- 上一页 +function M:OnPreviousPage() + if self.current_page <= 1 then + ViewUtil.ErrorTip(nil, "已经是第一页了") + return + end + + self.current_page = self.current_page - 1 + self:UpdatePagination() + + -- TODO: 这里需要根据实际的分页逻辑重新加载数据 + -- 如果服务器支持分页，需要重新请求对应页的数据 + -- 如果是客户端分页，需要调整列表显示范围 +end + +-- 下一页 +function M:OnNextPage() + if self.current_page >= self.total_pages then + ViewUtil.ErrorTip(nil, "已经是最后一页了") + return + end + + self.current_page = self.current_page + 1 + self:UpdatePagination() + + -- TODO: 这里需要根据实际的分页逻辑重新加载数据 + -- 如果服务器支持分页，需要重新请求对应页的数据 + -- 如果是客户端分页，需要调整列表显示范围 +end + return M \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngOneselfPersonStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngOneselfPersonStatView.lua new file mode 100644 index 00000000..4e6c21cb --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngOneselfPersonStatView.lua @@ -0,0 +1,344 @@ +local TimeSettingPanel = import(".TimeSettingPanel") +-- 开桌统计 +local GroupMngOneselfPersonStatView = {} + +local M = GroupMngOneselfPersonStatView + +function GroupMngOneselfPersonStatView.new(gid) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) + self.class = "GroupMngOneselfPersonStatView" + self.group_id = gid + self:init("ui://NewGroup/View_GroupOneselfPersonStat") + + 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 diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua index f9523261..454480af 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua @@ -13,6 +13,12 @@ function GroupMngPartnerStatView.new(gid) local self = M self.class = "GroupMngPartnerStatView" self.group_id = gid + + -- 分页相关变量 + self.page_size = 10 -- 每页显示数量 + self.current_page = 1 -- 当前页码 + self.total_pages = 1 -- 总页数 + self:InitView() return self end @@ -20,6 +26,9 @@ end function M:initData() self.lst_record.numItems = 0 self.record_data = {} + self.current_page = 1 + self.total_pages = 1 + self:UpdatePagination() local now_time = os.date("*t", now) local today = os.time({ year = now_time.year, month = now_time.month, day = now_time.day, hour = 0, min = 0, sec = 0 }) @@ -64,6 +73,15 @@ function M:InitView() self.lst_record.scrollPane.onPullUpRelease:Set(function() self:GetRecordData(self.lst_record.numItems) end) + + -- 分页按钮事件绑定 + self._view:GetChild("previouspage").onClick:Set(function() + self:OnPreviousPage() + end) + + self._view:GetChild("nextpage").onClick:Set(function() + self:OnNextPage() + end) self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, nil, true) @@ -71,6 +89,7 @@ function M:InitView() local ctr_page = self._view:GetController("type") ctr_page.onChanged:Set(function() self.record_data = {} + self.current_page = 1 self.lst_record.numItems = 0 if ctr_page.selectedIndex == 0 then local now_time = os.date("*t", now) @@ -145,6 +164,7 @@ function M:InitView() local btn_back = self._view:GetChild('btn_back') btn_back.onClick:Set( function() + self.current_page = 1 self.lst_record.numItems = #self.record_data end ) @@ -169,6 +189,19 @@ function M:GetRecordData(index) for i = 1, #members do self.record_data[#self.record_data + 1] = members[i] end + + -- 计算总页数 + self.total_pages = math.ceil(#self.record_data / self.page_size) + if self.total_pages < 1 then self.total_pages = 1 end + + -- 确保当前页不超过总页数 + if self.current_page > self.total_pages then + self.current_page = self.total_pages + end + + -- 更新分页UI + self:UpdatePagination() + self.lst_record.numItems = #self.record_data end end) @@ -329,4 +362,69 @@ function M:OnRenderRecordItem(index, obj) self:FillRecordItem(data, obj) end +-- 更新分页UI显示 +function M:UpdatePagination() + if not self._view or self._view.isDisposed then + return + end + + local pagination_text = self._view:GetChild("pagination") + local previous_btn = self._view:GetChild("previouspage") + local next_btn = self._view:GetChild("nextpage") + + if pagination_text then + pagination_text.text = tostring(self.current_page) + end + + -- if previous_btn then + -- if self.current_page <= 1 then + -- previous_btn.grayed = true + -- previous_btn.touchable = false + -- else + -- previous_btn.grayed = false + -- previous_btn.touchable = true + -- end + -- end + + -- if next_btn then + -- if self.current_page >= self.total_pages then + -- next_btn.grayed = true + -- next_btn.touchable = false + -- else + -- next_btn.grayed = false + -- next_btn.touchable = true + -- end + -- end +end + +-- 上一页 +function M:OnPreviousPage() + if self.current_page <= 1 then + ViewUtil.ErrorTip(nil, "已经是第一页了") + return + end + + self.current_page = self.current_page - 1 + self:UpdatePagination() + + -- TODO: 这里需要根据实际的分页逻辑重新加载数据 + -- 如果服务器支持分页，需要重新请求对应页的数据 + -- 如果是客户端分页，需要调整列表显示范围 +end + +-- 下一页 +function M:OnNextPage() + if self.current_page >= self.total_pages then + ViewUtil.ErrorTip(nil, "已经是最后一页了") + return + end + + self.current_page = self.current_page + 1 + self:UpdatePagination() + + -- TODO: 这里需要根据实际的分页逻辑重新加载数据 + -- 如果服务器支持分页，需要重新请求对应页的数据 + -- 如果是客户端分页，需要调整列表显示范围 +end + return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngProportionView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngProportionView.lua index 76635267..69bfee55 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngProportionView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngProportionView.lua @@ -1,5 +1,6 @@ -- 赢家管理界面(抽水明细) local TimeSettingPanel = import(".TimeSettingPanel") +local GroupOneclickCcollectionView = import("..GroupOneclickCcollectionView") local GroupMngProportionView = {} @@ -9,14 +10,22 @@ function GroupMngProportionView.new(gid) local self = M self.class = "GroupMngProportionView" self.group_id = gid + + -- 分页相关变量 + self.page_size = 10 -- 每页显示数量 + self.current_page = 1 -- 当前页码 + self.total_pages = 1 -- 总页数 + self:FillView() return self end function M:initData() - self.prop_data = {} - self.lst_prop.numItems = 0 - self:GetPropData(0) + self.prop_data = {} + self.current_page = 1 + self.total_pages = 1 + self:UpdatePagination() + self:GetPropData(0) end function M:FillView() @@ -24,60 +33,164 @@ function M:FillView() self.prop_data = {} self._view:GetChild("btn_search").onClick:Set(function() - self:initData() + self:initData() end) self.lst_prop = self._view:GetChild("lst_proportion") - self.lst_prop:SetVirtual() + self.lst_prop:SetVirtual() self.lst_prop.itemRenderer = function(index, obj) - self:OnRenderPropItem(index, obj) - end + self:OnRenderPropItem(index, obj) + end self.lst_prop.scrollPane.onPullUpRelease:Set(function() self:GetPropData(self.lst_prop.numItems) end) - self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0) + -- 分页按钮事件绑定 + self._view:GetChild("previouspage").onClick:Set(function() + self:OnPreviousPage() + end) + + self._view:GetChild("nextpage").onClick:Set(function() + self:OnNextPage() + end) + + self._view:GetChild("btn_search1").onClick:Set(function() + local qid = self._view:GetChild("tex_id").text + qid = tonumber(qid) + self.quary_id = qid or 0 + self.query_nick = self._view:GetChild("tex_id").text or "" + self.fag_result_data = {} + self._view:GetChild("tex_id").text = "" + self.current_page = 1 + self:GetPropData(0) + end) + self._view:GetChild("btn_back").onClick:Set(function() + self.quary_id = 0 + self.query_nick = "" + self.current_page = 1 + self:GetPropData(0) + end) + local btn_linqu = self._view:GetChild('btn_linqu') + btn_linqu.onClick:Set(function() + local win2 = GroupOneclickCcollectionView.new() + win2:Show() + end) + + + self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), + -308, 0) end -- 获取抽水数据 -function M:GetPropData(index) - ViewUtil.ShowModalWait() - local begin_time, end_time = self.time_panel:GetDate() +function M:GetPropData(index) + ViewUtil.ShowModalWait() + local begin_time, end_time = self.time_panel:GetDate() local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_GetPropLog(self.group_id, index, 8, begin_time, end_time, function(res) if self._is_destroy then return end - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取排名信息失败") else - local props = res.Data.hp_logs - if index == 0 then - self._view:GetChild("tex_winner_count").text = res.Data.count + local props = res.Data.hp_logs + if index == 0 then + self._view:GetChild("tex_winner_count").text = res.Data.count self._view:GetChild("tex_valid_count").text = res.Data.valid_count - self._view:GetChild("tex_winner_proportion").text = d2ad(res.Data.pump) - self._view:GetChild("tex_total_proportion").text = d2ad(res.Data.gains) - end - if #props == 0 then return end - for i = 1, #props do - self.prop_data[#self.prop_data + 1] = props[i] - end - self.lst_prop.numItems = #self.prop_data + self._view:GetChild("tex_winner_proportion").text = d2ad(res.Data.pump) + self._view:GetChild("tex_total_proportion").text = d2ad(res.Data.gains) + end + if #props == 0 then return end + for i = 1, #props do + self.prop_data[#self.prop_data + 1] = props[i] + end + + -- 计算总页数 + self.total_pages = math.ceil(#self.prop_data / self.page_size) + if self.total_pages < 1 then self.total_pages = 1 end + + -- 确保当前页不超过总页数 + if self.current_page > self.total_pages then + self.current_page = self.total_pages + end + + -- 更新分页UI + self:UpdatePagination() + + -- 设置列表显示数量为当前页的数据 + self.lst_prop.numItems = #self.prop_data end end) end -- 填充抽水对象 function M:OnRenderPropItem(index, obj) - local tem = index + 1 - local data = self.prop_data[tem] - --obj:GetChild("tex_num").text = d2ad(math.abs(data.hp)) - obj:GetChild("tex_winner").text = ViewUtil.stringEllipsis(data.nick) - local play_name = DataManager.groups:get(self.group_id):getPlayName(data.pid) - obj:GetChild("tex_game").text = play_name - obj:GetChild("tex_roomid").text = data.roomid - obj:GetChild("tex_date").text = os.date("%m月%d日\r%H:%M", data.time) + local tem = index + 1 + local data = self.prop_data[tem] + --obj:GetChild("tex_num").text = d2ad(math.abs(data.hp)) + obj:GetChild("tex_winner").text = ViewUtil.stringEllipsis(data.nick) + local play_name = DataManager.groups:get(self.group_id):getPlayName(data.pid) + obj:GetChild("tex_game").text = play_name + obj:GetChild("tex_roomid").text = data.roomid + obj:GetChild("tex_date").text = os.date("%m月%d日\r%H:%M", data.time) end -return M \ No newline at end of file +-- 更新分页UI显示 +function M:UpdatePagination() + if not self._view or self._view.isDisposed then + return + end + + local pagination_text = self._view:GetChild("pagination") + local previous_btn = self._view:GetChild("previouspage") + local next_btn = self._view:GetChild("nextpage") + + if pagination_text then + pagination_text.text = tostring(self.current_page) + end + + -- if previous_btn then + -- if self.current_page <= 1 then + -- previous_btn.grayed = true + -- previous_btn.touchable = false + -- else + -- previous_btn.grayed = false + -- previous_btn.touchable = true + -- end + -- end + + -- if next_btn then + -- if self.current_page >= self.total_pages then + -- next_btn.grayed = true + -- next_btn.touchable = false + -- else + -- next_btn.grayed = false + -- next_btn.touchable = true + -- end + -- end +end + +-- 上一页 +function M:OnPreviousPage() + if self.current_page <= 1 then + ViewUtil.ErrorTip(nil, "已经是第一页了") + return + end + + self.current_page = self.current_page - 1 + self:UpdatePagination() +end + +-- 下一页 +function M:OnNextPage() + if self.current_page >= self.total_pages then + ViewUtil.ErrorTip(nil, "已经是最后一页了") + return + end + + self.current_page = self.current_page + 1 + self:UpdatePagination() +end + +return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua index c700e97c..0a664d43 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngShufflingStatisticsFagListView.lua @@ -20,7 +20,7 @@ function M:initData() end function M:FillView() - self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupProportion") + self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupShufflingStatisticsFagList") self.prop_data = {} self._view:GetChild("btn_search").onClick:Set(function() @@ -35,7 +35,16 @@ function M:FillView() self.lst_prop.scrollPane.onPullUpRelease:Set(function() self:GetPropData(self.lst_prop.numItems) end) - + self._view:GetChild("btn_search1").onClick:Set(function() + local qid = self._view:GetChild("tex_id").text + qid = tonumber(qid) + self.quary_id = qid or 0 + self.query_nick = self._view:GetChild("tex_id").text or "" + self.fag_result_data = {} + self._view:GetChild("tex_id").text = "" + self.current_page = 1 + self:GetPropData(0) + end) self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0) end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua index 741cd6f8..5f55d82f 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua @@ -2,7 +2,7 @@ local TimeSettingPanel = import(".TimeSettingPanel") local GroupPartnerStatMember = import(".GroupPartnerStatMember") local GroupPartnerStatPlay = import(".GroupPartnerStatPlay") local GroupNumberInputView = import(".GroupNumberInputView") -local GroupMngPersonStatAloneView = import(".GroupMngPersonStatAloneView") +local GroupMngOneselfPersonStatView = import(".GroupMngOneselfPersonStatView") -- 开桌统计 local GroupMngXingYunStatView = {} @@ -55,7 +55,6 @@ local groups = DataManager.groups.groupList 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, nil, true) @@ -141,8 +140,7 @@ function M:FillRecordItem(data, obj) obj:GetChild("tex_round_youxiao").text = data.valid_round / 100 local bth_record = obj:GetChild('bth_xy_record') bth_record.onClick:Set(function() - local gl_bth_record = GroupMngPersonStatAloneView.new(self.curGroup.id) - gl_bth_record:InitView() + local gl_bth_record = GroupMngOneselfPersonStatView.new(data.uid) gl_bth_record:Show() end) end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua index d4948891..0c7cb614 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua @@ -6,8 +6,8 @@ local GroupPartnerRewardsView = {} local M = GroupPartnerRewardsView function GroupPartnerRewardsView.new(group_id, partner_id, partner_lev) - setmetatable(M, {__index = BaseWindow}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) self.class = "GroupPartnerRewardsView" self._close_destroy = true self._blur_view = blur_view @@ -21,17 +21,21 @@ function GroupPartnerRewardsView.new(group_id, partner_id, partner_lev) end function M:initView(url) - BaseWindow.init(self, "ui://NewGroup/Win_PartnerRewards") + BaseWindow.init(self, "ui://NewGroup/Win_PartnerRewards") self.lst_rewards = self._view:GetChild("lst_rewards") - -- printlog("合伙人玩法奖励", self.partner_id) + -- printlog("合伙人玩法奖励", self.partner_id) --self.lst_rewards = self._view:GetChild("tex_duiname") - self._view:GetChild("tex_duiname").text = "您正在对用户"..self.partner_id.."进行比赛分成设置操作" + self._view:GetChild("tex_duiname").text = "您正在对用户" .. self.partner_id .. "进行比赛分成设置操作" self.lst_rewards:SetVirtual() self.lst_rewards.itemRenderer = function(index, obj) - self:OnRenderRewardsItem(index, obj) + self:OnRenderRewardsItem(index, obj) end + self._view:GetChild("n93").onClick:Set(function() + ViewUtil.ErrorTip(nil, "保存成功") + end) + self.fandianControl = self._view:GetController("fandian") self:GetRewardsData() end @@ -44,20 +48,23 @@ function M:GetRewardsData() if self._is_destroy then return end - if res.ReturnCode ~= 0 then + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人奖励失败") else local rewards = res.Data.rewards self.showxipai = res.Data.showxipai == true and 1 or 0 --pt(res) - if rewards and #rewards == 0 then printlog("服务器未设置合伙人奖励===>>>") return end - --printlog("获取奖励===>>>",res.Data.rewards) - --pt(res.Data.rewards) + if rewards and #rewards == 0 then + printlog("服务器未设置合伙人奖励===>>>") + return + end + --printlog("获取奖励===>>>",res.Data.rewards) + --pt(res.Data.rewards) -- local rdata = self.rewards_data -- for i = 1, #rewards do -- rdata[#rdata + 1] = rewards[i] -- end - for i=1,#rewards do + for i = 1, #rewards do self.rewards_data[i] = rewards[i] end self.lst_rewards.numItems = #self.rewards_data @@ -88,122 +95,129 @@ end -- 填充奖励设置对象 function M:OnRenderRewardsItem(index, obj) - local data = self.rewards_data[index + 1] + local data = self.rewards_data[index + 1] local group = DataManager.groups:get(self.group_id) obj:GetController("fandian").selectedIndex = self.showxipai --printlog("aaaaaaaaaaaaaaaaaaaaa ",__showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data.xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1)) - obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data.xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1) - obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, data.cur_value, data.max_value, group.lev < 3, data.rewardValueType or 1) - obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, data.anchou_cur_value, data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1) - obj:GetChild("tex_section").text ="0-"..data.max_value + obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, data.xipai_cur_value, data + .xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1) + obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, data.cur_value, data.max_value, group.lev < 3, + data.rewardValueType or 1) + obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, data.anchou_cur_value, + data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1) + obj:GetChild("tex_section").text = "0-" .. data.max_value obj:GetChild("tex_residue").text = data.max_value - local play_name = group:getPlayName(data.pid) - obj:GetChild("tex_name").text = play_name + local play_name = group:getPlayName(data.pid) + obj:GetChild("tex_name").text = play_name if data.rewardType == 3 or self.partner_id == DataManager.SelfUser.account_id then obj:GetController("promote").selectedIndex = 1 else obj:GetController("promote").selectedIndex = 0 end - local input_type = data.rewardValueType == 1 and 0 or 3 - obj:GetChild("btn_set").onClick:Set(function() - local gfiv = GroupNumberInputView.new(self._root_view,function(num) + local input_type = data.rewardValueType == 1 and 0 or 3 + obj:GetChild("btn_set").onClick:Set(function() + local gfiv = GroupNumberInputView.new(self._root_view, function(num) local tem = num if data.rewardValueType == 2 then - tem = ad2d(tem) + tem = ad2d(tem) end if tem > data.max_value then - ViewUtil.ErrorTip(nil, "输入值超过上限") - return - -- elseif tem < data.cur_value then - -- ViewUtil.ErrorTip(nil, "不能下调奖励") - -- return + ViewUtil.ErrorTip(nil, "输入值超过上限") + return + -- elseif tem < data.cur_value then + -- ViewUtil.ErrorTip(nil, "不能下调奖励") + -- return end local fgCtr = ControllerManager.GetController(NewGroupController) ViewUtil.ShowModalWait() - fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0,function(res) - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败") - else - data.cur_value = tem - obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value, group.lev < 3, data.rewardValueType or 1) - end + fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败") + else + data.cur_value = tem + obj:GetChild("tex_rewards").text = __showRewardsValue(data.rewardType, tem, data.max_value, + group.lev < 3, data.rewardValueType or 1) + end end) end, input_type) gfiv:Show() - end) - obj:GetChild("btn_set_all").onClick:Set(function() - - local msg_win = MsgWindow.new(nil, string.format("是否设定所有玩法奖励为%s%%？", data.cur_value), MsgWindow.MsgMode.OkAndCancel,nil,true) - - msg_win.onOk:Add(function( ... ) + end) + obj:GetChild("btn_set_all").onClick:Set(function() + local msg_win = MsgWindow.new(nil, string.format("是否设定所有玩法奖励为%s%%？", data.cur_value), + MsgWindow.MsgMode.OkAndCancel, nil, true) + + msg_win.onOk:Add(function(...) local single = msg_win.btnCheck.selected and 1 or 0 local fgCtr = ControllerManager.GetController(NewGroupController) ViewUtil.ShowModalWait() - fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.cur_value,single ,function(res) - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "设置奖励失败") - else - ViewUtil.ShowBannerOnScreenCenter("设置奖励成功") - -- for i = 1, #self.rewards_data do - -- if self.rewards_data[i].rewardValueType == data.rewardValueType then - -- self.rewards_data[i].cur_value = data.cur_value - -- end - -- end - -- self.lst_rewards.numItems = #self.rewards_data - self:GetRewardsData() - end - end) + fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.cur_value, single, + function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "设置奖励失败") + else + ViewUtil.ShowBannerOnScreenCenter("设置奖励成功") + -- for i = 1, #self.rewards_data do + -- if self.rewards_data[i].rewardValueType == data.rewardValueType then + -- self.rewards_data[i].cur_value = data.cur_value + -- end + -- end + -- self.lst_rewards.numItems = #self.rewards_data + self:GetRewardsData() + end + end) end) - msg_win:Show() - - end) + msg_win:Show() + end) --xipai_reward local input_type1 = data.xipai_rewardValueType == 1 and 0 or 3 - obj:GetChild("btn_set1").onClick:Set(function() - local gfiv = GroupNumberInputView.new(self._root_view,function(num) + obj:GetChild("btn_set1").onClick:Set(function() + local gfiv = GroupNumberInputView.new(self._root_view, function(num) local tem = num if data.xipai_rewardValueType == 2 then - tem = ad2d(tem) + tem = ad2d(tem) end - + if tem > data.xipai_max_value then - ViewUtil.ErrorTip(nil, "输入值超过上限") - return - -- elseif tem < data.cur_value then - -- ViewUtil.ErrorTip(nil, "不能下调奖励") - -- return + ViewUtil.ErrorTip(nil, "输入值超过上限") + return + -- elseif tem < data.cur_value then + -- ViewUtil.ErrorTip(nil, "不能下调奖励") + -- return end local fgCtr = ControllerManager.GetController(NewGroupController) ViewUtil.ShowModalWait() - fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0,function(res) - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌奖励失败") - else - data.xipai_cur_value = tem - obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, tem, data.xipai_max_value, group.lev < 3, data.xipai_rewardValueType or 1) - end + fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌奖励失败") + else + data.xipai_cur_value = tem + obj:GetChild("tex_xipai").text = __showRewardsValue(data.xipai_rewardType, tem, data.xipai_max_value, + group.lev < 3, data.xipai_rewardValueType or 1) + end end) end, input_type1) gfiv:Show() - end) + end) + + obj:GetChild("btn_set_all1").onClick:Set(function() + local msg_win = MsgWindow.new(nil, string.format("是否设定所有洗牌奖励为%s%%？", data.xipai_cur_value), + MsgWindow.MsgMode.OkAndCancel) + msg_win.onOk:Add(function(...) + local single = 0 --msg_win.btnCheck.selected and 1 or 0 - obj:GetChild("btn_set_all1").onClick:Set(function() - local msg_win = MsgWindow.new(nil, string.format("是否设定所有洗牌奖励为%s%%？", data.xipai_cur_value), MsgWindow.MsgMode.OkAndCancel) - msg_win.onOk:Add(function( ... ) - local single = 0--msg_win.btnCheck.selected and 1 or 0 - local fgCtr = ControllerManager.GetController(NewGroupController) ViewUtil.ShowModalWait() - fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.xipai_cur_value,single,function(res) - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then + fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.xipai_cur_value, + single, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌失败") else ViewUtil.ShowBannerOnScreenCenter("设置洗牌成功") @@ -216,55 +230,57 @@ function M:OnRenderRewardsItem(index, obj) -- end -- self.lst_rewards.numItems = #self.rewards_data self:GetRewardsData() - end + end end) end) - msg_win:Show() - - end) + msg_win:Show() + end) --xipai_reward local input_type2 = data.anchou_rewardValueType == 1 and 0 or 3 - obj:GetChild("btn_set2").onClick:Set(function() - local gfiv = GroupNumberInputView.new(self._root_view,function(num) + obj:GetChild("btn_set2").onClick:Set(function() + local gfiv = GroupNumberInputView.new(self._root_view, function(num) local tem = num if data.anchou_rewardValueType == 2 then - tem = ad2d(tem) + tem = ad2d(tem) end - + if tem > data.xipai_max_value then - ViewUtil.ErrorTip(nil, "输入值超过上限") - return - -- elseif tem < data.cur_value then - -- ViewUtil.ErrorTip(nil, "不能下调奖励") - -- return + ViewUtil.ErrorTip(nil, "输入值超过上限") + return + -- elseif tem < data.cur_value then + -- ViewUtil.ErrorTip(nil, "不能下调奖励") + -- return end printlog("jefe btn_set2") local fgCtr = ControllerManager.GetController(NewGroupController) ViewUtil.ShowModalWait() - fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0,function(res) - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "设置管理奖励失败") - else - data.anchou_cur_value = tem - obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, tem, data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1) - end + fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "设置管理奖励失败") + else + data.anchou_cur_value = tem + obj:GetChild("tex_anchou").text = __showRewardsValue(data.anchou_rewardType, tem, + data.anchou_max_value, group.lev < 3, data.anchou_rewardValueType or 1) + end end) end, input_type2) gfiv:Show() - end) - obj:GetChild("btn_set_all2").onClick:Set(function() - local msg_win = MsgWindow.new(nil, string.format("是否设定所有管理奖励为%s%%？", data.anchou_cur_value), MsgWindow.MsgMode.OkAndCancel) - msg_win.onOk:Add(function( ... ) - local single = 0--msg_win.btnCheck.selected and 1 or 0 - + end) + obj:GetChild("btn_set_all2").onClick:Set(function() + local msg_win = MsgWindow.new(nil, string.format("是否设定所有管理奖励为%s%%？", data.anchou_cur_value), + MsgWindow.MsgMode.OkAndCancel) + msg_win.onOk:Add(function(...) + local single = 0 --msg_win.btnCheck.selected and 1 or 0 + local fgCtr = ControllerManager.GetController(NewGroupController) ViewUtil.ShowModalWait() - fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.anchou_cur_value,single,function(res) - ViewUtil.CloseModalWait() - if res.ReturnCode ~= 0 then + fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.anchou_cur_value, + single, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then ViewUtil.ErrorTip(res.ReturnCode, "设置管理失败") else ViewUtil.ShowBannerOnScreenCenter("设置管理成功") @@ -277,13 +293,11 @@ function M:OnRenderRewardsItem(index, obj) -- end -- self.lst_rewards.numItems = #self.rewards_data self:GetRewardsData() - end + end end) end) - msg_win:Show() - - end) - + msg_win:Show() + end) end -return M \ No newline at end of file +return M diff --git a/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua b/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua index 55aee9c1..bf69ef12 100644 --- a/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/100zhang/EXMainView.lua @@ -117,8 +117,10 @@ end function M:UpdateRound() - self._view:GetChild("tex_round1").text = self._room.curren_round - self._view:GetChild("tex_round2").text = self._room.room_config.round + -- self._view:GetChild("tex_round1").text = self._room.curren_round + -- self._view:GetChild("tex_round2").text = self._room.room_config.round + self._view:GetChild("tex_round1").text = self._room.curren_round .. " / " .. self._room.room_config.round + self._view:GetChild("tex_round3").text = self._room.room_config.round-self._room.curren_round end function M:InitPlayerInfoView() diff --git a/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua b/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua index 8aaf92a0..f25acb52 100644 --- a/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua @@ -517,8 +517,10 @@ function M:EventInit() end function M:UpdateRound() - self._view:GetChild("tex_round1").text = self._room.curren_round - self._view:GetChild("tex_round2").text = self._room.room_config.round + -- self._view:GetChild("tex_round1").text = self._room.curren_round + -- self._view:GetChild("tex_round2").text = self._room.room_config.round + self._view:GetChild("tex_round1").text = self._room.curren_round .. " / " .. self._room.room_config.round + self._view:GetChild("tex_round3").text = self._room.room_config.round-self._room.curren_round end function M:InitPlayerInfoView() diff --git a/lua_probject/extend_project/extend/majiang/chaoshan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/chaoshan/EXMainView.lua index 86319fd6..bacbabdc 100644 --- a/lua_probject/extend_project/extend/majiang/chaoshan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/chaoshan/EXMainView.lua @@ -117,8 +117,10 @@ end function M:UpdateRound() - self._view:GetChild("tex_round1").text = self._room.curren_round - self._view:GetChild("tex_round2").text = self._room.room_config.round + -- self._view:GetChild("tex_round1").text = self._room.curren_round + -- self._view:GetChild("tex_round2").text = self._room.room_config.round + self._view:GetChild("tex_round1").text = self._room.curren_round .. " / " .. self._room.room_config.round + self._view:GetChild("tex_round3").text = self._room.room_config.round-self._room.curren_round end function M:InitPlayerInfoView() diff --git a/lua_probject/extend_project/extend/majiang/chaozhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/chaozhou/EXMainView.lua index 374d077f..4e136101 100644 --- a/lua_probject/extend_project/extend/majiang/chaozhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/chaozhou/EXMainView.lua @@ -117,8 +117,10 @@ end function M:UpdateRound() - self._view:GetChild("tex_round1").text = self._room.curren_round - self._view:GetChild("tex_round2").text = self._room.room_config.round + -- self._view:GetChild("tex_round1").text = self._room.curren_round + -- self._view:GetChild("tex_round2").text = self._room.room_config.round + self._view:GetChild("tex_round1").text = self._room.curren_round .. " / " .. self._room.room_config.round + self._view:GetChild("tex_round3").text = self._room.room_config.round-self._room.curren_round end function M:InitPlayerInfoView() diff --git a/lua_probject/extend_project/extend/majiang/chaozhougui/EXMainView.lua b/lua_probject/extend_project/extend/majiang/chaozhougui/EXMainView.lua index 85cf20a4..ebaecab9 100644 --- a/lua_probject/extend_project/extend/majiang/chaozhougui/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/chaozhougui/EXMainView.lua @@ -117,8 +117,10 @@ end function M:UpdateRound() - self._view:GetChild("tex_round1").text = self._room.curren_round - self._view:GetChild("tex_round2").text = self._room.room_config.round + -- self._view:GetChild("tex_round1").text = self._room.curren_round + -- self._view:GetChild("tex_round2").text = self._room.room_config.round + self._view:GetChild("tex_round1").text = self._room.curren_round .. " / " .. self._room.room_config.round + self._view:GetChild("tex_round3").text = self._room.room_config.round-self._room.curren_round end function M:InitPlayerInfoView() diff --git a/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua b/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua index 785a1231..f931e51f 100644 --- a/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/gejiu/EXMainView.lua @@ -100,8 +100,10 @@ function M:IsShowGangZi(btn,isShow) end function M:UpdateRound() - self._view:GetChild("tex_round1").text = self._room.curren_round - self._view:GetChild("tex_round2").text = self._room.room_config.round + -- self._view:GetChild("tex_round1").text = self._room.curren_round + -- self._view:GetChild("tex_round2").text = self._room.room_config.round + self._view:GetChild("tex_round1").text = self._room.curren_round .. " / " .. self._room.room_config.round + self._view:GetChild("tex_round3").text = self._room.room_config.round-self._room.curren_round end function M:InitPlayerInfoView() diff --git a/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua b/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua index 60a039f0..14247495 100644 --- a/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua @@ -56,8 +56,8 @@ function M:UpdateRound() currRD=1 end - self._view:GetChild("tex_round1").text = currRD - self._view:GetChild("tex_round2").text = self._room.room_config.round + self._view:GetChild("tex_round1").text = currRD .. " / " .. self._room.room_config.round + self._view:GetChild("tex_round3").text = self._room.room_config.round-currRD end function M:InitPlayerInfoView() diff --git a/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua b/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua index 7b1c5fb6..05216d0b 100644 --- a/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua @@ -293,9 +293,8 @@ function M:UpdateRound() if self._room.curren_round==0 then currRD=1 end - - self._view:GetChild("tex_round1").text = currRD - self._view:GetChild("tex_round2").text = self._room.room_config.round + self._view:GetChild("tex_round1").text = currRD .. " / " .. self._room.room_config.round + self._view:GetChild("tex_round3").text = self._room.room_config.round-currRD end function M:UpdateStep(step) diff --git a/lua_probject/extend_project/extend/majiang/qizhiba/EXMainView.lua b/lua_probject/extend_project/extend/majiang/qizhiba/EXMainView.lua index fca9e309..732d34e1 100644 --- a/lua_probject/extend_project/extend/majiang/qizhiba/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/qizhiba/EXMainView.lua @@ -117,8 +117,10 @@ end function M:UpdateRound() - self._view:GetChild("tex_round1").text = self._room.curren_round - self._view:GetChild("tex_round2").text = self._room.room_config.round + -- self._view:GetChild("tex_round1").text = self._room.curren_round + -- self._view:GetChild("tex_round2").text = self._room.room_config.round + self._view:GetChild("tex_round1").text = self._room.curren_round .. " / " .. self._room.room_config.round + self._view:GetChild("tex_round3").text = self._room.room_config.round-self._room.curren_round end function M:InitPlayerInfoView() diff --git a/lua_probject/extend_project/extend/majiang/tuidaohu/EXMainView.lua b/lua_probject/extend_project/extend/majiang/tuidaohu/EXMainView.lua index 1fd27dbe..5e0287f9 100644 --- a/lua_probject/extend_project/extend/majiang/tuidaohu/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/tuidaohu/EXMainView.lua @@ -117,8 +117,10 @@ end function M:UpdateRound() - self._view:GetChild("tex_round1").text = self._room.curren_round - self._view:GetChild("tex_round2").text = self._room.room_config.round + -- self._view:GetChild("tex_round1").text = self._room.curren_round + -- self._view:GetChild("tex_round2").text = self._room.room_config.round + self._view:GetChild("tex_round1").text = self._room.curren_round .. " / " .. self._room.room_config.round + self._view:GetChild("tex_round3").text = self._room.room_config.round-self._room.curren_round end function M:InitPlayerInfoView() diff --git a/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua index 1873bcbd..605fce96 100644 --- a/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua @@ -48,8 +48,10 @@ function M:InitView(url) end function M:UpdateRound() - self._view:GetChild("tex_round1").text = self._room.curren_round - self._view:GetChild("tex_round2").text = self._room.room_config.round + -- self._view:GetChild("tex_round1").text = self._room.curren_round + -- self._view:GetChild("tex_round2").text = self._room.room_config.round + self._view:GetChild("tex_round1").text = self._room.curren_round .. " / " .. self._room.room_config.round + self._view:GetChild("tex_round3").text = self._room.room_config.round-self._room.curren_round end function M:InitPlayerInfoView() diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua index c53acca5..83628faf 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua @@ -153,9 +153,14 @@ function M:UpdateHandCard(getcard, mp) comp_back = comp_back .. '_3d' end + -- 如果是对方玩家，强制修改排序方向为从左到右 + local _room = DataManager.CurrenRoom + if _room and _player.seat ~= _room.self_player.seat then + oder = AreaOderType.left_right + end + for i = 0, _player.hand_left_count - 1 do local obj = UIPackage.CreateObjectFromURL(self:getBackCard(comp_back)) - local _room = DataManager.CurrenRoom local people_num = _room.room_config.people_num local pos = ViewUtil.GetPos(_room.self_player.seat, _player.seat, people_num) local gap = (pos == 3 and people_num == 4 or pos == 2 and people_num == 2) and 38 or 45 @@ -265,6 +270,13 @@ function M:UpdateOutCardList(outcard, card_item, cursor) local outcard_list = self._mask_data['outcard_list'] local oder = outcard_list['oder'] + + -- 如果是对方玩家，强制修改出牌列表排序方向为从左到右 + local _room = DataManager.CurrenRoom + if _room and self._player.seat ~= _room.self_player.seat then + oder = AreaOderType.left_right + end + local comp = outcard_list['comp'] local card = outcard_list['card'] local multi_oder = outcard_list['multi_oder'] diff --git a/wb_new_ui/.objs/metas/27vd145b/l8gg53.info b/wb_new_ui/.objs/metas/27vd145b/l8gg53.info index c5ba6bea..f8c44124 100644 --- a/wb_new_ui/.objs/metas/27vd145b/l8gg53.info +++ b/wb_new_ui/.objs/metas/27vd145b/l8gg53.info @@ -9,9 +9,6 @@ "n4_xyf8": { "hidden": true }, - "n12_i2p6": { - "hidden": true - }, "n5_xyf8": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokm1q.info b/wb_new_ui/.objs/metas/3z9lj55v/jokm1q.info new file mode 100644 index 00000000..33186230 --- /dev/null +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokm1q.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n1_ti0x": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokm50.info b/wb_new_ui/.objs/metas/3z9lj55v/jokm50.info new file mode 100644 index 00000000..281424b5 --- /dev/null +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokm50.info @@ -0,0 +1,37 @@ +{ + "objectStatus": { + "n29_cns5": { + "hidden": true + }, + "n11_evge": { + "hidden": true + }, + "n30_cns5": { + "hidden": true + }, + "n12_evge": { + "hidden": true + }, + "n14_evge": { + "hidden": true + }, + "n28_cns5": { + "hidden": true + }, + "n15_by4o": { + "hidden": true + }, + "n13_evge": { + "hidden": true + }, + "n0": { + "hidden": true + }, + "n27_by4o": { + "hidden": true + }, + "n9_h1uu": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokm6j.info b/wb_new_ui/.objs/metas/3z9lj55v/jokm6j.info new file mode 100644 index 00000000..81ae3fda --- /dev/null +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokm6j.info @@ -0,0 +1,13 @@ +{ + "objectStatus": { + "n7_f2pr": { + "hidden": true + }, + "n3_h1uu": { + "hidden": true + }, + "n4_h1uu": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info b/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info new file mode 100644 index 00000000..13fd69a7 --- /dev/null +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokm7l.info @@ -0,0 +1,46 @@ +{ + "objectStatus": { + "n79_l2u4": { + "hidden": true + }, + "n103_dnw9": { + "hidden": true + }, + "n96_dnw9": { + "hidden": true + }, + "n101_dnw9": { + "hidden": true + }, + "n107_go7q": { + "hidden": true + }, + "n109_go7q": { + "hidden": true + }, + "n89_8sat": { + "hidden": true + }, + "n100_dnw9": { + "hidden": true + }, + "n114_itp8": { + "hidden": true + }, + "n102_dnw9": { + "hidden": true + }, + "n106_go7q": { + "hidden": true + }, + "n73_l2u4": { + "hidden": true + }, + "n108_go7q": { + "hidden": true + }, + "n116_u50h": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokm8k.info b/wb_new_ui/.objs/metas/3z9lj55v/jokm8k.info new file mode 100644 index 00000000..d952b0af --- /dev/null +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokm8k.info @@ -0,0 +1,13 @@ +{ + "objectStatus": { + "n49_rfcn": { + "hidden": true + }, + "n54_hez8": { + "locked": true + }, + "n47_rfcn": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokm8q.info b/wb_new_ui/.objs/metas/3z9lj55v/jokm8q.info new file mode 100644 index 00000000..d14b22cf --- /dev/null +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokm8q.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n5_cmc2": { + "hidden": true + }, + "n6_rfcn": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokm8x.info b/wb_new_ui/.objs/metas/3z9lj55v/jokm8x.info new file mode 100644 index 00000000..1587d416 --- /dev/null +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokm8x.info @@ -0,0 +1,16 @@ +{ + "objectStatus": { + "n43_rfcn": { + "hidden": true + }, + "n6": { + "hidden": true + }, + "n50_hez8": { + "locked": true + }, + "n45_rfcn": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokm92.info b/wb_new_ui/.objs/metas/3z9lj55v/jokm92.info new file mode 100644 index 00000000..9d4a0747 --- /dev/null +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokm92.info @@ -0,0 +1,25 @@ +{ + "objectStatus": { + "n9": { + "hidden": true + }, + "n21_n6fs": { + "hidden": true + }, + "n7": { + "hidden": true + }, + "n5": { + "hidden": true + }, + "n20_qpk6": { + "hidden": true + }, + "n12_yyhx": { + "hidden": true + }, + "n6": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info b/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info index 2a3d234c..b194a727 100644 --- a/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info +++ b/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info @@ -1,6 +1,9 @@ { "objectStatus": { - "n34_hp0b": { + "n50_hkbm": { + "hidden": true + }, + "n17": { "hidden": true }, "n104_ni5n": { diff --git a/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikk.info b/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikk.info new file mode 100644 index 00000000..b42ef33d --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikk.info @@ -0,0 +1,18 @@ +{ + "objectStatus": { + "n98_nynz": { + "collapsed": true + }, + "n13_gls1": { + "hidden": true, + "collapsed": true + }, + "n92_eh0o": { + "collapsed": true + }, + "n35_gls1": { + "hidden": true, + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikl.info b/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikl.info index 828aebb5..d8e6cd45 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikl.info +++ b/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikl.info @@ -4,7 +4,17 @@ "collapsed": true }, "n189_dji9": { - "hidden": true + "collapsed": true + }, + "n200_eh0o": { + "collapsed": true + }, + "n83_kwi0": { + "hidden": true, + "collapsed": true + }, + "n210_nynz": { + "collapsed": true }, "n184_b5ny": { "hidden": true diff --git a/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikm.info b/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikm.info index 2429f183..b49586c5 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikm.info +++ b/wb_new_ui/.objs/metas/m7iejg46/eh0o7ikm.info @@ -1,44 +1,41 @@ { "objectStatus": { - "n42_f6br": { - "hidden": true - }, - "n41_f6br": { - "hidden": true - }, "n44_f6br": { "hidden": true }, - "n20_oj7k": { - "hidden": true, - "collapsed": true - }, - "n62_omkm": { - "hidden": true - }, - "n67_wbjh": { - "hidden": true - }, - "n63_omkm": { - "hidden": true - }, - "n43_f6br": { - "hidden": true - }, - "n54_j120": { - "hidden": true - }, - "n52_j120": { - "hidden": true - }, "n56_j120": { "hidden": true }, "n59_omkm": { "hidden": true }, + "n62_omkm": { + "hidden": true + }, + "n52_j120": { + "hidden": true + }, + "n54_j120": { + "hidden": true + }, + "n41_f6br": { + "hidden": true + }, + "n43_f6br": { + "hidden": true + }, + "n20_oj7k": { + "hidden": true, + "collapsed": true + }, + "n63_omkm": { + "hidden": true + }, "n36_oj7k": { "hidden": true + }, + "n67_wbjh": { + "hidden": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info b/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info index 72f347bb..2da19204 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info +++ b/wb_new_ui/.objs/metas/m7iejg46/f6brhww.info @@ -18,6 +18,9 @@ "n56_j120": { "hidden": true }, + "n82_ex3l": { + "hidden": true + }, "n35_oj7k": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info b/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info index 74192d5f..6a9e8b63 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info +++ b/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info @@ -4,10 +4,6 @@ "hidden": true }, "n189_dji9": { - "hidden": true, - "collapsed": true - }, - "n202_ex3l": { "hidden": true }, "n187_dji9": { diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info index 2c01674d..93c2762c 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk0.info @@ -11,10 +11,6 @@ "hidden": true, "collapsed": true }, - "n140_ex3l": { - "hidden": true, - "collapsed": true - }, "n94_kwi0": { "hidden": true, "collapsed": true diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hm3.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hm3.info index 469cc1ff..05543a5a 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hm3.info +++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hm3.info @@ -1,10 +1,16 @@ { "objectStatus": { - "n35_gls1": { + "n13_gls1": { "hidden": true, "collapsed": true }, - "n13_gls1": { + "n103_nynz": { + "collapsed": true + }, + "n92_eh0o": { + "collapsed": true + }, + "n35_gls1": { "hidden": true, "collapsed": true } diff --git a/wb_new_ui/.objs/metas/m7iejg46/nynz7iml.info b/wb_new_ui/.objs/metas/m7iejg46/nynz7iml.info new file mode 100644 index 00000000..c46cd879 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/nynz7iml.info @@ -0,0 +1,15 @@ +{ + "objectStatus": { + "n141_k5m9": { + "hidden": true, + "collapsed": true + }, + "n83_kwi0": { + "hidden": true, + "collapsed": true + }, + "n112_kwi0": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info b/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info index d0e3d58e..e5bfea59 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info @@ -1,8 +1,3 @@ { - "objectStatus": { - "n93_eh0o": { - "hidden": true - } - }, "adaptiveTest": true } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/qlfs7ime.info b/wb_new_ui/.objs/metas/m7iejg46/qlfs7ime.info index 070aa09d..077d5bf2 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/qlfs7ime.info +++ b/wb_new_ui/.objs/metas/m7iejg46/qlfs7ime.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n183_omkm": { + "hidden": true + }, "n83_kwi0": { "hidden": true, "collapsed": true diff --git a/wb_new_ui/.objs/metas/m7iejg46/qlfs7imf.info b/wb_new_ui/.objs/metas/m7iejg46/qlfs7imf.info index d5bf39b3..f088727d 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/qlfs7imf.info +++ b/wb_new_ui/.objs/metas/m7iejg46/qlfs7imf.info @@ -6,6 +6,9 @@ "n56_j120": { "hidden": true }, + "n69_qlfs": { + "hidden": true + }, "n63_omkm": { "hidden": true }, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 890da6c6..97112240 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,17 +2,13 @@ "libview.firstColumnWidth": 398, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg46ozazhxs", - "ui://m7iejg46cioeho9", - "ui://m7iejg46qlfs7ime", - "ui://m7iejg46kwi0hkr", - "ui://m7iejg46qlfs7imf", - "ui://m7iejg46cioehoa" + "ui://3z9lj55vjokm7l", + "ui://3z9lj55vjokmky" ], "test.device": "iPhone 5", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46qlfs7ime", + "doc.activeDoc": "ui://3z9lj55vjokmky", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -26,15 +22,17 @@ "27vd145b", "/component/head/", "27vd145b", - "/font/", - "27vd145b", - "/font/images/", - "27vd145b", - "/font/images/win/", - "27vd145b", + "/component/rule/", + "3z9lj55v", + "/", + "3z9lj55v", + "/component/", + "3z9lj55v", + "/component/setting_new/", + "3z9lj55v", "/images/", - "27vd145b", - "/images/ComxiantangMui/", + "3z9lj55v", + "/images/MMXTMui/", "m7iejg46", "/", "m7iejg46", @@ -42,8 +40,6 @@ "m7iejg46", "/component/Btn/", "m7iejg46", - "/component/Lst_friend/", - "m7iejg46", "/images/", "m7iejg46", "/images/NGXiangTangMui/", diff --git a/wb_new_ui/assets/Common/component/rule/Component4.xml b/wb_new_ui/assets/Common/component/rule/Component4.xml index 8bd2a94a..547fb378 100644 --- a/wb_new_ui/assets/Common/component/rule/Component4.xml +++ b/wb_new_ui/assets/Common/component/rule/Component4.xml @@ -1,15 +1,15 @@ - + - - + + - + \ No newline at end of file diff --git a/wb_new_ui/assets/Common/component/rule/GameRule.xml b/wb_new_ui/assets/Common/component/rule/GameRule.xml index d8a4800c..422c3c4b 100644 --- a/wb_new_ui/assets/Common/component/rule/GameRule.xml +++ b/wb_new_ui/assets/Common/component/rule/GameRule.xml @@ -1,26 +1,34 @@ - + - - - - - - - + + + + + +