diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua index b9035061..67cb80f2 100644 --- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua @@ -13,6 +13,10 @@ local GroupSelectPlayView = import('.GroupSelectPlayView') local GroupMngSettingView = import('.GroupMngSettingView') local GroupMngMemberInviteView = import(".MngView.GroupMngMemberInviteView") local GroupMngMemberHpListView = import(".MngView.GroupMngMemberHpListView") +local GroupMngMenKangView = import(".MngView.GroupMngMenKangView") +local GroupMngPiLaoZhi = import(".MngView.GroupMngPiLaoZhi") +-- local GroupPartnerRewardsView = import(".GroupPartnerRewardsView") + -- local HeadView = require('Game/View/LobbyHeadView') GroupNumberInputView_Game = import(".MngView.GroupNumberInputView") @@ -1224,6 +1228,21 @@ function M:InitView(url) -- self:__loadLastData() + --设置门槛和提成放置外面 + self._view:GetChild('btn_menkan').onClick:Set(function() + if not self.mng_view_menkan then + self.mng_view_menkan = GroupMngMenKangView.new(self.curGroup.id) + end + self.mng_view_menkan:Show() + end) + self._view:GetChild('btn_pilaozhi').onClick:Set(function() + if not self.mng_view_pilao then + self.mng_view_pilao = GroupMngPiLaoZhi.new(self.curGroup.id) + end + self.mng_view_pilao:Show() + end) + + self:__loadGroupData() self:__refreshManager() UpdateBeat:Add(self.__onUpdate, self) @@ -1816,7 +1835,6 @@ function M:__loadGroupData() if not self.mng_view_hp then self.mng_view_hp = GroupMngMemberHpListView.new(self.curGroup.id) end - print("lingmeng-self.mng_view_invite", self.mng_view_hp) self.mng_view_hp:Show() end) --]] diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua index 1c74707d..88a64b07 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua @@ -292,7 +292,7 @@ function M:init(url) -- end) -- end -- 合伙人设置 临时从禁止同桌修改 - if group.lev < 3 then + if true then local btn_ban_table = lst_mng:AddItemFromPool() btn_ban_table.icon = "ui://NewGroup/mng_ban_table" btn_ban_table.onClick:Set(function() diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua index eeaf6344..1a27b22f 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua @@ -287,9 +287,9 @@ function M:FillItem(obj, member, refresh, index) if member.lev < 3 then if member.lev == 1 then - tex_lev.text = "馆主" + tex_lev.text = "盟主" else - tex_lev.text = "副馆主" + tex_lev.text = "董事" end elseif member.partnerLev ~= 0 then tex_lev.text = "董事" @@ -516,9 +516,10 @@ end function M:OnRenderItem(index, obj) --printlog("aaaaaaaaaawwwwwwwwwwwwwwwwwwwwwwwwwwww ",index) - local member = self.member_data[(self.start - 1) * self.page + index + 1] + local i = (self.start - 1) * self.pageNum + index + 1 + local member = self.member_data[i] if member then - self:FillItem(obj, member, false, index + 1) + self:FillItem(obj, member, false, i) end end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua new file mode 100644 index 00000000..c79f19a3 --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMenKangView.lua @@ -0,0 +1,702 @@ +-- 牌友圈成员列表 +local GroupNumberInputView = import('.GroupNumberInputView') +local GroupMemberFagLogView = import('.GroupMemberFagLogView') +local GroupSetPermissionView = import('.GroupSetPermissionView') +local GroupBanSameTableView = import('.GroupBanSameTableView') +local GroupMemberOperateView = import('.GroupMemberOperateView') +local GroupAddMemberInfoView = import('.GroupAddMemberInfoView') +local GroupStatMember = import('.GroupStatMember') +local GroupMngFagPackView = import('../GroupMngFagPackView') + + +local MngPermission = import('.MngPermission') + +local GroupMngMenKangView = { + numberMap = { {}, {} }, + backTable = {}, + pageNum = 4, + start = 1, + page = 1 +} + +local M = GroupMngMenKangView +setmetatable(M, { __index = BaseWindow }) + +local gid +function GroupMngMenKangView.new(group_id, blur_view) + local self = setmetatable({}, { __index = M }) + self.class = 'GroupMngMenKangView' + self.group_id = group_id + self.curGroup = DataManager.groups:get(self.group_id) + self.member_data = {} + self.online = 2 + self.stype = 2 + self:FillView() + return self +end + +function M:initData() + if self._view:GetController('page').selectedIndex == 0 then + self:GetMemberData(0) + elseif self._view:GetController('page').selectedIndex == 1 then + self:GetMemberData(0) + --self:GetJoinsData() + end +end + +-- 管理员权限 +local MngPermissionList = { + DeleteMember = 1, + -- 删除成员 + AddMember = 2, + --添加成员 + SetFag = 3, + --设置体力值 + BanPlaying = 4, + --禁止游戏 + BanSameTable = 5 + --禁止同桌 +} +local function CheckPermission(lev, permission) + if lev == 2 and not permission then + ViewUtil.ErrorTip(nil, '您无权操作！如有需要请联系盟主。', 1) + return false + end + return true +end + +function M:FillView() + BaseWindow.init(self, 'ui://NewGroup/View_GroupMenKang') + + local rtype = self._view:GetChild("n132") + rtype.visible = false + + rtype.onChanged:Set(function() + if tostring(self.online) == rtype.value then + return + end + self.online = tonumber(rtype.value) + self:GetMemberData(0) + --printlog("aaaaaaaa222222222222222222222222222222") + end) + + local rtype = self._view:GetChild("n136") + + rtype.onClick:Set(function() + self:GetMemberData(0) + self._ctr_search.selectedIndex = 0 + --printlog("aaaaaaaa222222222222222222222222222222") + end) + + -- 初始化成员列表 + self.lst_member = self._view:GetChild('lst_member') + self.lst_member:SetVirtual() + self.lst_member.itemRenderer = function(index, obj) + self:OnRenderItem(index, obj) + end + -- self.lst_member.scrollPane.onPullUpRelease:Set( + -- function() + -- --printlog("aaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbb ",self.lst_member.numItems) + -- self:GetMemberData(self.lst_member.numItems) + -- end + -- ) + + -- 初始化搜索成员列表 + self.lst_member_find = self._view:GetChild('lst_member_find') + self.lst_member_find:SetVirtual() + self.lst_member_find.itemRenderer = function(index, obj) + self:OnRenderItemFind(index, obj) + end + + --local n50=self._view:GetChild('n50') + --print(n50) + --n50.displayObject.gameObject.transform.localPosition.x=214 + --print(n50.displayObject.gameObject.transform.localPosition.x) + -- 搜索玩家 + self._ctr_search = self._view:GetController('search') + self._view:GetChild('btn_search').onClick:Set( + function() + ViewUtil.ShowModalWait(nil) + local text = self._view:GetChild('tex_id').text + local qid, qnick + if text == "" then + ViewUtil.CloseModalWait() + ViewUtil.ErrorTip(nil, '输入不能为空') + return + end + qid = tonumber(text) or 0 + qnick = text + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_FindMember( + self.group_id, + qid, + function(res) + ViewUtil.CloseModalWait() + if self._is_destroy then + return + end + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, '找不到成员') + else + self._view:GetChild('tex_id').text = '' + self._ctr_search.selectedIndex = 1 + + self.numberMap[2][qid] = res.Data.members + + ViewUtil.CloseModalWait() + table.insert(self.backTable, { 2, qid }) + self.lst_member_find.numItems = #res.Data.members + end + end, + qnick + ) + end + ) + local btn_back = self._view:GetChild('btn_back') + btn_back.onClick:Set( + function() + print("ling btn_back", #self.backTable) + if #self.backTable > 1 then + table.remove(self.backTable) + local tempIndex = self.backTable[#self.backTable] + local tempTable = self.numberMap[tempIndex[1]][tempIndex[2]] + self.lst_member_find.numItems = #tempTable + else + self._ctr_search.selectedIndex = 0 + print('btn_back') + + self.lst_member.numItems = self:GetChildNumForPage() + end + end + ) + + local group = DataManager.groups:get(self.group_id) + local perm_array = MngPermission.getPermData(group.permission) + + self._view:GetChild('btn_less').onClick:Set(function() + if self.start >= 2 then + self.start = self.start - 1 + print("add") + self.lst_member.numItems = self:GetChildNumForPage() + self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page) + else + ViewUtil.ErrorMsg(self._view, nil, "当前页数不能减少") + end + end) + self._view:GetChild('btn_add').onClick:Set(function() + if self.start < self.page then + self.start = self.start + 1 + self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page) + print("less") + self.lst_member.numItems = self:GetChildNumForPage() + else + ViewUtil.ErrorMsg(self._view, nil, "当前页数不能增加") + end + end) + + self:GetMemberData(0) +end + +-- 快速访问 +function M:navigation() + self._view:GetController('page').selectedIndex = 2 + self:initData() +end + +-- 获取成员数据 +function M:GetMemberData(index) + --print("11111111111111111111") + --print(debug.traceback()) + -- local iClear = false + -- local rtype = self._view:GetChild("n132").value + -- if tostring(self.online) ~= rtype then + -- iClear = true + -- end + + local group = DataManager.groups:get(self.group_id) + if index == 0 then + group:clearMember() + end + + ViewUtil.ShowModalWait(nil) + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GroupMembers12( + self.group_id, + index, + 6, + self.stype, + self.online, + function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败') + else + local allmembers = group.members + self.member_data = {} + ViewUtil.ShowModalWait("正在加载预警值") + for i = 1, #allmembers do + local member = allmembers[i] + if member.lev > 0 then + table.insert(self.member_data, member) + fgCtr:FG_GetBanMemberHB(self.group_id, member.uid, function(res) + --pt(res) + if res.ReturnCode == 0 then + -- local diaoduView = GroupSetMemberInfoDiaoduView.new(self.group_id, member.uid) + -- diaoduView:SetCurrentState(res.Data.group_black + 1, res.Data) + member.banInfo = res.Data + if i == #allmembers then + -- coroutine.wait(0.5) + ViewUtil.CloseModalWait() + self.page = math.ceil(#self.member_data / self.pageNum) + self.lst_member.numItems = self:GetChildNumForPage() + self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page) + end + else + ViewUtil.ErrorTip(res.ReturnCode, "获取整组调度失败！") + if i == #allmembers then + -- coroutine.wait(0.5) + ViewUtil.CloseModalWait() + self.page = math.ceil(#self.member_data / self.pageNum) + self.lst_member.numItems = self:GetChildNumForPage() + self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page) + end + end + end) + end + end + + if index == 0 then + -- self._view:GetChild('tex_memb_num').text = res.Data.member_num + -- self._view:GetChild('tex_total_hp').text = d2ad(res.Data.hp_num1+res.Data.otherHp) + end + end + end + ) +end + +-- 修改体力值 +local function __change_fag(gid, pid, is_add, cur_hp, callback) + local gniv = + GroupNumberInputView.new( + nil, + function(num) + num = ad2d((is_add and num or -num)) + ViewUtil.ShowModalWait() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_ChangeFag( + gid, + pid, + num, + function(res1) + ViewUtil.CloseModalWait() + -- if gniv._is_destroy then + -- return + -- end + if (res1.ReturnCode == 0) then + callback(res1.Data) + else + ViewUtil.ErrorTip(res1.ReturnCode, '更改积分失败！') + end + end + ) + -- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str + end, + is_add and 1 or 2, + cur_hp and d2ad(cur_hp) or nil + ) + gniv:Show() +end + +-- 填充成员对象 +function M:FillItem(obj, member, refresh, index) + local group = DataManager.groups:get(self.group_id) + obj:GetChild('tex_name').text = ViewUtil.stringEllipsis(member.nick) + obj:GetChild('btn_head').icon = 'ui://Common/Head0' + obj:GetChild('tex_childId').text = index + obj:GetChild('text_menkan').text = member.banInfo.ban_max_value + ImageLoad.Load(member.portrait, obj:GetChild('btn_head')._iconObject, self.class) + -- obj.data = member.id + -- 显示玩家标签，合伙人、管理员 + -- local ctr_type = obj:GetController('type') + local tex_lev = obj:GetChild('tex_lev') + + if member.lev < 3 then + if member.lev == 1 then + tex_lev.text = "盟主" + else + tex_lev.text = "董事" + end + elseif member.partnerLev ~= 0 then + tex_lev.text = "董事" + else + tex_lev.text = "成员" + end + + -- 体力值数据 + local tex_fag = obj:GetChild('tex_fag') + tex_fag.text = d2ad(member.hp) + + obj:GetChild('tex_id').text = '' .. member.uid + --obj:GetChild("tex_cost_count").text = d2ad(member.last_hp_cost) + + --if member.online == 1 then + -- obj:GetChild('tex_last_login').text = '在线' + -- else + if member.last_time ~= 0 then + -- 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}) + -- local cha = math.ceil((today - member.last_time) / (24 * 60 *60)) + -- if (cha > 0) then + -- obj:GetChild('tex_last_login').text = cha.."天前" --'最近登录\n' .. os.date('%Y/%m/%d', member.last_time) + -- else + -- obj:GetChild('tex_last_login').text = os.date('%Y/%m/%d', member.last_time) + -- end + --print("11111aaaaaaaaaaaaaaaaaaaa ",os.date('%Y/%m/%d', member.last_time)) + obj:GetChild('tex_last_login').text = "最近登录:" .. os.date('%Y/%m/%d', member.last_time) + else + obj:GetChild('tex_last_login').text = '加入时间\n' .. os.date('%Y/%m/%d', member.join_time) + end + -- end + + + obj:GetChild('tex_zongchangci').text = member.total_round + obj:GetChild('tex_ruhui').text = os.date('%Y/%m/%d %H:%M:%S', member.join_time) + + --上级 + obj:GetChild('tex_shangjiName').text = member.parentId_nick or "" + if member.parentId == 0 then + obj:GetChild('tex_shangjiID').text = "" + else + obj:GetChild('tex_shangjiID').text = member.parentId + end + + + local perm_array = MngPermission.getPermData(group.permission) + -- 体力值操作按钮事件 + if group.lev < 3 or member.parentId == DataManager.SelfUser.account_id then + obj:GetController('fag').selectedIndex = 1 + else + obj:GetController('fag').selectedIndex = 0 + end + + --obj:GetChild("btn_tag").title = member.score + + local fgCtr = ControllerManager.GetController(NewGroupController) + local p = group:getMember(member.uid) + local mp = group:getMember(DataManager.SelfUser.account_id) + obj:GetChild('btn_fag_add').onClick:Set( + function() + if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then + return + end + __change_fag( + self.group_id, + member.uid, + true, + nil, + function(data) + local hp = data.hp + member.hp = hp + if p then + p.hp = hp + if mp and mp ~= p then + local mhp = data.mhp + mp.hp = mhp + end + end + print("fag_add") + self.lst_member.numItems = self:GetChildNumForPage() + -- 搜索出的玩家显示 + if self._view:GetController('search').selectedIndex == 1 then + obj:GetChild('tex_fag').text = d2ad(hp) + end + end + ) + end + ) + obj:GetChild('btn_fag_minus').onClick:Set( + function() + if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then + return + end + __change_fag( + self.group_id, + member.uid, + false, + member.hp, + function(data) + local hp = data.hp + member.hp = hp + if p then + p.hp = hp + if mp and mp ~= p then + local mhp = data.mhp + mp.hp = mhp + end + end + print('btn_fag_minus') + self.lst_member.numItems = self:GetChildNumForPage() + -- 搜索出的玩家显示 + if self._view:GetController('search').selectedIndex == 1 then + obj:GetChild('tex_fag').text = d2ad(hp) + end + end + ) + end + ) + + obj:GetChild('btn_score_detail').onClick:Set( + function() + local mflv = GroupMemberFagLogView.new(self.group_id, member) + mflv:Show() + end + ) + + obj:GetChild('btn_operate').onClick:Set( + function() + local mflv = + GroupMemberOperateView.new( + self.group_id, + member, + function(delete) + if delete ~= nil and delete == true then + local group = DataManager.groups:get(self.group_id) + self.member_data = group.members + print('btn_operate') + self.lst_member.numItems = self:GetChildNumForPage() + self._view:GetController('search').selectedIndex = 0 + else + print('btn_operate') + self.lst_member.numItems = self:GetChildNumForPage() + if refresh then + self:FillItem(obj, member) + end + end + end, + function() + self:GetMemberData(0) + end + ) + mflv:Show() + end + ) + + local btnBxx = obj:GetChild('btn_bxx') + btnBxx.visible = (not (member.lev == 3 and member.partnerLev == 0)) and + not (DataManager.SelfUser.account_id == member.uid) + --btnBxx.visible = not (DataManager.SelfUser.account_id == member.uid) + obj:GetChild('btn_bxx').onClick:Set( + function() + local ctrNum = 1 + -- if not (member.lev == 3 and member.partnerLev == 0) then + -- ctrNum = 2 + -- end + ctrNum = 2 + local gmv = GroupMngFagPackView.new(self.curGroup.id, self._root_view, ctrNum, member.uid) + gmv:SetCallback( + function() + btnBxx.selected = false + end + ) + gmv:Show() + end + ) + + local superBtn = obj:GetChild('super_btn') + -- superBtn.visible = group.lev == 1 + local superBtnUp = obj:GetChild('superior_btn_up') + obj:GetChild("superior_btn_up").onClick:Set( + function() + ViewUtil.ShowModalWait(nil) + local text = member.parentId + local tempNumberList = self.numberMap[2][text] + if tempNumberList == nil then + tempNumberList = {} + for j = 1, #self.member_data do + local number = self.member_data[j] + if number.uid == text then + table.insert(tempNumberList, number) + end + end + self.numberMap[2][text] = tempNumberList + end + self._view:GetChild('tex_id').text = '' + self._view:GetController('search').selectedIndex = 1 + + ViewUtil.CloseModalWait() + table.insert(self.backTable, { 2, text }) + self.lst_member_find.numItems = #tempNumberList + end + ) + obj:GetChild("super_btn").onClick:Set( + function() + ViewUtil.ShowModalWait(nil) + local text = member.uid + local tempNumberList = self.numberMap[1][text] + if tempNumberList == nil then + tempNumberList = {} + for j = 1, #self.member_data do + local number = self.member_data[j] + if number.parentId == text then + table.insert(tempNumberList, number) + end + end + self.numberMap[1][text] = tempNumberList + end + self._view:GetChild('tex_id').text = '' + self._view:GetController('search').selectedIndex = 1 + + ViewUtil.CloseModalWait() + table.insert(self.backTable, { 1, text }) + self.lst_member_find.numItems = #tempNumberList + end + ) + + obj:GetChild("btn_in").onClick:Set(function() + self._view:GetController('set').selectedIndex = 1 + self._view:GetChild('input_value').text = member.banInfo.ban_max_value + self._view:GetChild('btn_sendMenkang').onClick:Set(function() + ViewUtil.ShowModalWait() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_BanMemberHB( + self.group_id, + member.uid, + 2, + 25, + tonumber(self._view:GetChild('input_value').text), + function(response) + ViewUtil.CloseModalWait() + if (response.ReturnCode == 0) then + ViewUtil.ShowBannerOnScreenCenter('设置成功！', 1) + member.banInfo.ban_max_value = response.Data.ban_max_value + obj:GetChild('text_menkan').text = member.banInfo.ban_max_value + self._view:GetController('set').selectedIndex = 0 + else + ViewUtil.ErrorTip(response.ReturnCode, '设置失败！') + end + end + ) + end) + end) +end + +function M:OnRenderItem(index, obj) + --printlog("aaaaaaaaaawwwwwwwwwwwwwwwwwwwwwwwwwwww ",index) + local i = (self.start - 1) * self.pageNum + index + 1 + local member = self.member_data[i] + if member then + self:FillItem(obj, member, false, i) + end +end + +function M:OnRenderItemFind(index, obj) + --printlog("aaaaaaaaaawwwwwwwwwwwwwwwwwwwwwwwwwwww ",index) + local lastKey = self.backTable[#self.backTable] + local tempTable = self.numberMap[lastKey[1]][lastKey[2]] + local member = tempTable[index + 1] + if member then + self:FillItem(obj, member, true, index + 1) + end +end + +--获取申请列表 +function M:GetJoinsData() + local group = DataManager.groups:get(self.group_id) + if group.joins > 0 then + ViewUtil.ShowModalWait() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GroupJoins( + self.group_id, + function(res) + ViewUtil.CloseModalWait() + if (res.ReturnCode == 0) then + local joins = res.Data.joins + group.joins = #joins + if #joins == 0 then + group.update_joins = true + end + self:FillJoinList(joins) + else + ViewUtil.ErrorTip(res.ReturnCode, '获取申请列表失败！') + self:FillJoinList({}) + end + end + ) + else + self:FillJoinList({}) + end +end + +--填充申请 +function M:FillJoinList(data) + local lst_joins = self._view:GetChild('lst_joins') + lst_joins:RemoveChildrenToPool() + for i = 1, #data do + local item = lst_joins:AddItemFromPool() + item:GetChild('tex_name').text = ViewUtil.stringEllipsis(data[i].nick) + item:GetChild('tex_id').text = data[i].id + local btn_head = item:GetChild('btn_head') + ImageLoad.Load(data[i].portrait, btn_head._iconObject) + item:GetChild('btn_yes').onClick:Set( + function() + self:VerifyPlayerJoin(data[i].id, true) + end + ) + item:GetChild('btn_no').onClick:Set( + function() + self:VerifyPlayerJoin(data[i].id, false) + end + ) + end +end + +function M:VerifyPlayerJoin(id, allow) + ViewUtil.ShowModalWait() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GroupVerifyJoin( + self.group_id, + id, + allow, + function(res) + ViewUtil.CloseModalWait() + if (res.ReturnCode == 0) then + self:GetJoinsData() + else + ViewUtil.ErrorTip(res.ReturnCode, '操作申请失败') + end + 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 + +function M:ClearNumTex() + self._texnum_str = '' + self._currenIndex = 0 + self.tex_num.text = self._texnum_str +end + +function M:GetChildNumForPage() + local numberNum = #self.member_data + if self.start * self.pageNum > numberNum then + return numberNum - (self.start - 1) * self.pageNum + end + return self.pageNum +end + +return M diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua new file mode 100644 index 00000000..12debe17 --- /dev/null +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua @@ -0,0 +1,672 @@ +-- 牌友圈成员列表 +local GroupNumberInputView = import('.GroupNumberInputView') +local GroupMemberFagLogView = import('.GroupMemberFagLogView') +local GroupSetPermissionView = import('.GroupSetPermissionView') +local GroupBanSameTableView = import('.GroupBanSameTableView') +local GroupMemberOperateView = import('.GroupMemberOperateView') +local GroupAddMemberInfoView = import('.GroupAddMemberInfoView') +local GroupStatMember = import('.GroupStatMember') +local GroupMngFagPackView = import('../GroupMngFagPackView') +local GroupPartnerRewardsView = import(".GroupPartnerRewardsView") + + + +local MngPermission = import('.MngPermission') + +local GroupMngPiLaoZhi = { + numberMap = { {}, {} }, + backTable = {}, + pageNum = 4, + start = 1, + page = 1 +} + +local M = GroupMngPiLaoZhi +setmetatable(M, { __index = BaseWindow }) + +local gid +function GroupMngPiLaoZhi.new(group_id, blur_view) + local self = setmetatable({}, { __index = M }) + self.class = 'GroupMngPiLaoZhi' + self.group_id = group_id + self.curGroup = DataManager.groups:get(self.group_id) + self.member_data = {} + self.online = 2 + self.stype = 2 + self:FillView() + return self +end + +function M:initData() + if self._view:GetController('page').selectedIndex == 0 then + self:GetMemberData(0) + elseif self._view:GetController('page').selectedIndex == 1 then + self:GetMemberData(0) + --self:GetJoinsData() + end +end + +-- 管理员权限 +local MngPermissionList = { + DeleteMember = 1, + -- 删除成员 + AddMember = 2, + --添加成员 + SetFag = 3, + --设置体力值 + BanPlaying = 4, + --禁止游戏 + BanSameTable = 5 + --禁止同桌 +} +local function CheckPermission(lev, permission) + if lev == 2 and not permission then + ViewUtil.ErrorTip(nil, '您无权操作！如有需要请联系盟主。', 1) + return false + end + return true +end + +function M:FillView() + BaseWindow.init(self, 'ui://NewGroup/View_GroupPiLaoZhi') + + local rtype = self._view:GetChild("n132") + rtype.visible = false + + rtype.onChanged:Set(function() + if tostring(self.online) == rtype.value then + return + end + self.online = tonumber(rtype.value) + self:GetMemberData(0) + --printlog("aaaaaaaa222222222222222222222222222222") + end) + + local rtype = self._view:GetChild("n136") + + rtype.onClick:Set(function() + self:GetMemberData(0) + self._ctr_search.selectedIndex = 0 + --printlog("aaaaaaaa222222222222222222222222222222") + end) + + -- 初始化成员列表 + self.lst_member = self._view:GetChild('lst_member') + self.lst_member:SetVirtual() + self.lst_member.itemRenderer = function(index, obj) + self:OnRenderItem(index, obj) + end + -- self.lst_member.scrollPane.onPullUpRelease:Set( + -- function() + -- --printlog("aaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbb ",self.lst_member.numItems) + -- self:GetMemberData(self.lst_member.numItems) + -- end + -- ) + + -- 初始化搜索成员列表 + self.lst_member_find = self._view:GetChild('lst_member_find') + self.lst_member_find:SetVirtual() + self.lst_member_find.itemRenderer = function(index, obj) + self:OnRenderItemFind(index, obj) + end + + self.lst_rewards = self._view:GetChild('lst_member2') + self.lst_rewards:SetVirtual() + self.lst_rewards.itemRenderer = function(index, obj) + self:OnRenderItemMy(index, obj) + end + + --local n50=self._view:GetChild('n50') + --print(n50) + --n50.displayObject.gameObject.transform.localPosition.x=214 + --print(n50.displayObject.gameObject.transform.localPosition.x) + -- 搜索玩家 + self._ctr_search = self._view:GetController('search') + self._view:GetChild('btn_search').onClick:Set( + function() + ViewUtil.ShowModalWait(nil) + local text = self._view:GetChild('tex_id').text + local qid, qnick + if text == "" then + ViewUtil.CloseModalWait() + ViewUtil.ErrorTip(nil, '输入不能为空') + return + end + qid = tonumber(text) or 0 + qnick = text + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_FindMember( + self.group_id, + qid, + function(res) + ViewUtil.CloseModalWait() + if self._is_destroy then + return + end + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, '找不到成员') + else + self._view:GetChild('tex_id').text = '' + self._ctr_search.selectedIndex = 1 + + self.numberMap[2][qid] = res.Data.members + + ViewUtil.CloseModalWait() + table.insert(self.backTable, { 2, qid }) + self.lst_member_find.numItems = #res.Data.members + end + end, + qnick + ) + end + ) + local btn_back = self._view:GetChild('btn_back') + btn_back.onClick:Set( + function() + print("ling btn_back", #self.backTable) + if #self.backTable > 1 then + table.remove(self.backTable) + local tempIndex = self.backTable[#self.backTable] + local tempTable = self.numberMap[tempIndex[1]][tempIndex[2]] + self.lst_member_find.numItems = #tempTable + else + self._ctr_search.selectedIndex = 0 + self.lst_member.numItems = self:GetChildNumForPage() + end + end + ) + + local group = DataManager.groups:get(self.group_id) + local perm_array = MngPermission.getPermData(group.permission) + + self._view:GetChild('btn_less').onClick:Set(function() + if self.start >= 2 then + self.start = self.start - 1 + self.lst_member.numItems = self:GetChildNumForPage() + self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page) + else + ViewUtil.ErrorMsg(self._view, nil, "当前页数不能减少") + end + end) + self._view:GetChild('btn_add').onClick:Set(function() + if self.start < self.page then + self.start = self.start + 1 + self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page) + self.lst_member.numItems = self:GetChildNumForPage() + else + ViewUtil.ErrorMsg(self._view, nil, "当前页数不能增加") + end + end) + + self._view:GetChild('btn_piLaoZhi1').onClick:Set(function() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetRewards(self.group_id, group.owner, group.partnerLev, function(res) + ViewUtil.CloseModalWait() + if self._is_destroy then + return + end + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人奖励失败") + else + self.rewards = res.Data.rewards + self.lst_rewards.numItems = #self.rewards + end + end) + end) + self._view:GetChild('btn_piLaoZhi2').onClick:Set(function() + self:GetMemberData(0) + end) + + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetRewards(self.group_id, group.owner, group.partnerLev, function(res) + ViewUtil.CloseModalWait() + if self._is_destroy then + return + end + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人奖励失败") + else + self.rewards = res.Data.rewards + self.lst_rewards.numItems = #self.rewards + end + end) + -- self:GetMemberData(0) +end + +-- 快速访问 +function M:navigation() + self._view:GetController('page').selectedIndex = 2 + self:initData() +end + +-- 获取成员数据 +function M:GetMemberData(index) + --print("11111111111111111111") + --print(debug.traceback()) + -- local iClear = false + -- local rtype = self._view:GetChild("n132").value + -- if tostring(self.online) ~= rtype then + -- iClear = true + -- end + + local group = DataManager.groups:get(self.group_id) + if index == 0 then + group:clearMember() + end + + ViewUtil.ShowModalWait(nil) + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GroupMembers12( + self.group_id, + index, + 6, + self.stype, + self.online, + function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败') + else + self.member_data = group.members + self.lst_member.numItems = self:GetChildNumForPage() + self.page = math.ceil(#group.members / self.pageNum) + self._view:GetChild('text_ye').text = string.format("%d/%d", self.start, self.page) + if index == 0 then + -- self._view:GetChild('tex_memb_num').text = res.Data.member_num + -- self._view:GetChild('tex_total_hp').text = d2ad(res.Data.hp_num1+res.Data.otherHp) + end + end + end + ) +end + +-- 修改体力值 +local function __change_fag(gid, pid, is_add, cur_hp, callback) + local gniv = + GroupNumberInputView.new( + nil, + function(num) + num = ad2d((is_add and num or -num)) + ViewUtil.ShowModalWait() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_ChangeFag( + gid, + pid, + num, + function(res1) + ViewUtil.CloseModalWait() + -- if gniv._is_destroy then + -- return + -- end + if (res1.ReturnCode == 0) then + callback(res1.Data) + else + ViewUtil.ErrorTip(res1.ReturnCode, '更改积分失败！') + end + end + ) + -- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str + end, + is_add and 1 or 2, + cur_hp and d2ad(cur_hp) or nil + ) + gniv:Show() +end + +-- 填充成员对象 +function M:FillItem(obj, member, refresh, index) + local group = DataManager.groups:get(self.group_id) + obj:GetChild('tex_name').text = ViewUtil.stringEllipsis(member.nick) + obj:GetChild('btn_head').icon = 'ui://Common/Head0' + obj:GetChild('tex_childId').text = index + ImageLoad.Load(member.portrait, obj:GetChild('btn_head')._iconObject, self.class) + -- obj.data = member.id + -- 显示玩家标签，合伙人、管理员 + -- local ctr_type = obj:GetController('type') + local tex_lev = obj:GetChild('tex_lev') + + if member.lev < 3 then + if member.lev == 1 then + tex_lev.text = "盟主" + else + tex_lev.text = "董事" + end + elseif member.partnerLev ~= 0 then + tex_lev.text = "董事" + else + tex_lev.text = "成员" + end + + -- 体力值数据 + local tex_fag = obj:GetChild('tex_fag') + tex_fag.text = d2ad(member.hp) + + obj:GetChild('tex_id').text = '' .. member.uid + --obj:GetChild("tex_cost_count").text = d2ad(member.last_hp_cost) + + --if member.online == 1 then + -- obj:GetChild('tex_last_login').text = '在线' + -- else + if member.last_time ~= 0 then + -- 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}) + -- local cha = math.ceil((today - member.last_time) / (24 * 60 *60)) + -- if (cha > 0) then + -- obj:GetChild('tex_last_login').text = cha.."天前" --'最近登录\n' .. os.date('%Y/%m/%d', member.last_time) + -- else + -- obj:GetChild('tex_last_login').text = os.date('%Y/%m/%d', member.last_time) + -- end + --print("11111aaaaaaaaaaaaaaaaaaaa ",os.date('%Y/%m/%d', member.last_time)) + obj:GetChild('tex_last_login').text = "最近登录:" .. os.date('%Y/%m/%d', member.last_time) + else + obj:GetChild('tex_last_login').text = '加入时间\n' .. os.date('%Y/%m/%d', member.join_time) + end + -- end + + + obj:GetChild('tex_zongchangci').text = member.total_round + obj:GetChild('tex_ruhui').text = os.date('%Y/%m/%d %H:%M:%S', member.join_time) + + --上级 + obj:GetChild('tex_shangjiName').text = member.parentId_nick or "" + if member.parentId == 0 then + obj:GetChild('tex_shangjiID').text = "" + else + obj:GetChild('tex_shangjiID').text = member.parentId + end + + + local perm_array = MngPermission.getPermData(group.permission) + -- 体力值操作按钮事件 + if group.lev < 3 or member.parentId == DataManager.SelfUser.account_id then + obj:GetController('fag').selectedIndex = 1 + else + obj:GetController('fag').selectedIndex = 0 + end + + --obj:GetChild("btn_tag").title = member.score + + local fgCtr = ControllerManager.GetController(NewGroupController) + local p = group:getMember(member.uid) + local mp = group:getMember(DataManager.SelfUser.account_id) + obj:GetChild('btn_fag_add').onClick:Set( + function() + if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then + return + end + __change_fag( + self.group_id, + member.uid, + true, + nil, + function(data) + local hp = data.hp + member.hp = hp + if p then + p.hp = hp + if mp and mp ~= p then + local mhp = data.mhp + mp.hp = mhp + end + end + self.lst_member.numItems = self:GetChildNumForPage() + -- 搜索出的玩家显示 + if self._view:GetController('search').selectedIndex == 1 then + obj:GetChild('tex_fag').text = d2ad(hp) + end + end + ) + end + ) + obj:GetChild('btn_fag_minus').onClick:Set( + function() + if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then + return + end + __change_fag( + self.group_id, + member.uid, + false, + member.hp, + function(data) + local hp = data.hp + member.hp = hp + if p then + p.hp = hp + if mp and mp ~= p then + local mhp = data.mhp + mp.hp = mhp + end + end + self.lst_member.numItems = self:GetChildNumForPage() + -- 搜索出的玩家显示 + if self._view:GetController('search').selectedIndex == 1 then + obj:GetChild('tex_fag').text = d2ad(hp) + end + end + ) + end + ) + + obj:GetChild('btn_score_detail').onClick:Set( + function() + local mflv = GroupMemberFagLogView.new(self.group_id, member) + mflv:Show() + end + ) + + obj:GetChild('btn_operate').onClick:Set( + function() + local mflv = + GroupMemberOperateView.new( + self.group_id, + member, + function(delete) + if delete ~= nil and delete == true then + local group = DataManager.groups:get(self.group_id) + self.member_data = group.members + self.lst_member.numItems = self:GetChildNumForPage() + self._view:GetController('search').selectedIndex = 0 + else + self.lst_member.numItems = self:GetChildNumForPage() + if refresh then + self:FillItem(obj, member) + end + end + end, + function() + self:GetMemberData(0) + end + ) + mflv:Show() + end + ) + + local btnBxx = obj:GetChild('btn_bxx') + btnBxx.visible = (not (member.lev == 3 and member.partnerLev == 0)) and + not (DataManager.SelfUser.account_id == member.uid) + --btnBxx.visible = not (DataManager.SelfUser.account_id == member.uid) + obj:GetChild('btn_bxx').onClick:Set( + function() + local ctrNum = 1 + -- if not (member.lev == 3 and member.partnerLev == 0) then + -- ctrNum = 2 + -- end + ctrNum = 2 + local gmv = GroupMngFagPackView.new(self.curGroup.id, self._root_view, ctrNum, member.uid) + gmv:SetCallback( + function() + btnBxx.selected = false + end + ) + gmv:Show() + end + ) + + local superBtn = obj:GetChild('super_btn') + -- superBtn.visible = group.lev == 1 + local superBtnUp = obj:GetChild('superior_btn_up') + obj:GetChild("btn_zeng").onClick:Set( + function() + local prv = GroupPartnerRewardsView.new(self.group_id, member.uid, member.partnerLev) + prv:Show() + end + ) + obj:GetChild("super_btn").onClick:Set( + function() + ViewUtil.ShowModalWait(nil) + local text = member.uid + local tempNumberList = self.numberMap[1][text] + if tempNumberList == nil then + tempNumberList = {} + for j = 1, #self.member_data do + local number = self.member_data[j] + if number.parentId == text then + table.insert(tempNumberList, number) + end + end + self.numberMap[1][text] = tempNumberList + end + self._view:GetChild('tex_id').text = '' + self._view:GetController('search').selectedIndex = 1 + + ViewUtil.CloseModalWait() + table.insert(self.backTable, { 1, text }) + self.lst_member_find.numItems = #tempNumberList + end + ) +end + +function M:FillItem2(obj, group, member, refresh, index) + obj:GetChild('tex_childId').text = group:getPlayName(member.pid) + obj:GetChild('tex_lev').text = member.max_value +end + +function M:OnRenderItem(index, obj) + --printlog("aaaaaaaaaawwwwwwwwwwwwwwwwwwwwwwwwwwww ",index) + local i = (self.start - 1) * self.pageNum + index + 1 + local member = self.member_data[i] + if member then + self:FillItem(obj, member, false, i) + end +end + +function M:OnRenderItemFind(index, obj) + --printlog("aaaaaaaaaawwwwwwwwwwwwwwwwwwwwwwwwwwww ",index) + local lastKey = self.backTable[#self.backTable] + local tempTable = self.numberMap[lastKey[1]][lastKey[2]] + local member = tempTable[index + 1] + if member then + self:FillItem(obj, member, true, index + 1) + end +end + +function M:OnRenderItemMy(index, obj) + local member = self.rewards[index + 1] + local group = DataManager.groups:get(self.group_id) + if member then + self:FillItem2(obj, group, member, true, index + 1) + end +end + +--获取申请列表 +function M:GetJoinsData() + local group = DataManager.groups:get(self.group_id) + if group.joins > 0 then + ViewUtil.ShowModalWait() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GroupJoins( + self.group_id, + function(res) + ViewUtil.CloseModalWait() + if (res.ReturnCode == 0) then + local joins = res.Data.joins + group.joins = #joins + if #joins == 0 then + group.update_joins = true + end + self:FillJoinList(joins) + else + ViewUtil.ErrorTip(res.ReturnCode, '获取申请列表失败！') + self:FillJoinList({}) + end + end + ) + else + self:FillJoinList({}) + end +end + +--填充申请 +function M:FillJoinList(data) + local lst_joins = self._view:GetChild('lst_joins') + lst_joins:RemoveChildrenToPool() + for i = 1, #data do + local item = lst_joins:AddItemFromPool() + item:GetChild('tex_name').text = ViewUtil.stringEllipsis(data[i].nick) + item:GetChild('tex_id').text = data[i].id + local btn_head = item:GetChild('btn_head') + ImageLoad.Load(data[i].portrait, btn_head._iconObject) + item:GetChild('btn_yes').onClick:Set( + function() + self:VerifyPlayerJoin(data[i].id, true) + end + ) + item:GetChild('btn_no').onClick:Set( + function() + self:VerifyPlayerJoin(data[i].id, false) + end + ) + end +end + +function M:VerifyPlayerJoin(id, allow) + ViewUtil.ShowModalWait() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GroupVerifyJoin( + self.group_id, + id, + allow, + function(res) + ViewUtil.CloseModalWait() + if (res.ReturnCode == 0) then + self:GetJoinsData() + else + ViewUtil.ErrorTip(res.ReturnCode, '操作申请失败') + end + 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 + +function M:ClearNumTex() + self._texnum_str = '' + self._currenIndex = 0 + self.tex_num.text = self._texnum_str +end + +function M:GetChildNumForPage() + local numberNum = #self.member_data + if self.start * self.pageNum > numberNum then + return numberNum - (self.start - 1) * self.pageNum + end + return self.pageNum +end + +return M 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 54013f53..77a10773 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,12 +21,12 @@ 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") self.lst_rewards:SetVirtual() self.lst_rewards.itemRenderer = function(index, obj) - self:OnRenderRewardsItem(index, obj) + self:OnRenderRewardsItem(index, obj) end self.fandianControl = self._view:GetController("fandian") self:GetRewardsData() @@ -40,20 +40,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 @@ -84,120 +87,127 @@ 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) - local play_name = group:getPlayName(data.pid) - obj:GetChild("tex_name").text = play_name + 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 = d2ad(data.cur_value) + obj:GetChild("tex_rewards_max").text = d2ad(data.max_value) + 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) + 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("设置洗牌成功") @@ -210,56 +220,58 @@ 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) + 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 - 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("设置管理成功") @@ -272,13 +284,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/base_project/Game/View/ResultView.lua b/lua_probject/base_project/Game/View/ResultView.lua index 194964c2..122a517b 100644 --- a/lua_probject/base_project/Game/View/ResultView.lua +++ b/lua_probject/base_project/Game/View/ResultView.lua @@ -257,7 +257,7 @@ function M:InitBigResult(room, fontsize) big_result:GetChild('txt_room_id').text = '房号:' .. self._resultInfo.room_id big_result:GetChild('txt_game_name').text = self._resultInfo.game_name big_result:GetChild('txt_game_data').text = os.date('%Y-%m-%d %H:%M', os.time()) - + local str_roominfo = string.gsub(room.room_config:GetDes(), '\r', '') big_result:GetChild('txt_play').text = str_roominfo @@ -268,7 +268,6 @@ function M:InitBigResult(room, fontsize) local maxScore = 0 local isWin = false - local flag_new = big_result:GetChild('flag_tempNew') for i = 1, #self._resultInfo.player_list do local player_info = self._resultInfo.player_list[i] @@ -302,29 +301,11 @@ function M:InitBigResult(room, fontsize) for i = 1, #self._resultInfo.player_list do local player_info = self._resultInfo.player_list[i] - local item2 - if player_info.id == room.self_player.self_user.account_id then - if isWin then - item2 = big_result:GetChild('play_win') - else - item2 = big_result:GetChild('play_lose') - end - else - if not isWin then - item2 = big_result:GetChild('play_win') - else - item2 = big_result:GetChild('play_lose') - end - end local item = player_list:AddItemFromPool() item:GetChild('txt_name').text = player_info.nick - item2:GetChild('txt_name').text = player_info.nick - item2:GetChild('txt_id').text = player_info.id local head = item:GetChild('head'):GetChild('n4') ImageLoad.Load(player_info.head_url, head) - local head = item2:GetChild('head'):GetChild('n4') - ImageLoad.Load(player_info.head_url, head) if player_info.entrust ~= nil and player_info.entrust == true then item:GetController('entrust').selectedIndex = 1 @@ -346,15 +327,9 @@ function M:InitBigResult(room, fontsize) if player_info.total_score >= 0 then item:GetController('pn').selectedIndex = 1 item:GetChild('txt_positive').text = '+' .. tostring(player_info.total_score) - item2:GetChild('txt_navigate').text = string.format("总战绩:+%s", player_info.total_score) - item2:GetChild('txt_daniao').text = string.format("打鸟 +%s", player_info.daniao) - item2:GetChild('text_zongjifen').text = player_info.total_score - player_info.daniao else item:GetController('pn').selectedIndex = 0 item:GetChild('txt_navigate').text = tostring(player_info.total_score) - item2:GetChild('txt_navigate').text = string.format("总战绩:%s", player_info.total_score) - item2:GetChild('txt_daniao').text = string.format("打鸟 %s", player_info.daniao) - item2:GetChild('text_zongjifen').text = player_info.total_score - player_info.daniao end end @@ -384,43 +359,10 @@ function M:InitBigResult(room, fontsize) else if big then pitem:GetChild('txt_key').textFormat.size = 30 - pitem:GetChild('txt_value').textFormat.size = 30 + pitem:GetChild('txt_value').textFormat.size = 12 else pitem:GetChild('txt_key').textFormat.size = 24 - pitem:GetChild('txt_value').textFormat.size = 24 - end - end - end - end - - local list_param = item2:GetChild('list_param') - list_param:RemoveChildrenToPool() - if self._gameStatisticsLineSpacing ~= nil then - list_param.lineGap = self._gameStatisticsLineSpacing - end - - if player_info.param ~= nil then - local big = false - if #player_info.param <= 4 then - big = true - end - - for i = 1, #player_info.param do - local pitem = list_param:AddItemFromPool() - - pitem:GetChild('txt_key').text = player_info.param[i].key - pitem:GetChild('txt_value').text = player_info.param[i].value - - if fontsize ~= nil and fontsize > 0 then - pitem:GetChild('txt_key').textFormat.size = fontsize - pitem:GetChild('txt_value').textFormat.size = fontsize - else - if big then - pitem:GetChild('txt_key').textFormat.size = 30 - pitem:GetChild('txt_value').textFormat.size = 30 - else - pitem:GetChild('txt_key').textFormat.size = 24 - pitem:GetChild('txt_value').textFormat.size = 24 + pitem:GetChild('txt_value').textFormat.size = 8 end end end diff --git a/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua b/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua index 7e133f25..5e954803 100644 --- a/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua @@ -7,106 +7,94 @@ local EXGameInfo = {} local M = EXGameInfo function EXGameInfo.new(blur_view) - setmetatable(M, {__index = IGameInfo}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = IGameInfo }) + local self = setmetatable({}, { __index = M }) self.class = "EXGameInfo" UIPackage.AddPackage("extend/poker/runfast/ui/Info_Poker_RunFastNew") return self end function M:FillData(view, index) - self._maxPlayer = 2 -- 默认玩家人数 + self._maxPlayer = 2 -- 默认玩家人数 self._roundChoice = 5 -- 回合选项数 - - if oldGameVersion==1 then - self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_RunFastNew/Creat_RunFast") - else - self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_RunFastNew/Creat_RunFast_yueyang") - end - - - if oldGameVersion==2 then - self._config:GetController("xipai").selectedIndex=0 - - self.xipaiValueText=self._config:GetChild('xipaifen') - self.xipaiValueText.text = 1 - self.xipaiValue=1 - self.anchouValueText=self._config:GetChild('anchoufen') - self.anchouValueText.text=1 - self.anchouValue=1 - - local btn_cr = self._config:GetChild('sdsrbtn') - btn_cr.onClick:Set( - function() - - local gniv = GroupNumberInputView_Game.new(nil, function(num) - - local value = limit - if otype == 1 then - value = value + ad2d(num) - elseif otype == - 1 then - value = value - ad2d(num) - else - value = ad2d(num) - end - - if value < 0 then - ViewUtil.ErrorTip(1,"输入数据异常！") - end - - self.xipaiValueText.text=value/1000 - self.xipaiValue=value/1000 - - end, 0, nil) - gniv:Show() - - + if oldGameVersion == 1 then + self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_RunFastNew/Creat_RunFast") + else + self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_RunFastNew/Creat_RunFast_yueyang") + end + + + if oldGameVersion == 2 then + self._config:GetController("xipai").selectedIndex = 0 + + self.xipaiValueText = self._config:GetChild('xipaifen') + self.xipaiValueText.text = 1 + self.xipaiValue = 1 + + self.anchouValueText = self._config:GetChild('anchoufen') + self.anchouValueText.text = 1 + self.anchouValue = 1 + + local btn_cr = self._config:GetChild('sdsrbtn') + btn_cr.onClick:Set( + function() + local gniv = GroupNumberInputView_Game.new(nil, function(num) + local value = limit + if otype == 1 then + value = value + ad2d(num) + elseif otype == -1 then + value = value - ad2d(num) + else + value = ad2d(num) end - ) - + + if value < 0 then + ViewUtil.ErrorTip(1, "输入数据异常！") + end + + self.xipaiValueText.text = value / 1000 + self.xipaiValue = value / 1000 + end, 3, nil) + gniv:Show() + end + ) + local btn_cr2 = self._config:GetChild('anchoubtn') - btn_cr2.onClick:Set( - function() - - local gniv = GroupNumberInputView_Game.new(nil, function(num) + btn_cr2.onClick:Set( + function() + local gniv = GroupNumberInputView_Game.new(nil, function(num) + local value = limit + if otype == 1 then + value = value + ad2d(num) + elseif otype == -1 then + value = value - ad2d(num) + else + value = ad2d(num) + end + + if value < 0 then + ViewUtil.ErrorTip(1, "输入数据异常！") + end + + self.anchouValueText.text = value / 1000 + self.anchouValue = value / 1000 + end, 3, nil) + gniv:Show() + end + ) + end - local value = limit - if otype == 1 then - value = value + ad2d(num) - elseif otype == - 1 then - value = value - ad2d(num) - else - value = ad2d(num) - end - - if value < 0 then - ViewUtil.ErrorTip(1,"输入数据异常！") - end - - self.anchouValueText.text=value/1000 - self.anchouValue=value/1000 - - end, 3, nil) - gniv:Show() - - - end - ) - end - - - self._config:GetChild("people_2").onClick:Set(function() self._config:GetController("rule").selectedIndex = 0 end) local piao = self._config:GetController("piao") local daniao = self._config:GetController("daniao") - + piao.onChanged:Add(function() if piao.selectedIndex ~= 0 then daniao.selectedIndex = 0 @@ -118,7 +106,6 @@ function M:FillData(view, index) piao.selectedIndex = 0 end end) - end local _help_url = "ui://Info_Poker_RunFastNew/Com_help" @@ -136,7 +123,7 @@ function M:GetIconUrl1() return _icon_url1 end -local _play_list = {"15张玩法","16张玩法"} +local _play_list = { "15张玩法", "16张玩法" } function M:GetPlayList() return _play_list end @@ -162,7 +149,6 @@ function M:LoadConfigData(data) _config:GetChild("planelack").selected = false _config:GetChild("Threelack").selected = false - else _config:GetChild("sandaidan").selected = false @@ -183,7 +169,7 @@ function M:LoadConfigData(data) else _config:GetChild("boom_add").selected = false end - + _config:GetChild("ThreeA").selected = data.threeA == 1 and true or false if data.piao ~= nil then @@ -193,29 +179,27 @@ function M:LoadConfigData(data) if data.daniao ~= nil then _config:GetController("daniao").selectedIndex = data.daniao end - - if _config:GetChild("fourBeltThree") then - _config:GetChild("fourBeltThree").selected=data.fourDaiTwo - end - - if _config:GetChild("fourBeltTwo") then - _config:GetChild("fourBeltTwo").selected=data.fourDaiThree - end - - if _config:GetChild("xipai") then - _config:GetChild("xipai").selected=data.xi_pai - end - - - if oldGameVersion==2 then - self.xipaiValueText.text=data.xi_pai_score/1000 - self.xipaiValue=data.xi_pai_score/1000 - self.anchouValueText.text=data.an_chou_score/1000 - self.anchouValue=data.an_chou_score/1000 - - end - + if _config:GetChild("fourBeltThree") then + _config:GetChild("fourBeltThree").selected = data.fourDaiTwo + end + + if _config:GetChild("fourBeltTwo") then + _config:GetChild("fourBeltTwo").selected = data.fourDaiThree + end + + if _config:GetChild("xipai") then + _config:GetChild("xipai").selected = data.xi_pai + end + + + if oldGameVersion == 2 then + self.xipaiValueText.text = data.xi_pai_score / 1000 + self.xipaiValue = data.xi_pai_score / 1000 + + self.anchouValueText.text = data.an_chou_score / 1000 + self.anchouValue = data.an_chou_score / 1000 + end end function M:SelectedConfigData() @@ -241,23 +225,23 @@ function M:SelectedConfigData() local ba = _config:GetChild("boom_add").selected and 1 or 0 local fs = _config:GetChild("fan_sprint").selected and 1 or 0 - ----- - local fourDaiTwo=false - if _config:GetChild("fourBeltThree") then - fourDaiTwo = _config:GetChild("fourBeltThree").selected - end - - local fourDaiThree=false - if _config:GetChild("fourBeltTwo") then - fourDaiThree = _config:GetChild("fourBeltTwo").selected - end - - local xi_pai=false - if _config:GetChild("xipai") then - xi_pai = _config:GetChild("xipai").selected - end - - ---- + ----- + local fourDaiTwo = false + if _config:GetChild("fourBeltThree") then + fourDaiTwo = _config:GetChild("fourBeltThree").selected + end + + local fourDaiThree = false + if _config:GetChild("fourBeltTwo") then + fourDaiThree = _config:GetChild("fourBeltTwo").selected + end + + local xi_pai = false + if _config:GetChild("xipai") then + xi_pai = _config:GetChild("xipai").selected + end + + ---- local _data = {} _data["account_id"] = DataManager.SelfUser.Id _data["opt"] = round + 1 @@ -278,17 +262,16 @@ function M:SelectedConfigData() _data["sandaidan"] = sandaidan _data["ba"] = ba _data["fs"] = fs - - _data["fourDaiTwo"] = fourDaiTwo - _data["fourDaiThree"] = fourDaiThree - + _data["fourDaiTwo"] = fourDaiTwo + _data["fourDaiThree"] = fourDaiThree + + if willBeOut == 1 then -- body _data["planelack"] = 0 _data["threelack"] = 0 else - if sandaidan == 1 then _data["planelack"] = 0 _data["threelack"] = 0 @@ -297,20 +280,20 @@ function M:SelectedConfigData() _data["threelack"] = threelack end end - - _data['xi_pai'] = xi_pai - - local xi_pai_score=0 - local an_chou_score=0 - if oldGameVersion==2 then - xi_pai_score=self.xipaiValue - an_chou_score=self.anchouValue - end - - _data['xi_pai_score'] = xi_pai_score*1000 - _data['an_chou_score'] = an_chou_score*1000 - + _data['xi_pai'] = xi_pai + + local xi_pai_score = 0 + local an_chou_score = 0 + + if oldGameVersion == 2 then + xi_pai_score = self.xipaiValue + an_chou_score = self.anchouValue + end + + _data['xi_pai_score'] = xi_pai_score * 1000 + _data['an_chou_score'] = an_chou_score * 1000 + return _data end diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua index 68b66d3d..708077cf 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua @@ -175,12 +175,15 @@ function M:InitData_One(data, winseat, over, roomid, remaincards) local tili = "" local limit = "" if player.hp_info.round_actual_hp > 0 then - tili = "(+" .. d2ad(player.hp_info.round_actual_hp) .. ")" + -- tili = "(+" .. d2ad(player.hp_info.round_actual_hp) .. ")" + tili = "(+" .. roundScore .. ")" if player.hp_info.upper_limit then limit = "达到上限" end else - tili = "(" .. d2ad(player.hp_info.round_actual_hp) .. ")" + -- tili = "(" .. d2ad(player.hp_info.round_actual_hp) .. ")" + tili = "(" .. roundScore .. ")" + if player.hp_info.upper_limit then limit = "达到下限" end @@ -325,4 +328,219 @@ function M:InitData(data, winseat, roomid) end end +function M:InitBigResult(room, fontsize) + local big_result = self._view:GetChild('big_result') + if big_result ~= nil then + local player_list = big_result:GetChild('player_list') + player_list:RemoveChildrenToPool() + + big_result:GetChild('txt_room_id').text = '房号:' .. self._resultInfo.room_id + big_result:GetChild('txt_game_name').text = self._resultInfo.game_name + big_result:GetChild('txt_game_data').text = os.date('%Y-%m-%d %H:%M', os.time()) + + local str_roominfo = string.gsub(room.room_config:GetDes(), '\r', '') + big_result:GetChild('txt_play').text = str_roominfo + + if room.hpOnOff == 1 and room.score_times ~= 1 then + big_result:GetChild('txt_time').text = '倍数：' .. tostring(room.score_times) + big_result:GetController('time').selectedIndex = 1 + end + + local maxScore = 0 + local isWin = false + local flag_new = big_result:GetChild('flag_tempNew') + for i = 1, #self._resultInfo.player_list do + local player_info = self._resultInfo.player_list[i] + + local total_score = room:GetTotalScore(player_info.score) + local hp_nonnegative = room:checkHpNonnegative() + player_info.total_score = 0 + if hp_nonnegative then + local hp_info = player_info.hp_info + player_info.total_score = d2ad(hp_info.total_hp) + else + player_info.total_score = total_score + end + + if player_info.score > maxScore then + maxScore = player_info.score + end + + if player_info.id == room.self_player.self_user.account_id then + if player_info.total_score >= 0 then + isWin = true + end + end + end + + if isWin then + big_result:GetController('result').selectedIndex = 1 + else + big_result:GetController('result').selectedIndex = 0 + end + + for i = 1, #self._resultInfo.player_list do + local player_info = self._resultInfo.player_list[i] + + local item2 + if player_info.id == room.self_player.self_user.account_id then + if isWin then + item2 = big_result:GetChild('play_win') + else + item2 = big_result:GetChild('play_lose') + end + else + if not isWin then + item2 = big_result:GetChild('play_win') + else + item2 = big_result:GetChild('play_lose') + end + end + local item = player_list:AddItemFromPool() + item:GetChild('txt_name').text = player_info.nick + item2:GetChild('txt_name').text = player_info.nick + item2:GetChild('txt_id').text = player_info.id + + local head = item:GetChild('head'):GetChild('n4') + ImageLoad.Load(player_info.head_url, head) + local head = item2:GetChild('head'):GetChild('n4') + ImageLoad.Load(player_info.head_url, head) + + if player_info.entrust ~= nil and player_info.entrust == true then + item:GetController('entrust').selectedIndex = 1 + else + item:GetController('entrust').selectedIndex = 0 + end + + if player_info.hp_info ~= nil and player_info.hp_info.cur_hp ~= nil then + item:GetChild('txt_reserve_hp').text = '积分:' .. tostring(d2ad(player_info.hp_info.cur_hp)) + end + + if player_info.total_score ~= nil then + if tostring(player_info.score) == tostring(maxScore) and player_info.score > 0 then + item:GetController('big_win').selectedIndex = 1 + else + item:GetController('big_win').selectedIndex = 0 + end + + if player_info.total_score >= 0 then + item:GetController('pn').selectedIndex = 1 + item:GetChild('txt_positive').text = '+' .. tostring(player_info.total_score) + item2:GetChild('txt_navigate').text = string.format("总战绩:+%s", player_info.total_score) + item2:GetChild('txt_daniao').text = string.format("打鸟 +%s", player_info.daniao) + item2:GetChild('text_zongjifen').text = player_info.total_score - player_info.daniao + else + item:GetController('pn').selectedIndex = 0 + item:GetChild('txt_navigate').text = tostring(player_info.total_score) + item2:GetChild('txt_navigate').text = string.format("总战绩:%s", player_info.total_score) + item2:GetChild('txt_daniao').text = string.format("打鸟 %s", player_info.daniao) + item2:GetChild('text_zongjifen').text = player_info.total_score - player_info.daniao + end + end + + player_info.score = room:GetTotalScore(player_info.score) + + local list_param = item:GetChild('list_param') + list_param:RemoveChildrenToPool() + if self._gameStatisticsLineSpacing ~= nil then + list_param.lineGap = self._gameStatisticsLineSpacing + end + + if player_info.param ~= nil then + local big = false + if #player_info.param <= 4 then + big = true + end + + for i = 1, #player_info.param do + local pitem = list_param:AddItemFromPool() + + pitem:GetChild('txt_key').text = player_info.param[i].key + pitem:GetChild('txt_value').text = player_info.param[i].value + + if fontsize ~= nil and fontsize > 0 then + pitem:GetChild('txt_key').textFormat.size = fontsize + pitem:GetChild('txt_value').textFormat.size = fontsize + else + if big then + pitem:GetChild('txt_key').textFormat.size = 30 + pitem:GetChild('txt_value').textFormat.size = 30 + else + pitem:GetChild('txt_key').textFormat.size = 24 + pitem:GetChild('txt_value').textFormat.size = 24 + end + end + end + end + + local list_param = item2:GetChild('list_param') + list_param:RemoveChildrenToPool() + if self._gameStatisticsLineSpacing ~= nil then + list_param.lineGap = self._gameStatisticsLineSpacing + end + + if player_info.param ~= nil then + local big = false + if #player_info.param <= 4 then + big = true + end + + for i = 1, #player_info.param do + local pitem = list_param:AddItemFromPool() + + pitem:GetChild('txt_key').text = player_info.param[i].key + pitem:GetChild('txt_value').text = player_info.param[i].value + + if fontsize ~= nil and fontsize > 0 then + pitem:GetChild('txt_key').textFormat.size = fontsize + pitem:GetChild('txt_value').textFormat.size = fontsize + else + if big then + pitem:GetChild('txt_key').textFormat.size = 30 + pitem:GetChild('txt_value').textFormat.size = 30 + else + pitem:GetChild('txt_key').textFormat.size = 24 + pitem:GetChild('txt_value').textFormat.size = 24 + end + end + end + end + + local flag = item:GetChild('flag') + flag:RemoveChildrenToPool() + if player_info.flag ~= nil and #player_info.flag > 0 then + for i = 1, #player_info.flag do + local pitem = flag:AddItemFromPool() + + pitem:GetChild('txt_name').text = player_info.flag[i] + end + item:GetController('have_flag').selectedIndex = 1 + else + item:GetController('have_flag').selectedIndex = 0 + end + + if player_info.id == room.self_player.self_user.account_id then + item:GetController('self').selectedIndex = 1 + else + item:GetController('self').selectedIndex = 0 + end + end + + local btn_continue_game = big_result:GetChild('btn_continue_game') + if btn_continue_game then + local gid = room.group_id + if gid ~= 0 then + btn_continue_game.visible = true + local pid = room.room_config.pid + local game_id = room.game_id + btn_continue_game.onClick:Set( + function() + self:ContinueGame(gid, pid, game_id) + end + ) + end + end + end +end + return M diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png index 85f03107..e078dbbb 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes index 8d46756e..f8239774 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png index 78256ea4..ab4b6654 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes index 51849c74..0e96c4ac 100644 Binary files a/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ diff --git a/wb_new_ui/.objs/metas/0khx14ar/e0py2.info b/wb_new_ui/.objs/metas/0khx14ar/e0py2.info index 2b254b08..11074b7a 100644 --- a/wb_new_ui/.objs/metas/0khx14ar/e0py2.info +++ b/wb_new_ui/.objs/metas/0khx14ar/e0py2.info @@ -8,9 +8,6 @@ }, "n18_nld2": { "hidden": true - }, - "n20_nld2": { - "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info b/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info index d7433b51..e733cca6 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/nlwcgk.info @@ -12,6 +12,9 @@ "n24_cvc8": { "hidden": true }, + "n18_ovii": { + "hidden": true + }, "n6_nlwc": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info index 557bb9ad..8bd9061a 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info +++ b/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info @@ -6,8 +6,8 @@ "n214_ovii": { "hidden": true }, - "n233_o6b1": { - "hidden": true + "n191_xsk4": { + "collapsed": true }, "n204_jvvo": { "hidden": true @@ -28,10 +28,10 @@ "n228_csp4": { "hidden": true }, - "n240_n6w8": { + "n153_cioe": { "hidden": true }, - "n153_cioe": { + "n233_o6b1": { "hidden": true }, "n229_csp4": { @@ -42,6 +42,9 @@ }, "n171_mpll": { "hidden": true + }, + "n261_imp5": { + "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info b/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info index d5f04d1e..06937148 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info +++ b/wb_new_ui/.objs/metas/m7iejg46/cioeho9.info @@ -3,6 +3,9 @@ "n107_sbng": { "hidden": true }, + "n130_yre9": { + "collapsed": true + }, "n79_nk4v": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/m7iejg46/gls1hif.info b/wb_new_ui/.objs/metas/m7iejg46/gls1hif.info new file mode 100644 index 00000000..dea2072f --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/gls1hif.info @@ -0,0 +1,25 @@ +{ + "objectStatus": { + "n8_zgn4": { + "hidden": true + }, + "n11_cpin": { + "hidden": true + }, + "n12_cpin": { + "hidden": true + }, + "n4_gls1": { + "hidden": true + }, + "n10_cpin": { + "hidden": true + }, + "n9_zgn4": { + "hidden": true + }, + "n7_zgn4": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info b/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info new file mode 100644 index 00000000..c2a07736 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57igy.info @@ -0,0 +1,10 @@ +{ + "objectStatus": { + "n136_ilon": { + "hidden": true + }, + "n69_jd7v": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info b/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info new file mode 100644 index 00000000..04ea0be8 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57ih1.info @@ -0,0 +1,13 @@ +{ + "objectStatus": { + "n77_m16m": { + "hidden": true + }, + "n26_kwi0": { + "hidden": true + }, + "n72_mtk5": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57ih3.info b/wb_new_ui/.objs/metas/m7iejg46/imp57ih3.info new file mode 100644 index 00000000..cb31a427 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57ih3.info @@ -0,0 +1,25 @@ +{ + "objectStatus": { + "n69_jd7v": { + "hidden": true + }, + "n154_imp5": { + "hidden": true + }, + "n20_kwi0": { + "hidden": true + }, + "n153_imp5": { + "hidden": true + }, + "n136_ilon": { + "hidden": true + }, + "n143_imp5": { + "hidden": true + }, + "n47_tqi8": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57ih4.info b/wb_new_ui/.objs/metas/m7iejg46/imp57ih4.info new file mode 100644 index 00000000..66eecb63 --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57ih4.info @@ -0,0 +1,31 @@ +{ + "objectStatus": { + "n4_kwi0": { + "hidden": true + }, + "n78_imp5": { + "hidden": true + }, + "n5_kwi0": { + "hidden": true + }, + "n77_m16m": { + "hidden": true + }, + "n79_imp5": { + "hidden": true + }, + "n72_mtk5": { + "hidden": true + }, + "n17_kwi0": { + "hidden": true + }, + "n26_kwi0": { + "hidden": true + }, + "n73_ilon": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57ih5.info b/wb_new_ui/.objs/metas/m7iejg46/imp57ih5.info new file mode 100644 index 00000000..3fda244b --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/imp57ih5.info @@ -0,0 +1,22 @@ +{ + "objectStatus": { + "n78_imp5": { + "hidden": true + }, + "n74_ilon": { + "hidden": true + }, + "n77_m16m": { + "hidden": true + }, + "n79_imp5": { + "hidden": true + }, + "n72_mtk5": { + "hidden": true + }, + "n26_kwi0": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info b/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info index 13b6e983..2aed06cb 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info +++ b/wb_new_ui/.objs/metas/m7iejg46/mpllhv2.info @@ -3,20 +3,17 @@ "n156_g21o": { "collapsed": true }, - "n198_r0qx": { - "hidden": true - }, - "n146_r4s4": { - "collapsed": true - }, "n131_kwi0": { "collapsed": true }, - "n153_g21o": { - "collapsed": true + "n198_r0qx": { + "hidden": true }, "n147_r4s4": { "collapsed": true + }, + "n146_r4s4": { + "collapsed": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info b/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info index 9e26dfee..76876725 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ozazhxs.info @@ -1 +1,10 @@ -{} \ No newline at end of file +{ + "objectStatus": { + "n84_zgn4": { + "hidden": true + }, + "n86_cpin": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/assets/Hotupdate/Version.xml b/wb_new_ui/assets/Hotupdate/Version.xml index 849d3a60..0469daf7 100644 --- a/wb_new_ui/assets/Hotupdate/Version.xml +++ b/wb_new_ui/assets/Hotupdate/Version.xml @@ -12,7 +12,7 @@ - + diff --git a/wb_new_ui/assets/Lobby/Main.xml b/wb_new_ui/assets/Lobby/Main.xml index b53d6c2a..2d49623c 100644 --- a/wb_new_ui/assets/Lobby/Main.xml +++ b/wb_new_ui/assets/Lobby/Main.xml @@ -8,7 +8,7 @@ - + diff --git a/wb_new_ui/assets/Lobby/component/group/component/guoup_item.xml b/wb_new_ui/assets/Lobby/component/group/component/guoup_item.xml index d82f4381..ac96dab9 100644 --- a/wb_new_ui/assets/Lobby/component/group/component/guoup_item.xml +++ b/wb_new_ui/assets/Lobby/component/group/component/guoup_item.xml @@ -5,14 +5,14 @@ - - + + - + diff --git a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml index 581d6e92..bf9c1d54 100644 --- a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml +++ b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml @@ -13,6 +13,7 @@ + @@ -37,40 +38,39 @@