xiangtang
/
liushun_client3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

对接比赛分管理，分成，数据

master
mxj 2026-07-13 21:03:28 +08:00
parent f11fe82f52
commit 613a28ca02
14 changed files with 396 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lua_probject/base_project/Game/Controller/NewGroupController.lua
View File

@ -1514,3 +1514,28 @@ function M:FG_UpdatePlay(group_id, game_id, config_data, name, hpData, hpOnOff,
callback(res) callback(res)
end) end)
end end
function M:FG_GetUnderMembers(groupId, limit, num, tagId, callback)
local _client = ControllerManager.GroupClient
local _data = {}
_data.id = groupId
_data.limit = limit
_data.num = num
_data.tagId = tagId
_client:send(Protocol.GET_UNDER_MEMBERS, _data, function(res)
callback(res)
end)
end
function M:FG_GetOptHp(groupId, limit, num, tagId,optType, callback)
local _client = ControllerManager.GroupClient
local _data = {}
_data.id = groupId
_data.limit = limit
_data.num = num
_data.tagId = tagId
_data.optType = optType
_client:send(Protocol.Get_Opt_Hp, _data, function(res)
callback(res)
end)
end

5
lua_probject/base_project/Game/Protocol.lua
View File

@ -266,6 +266,11 @@ Protocol = {
GET_BANK_HP = "group/get_bank_hp", --获取银行信息 GET_BANK_HP = "group/get_bank_hp", --获取银行信息
TAKE_BANK_HP = "group/take_bank_hp", TAKE_BANK_HP = "group/take_bank_hp",
SAVE_BANK_HP = "group/save_bake_hp", SAVE_BANK_HP = "group/save_bake_hp",
-------------- group-static---------------------
GET_UNDER_MEMBERS = "group/static/get_under_members",
Get_Opt_Hp = "group/static/get_opt_hp",
-------------- group-static---------------------
---
-------------- group-log--------------------- -------------- group-log---------------------
-- 获取奖励日志 -- 获取奖励日志
WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log", WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log",

178
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMatchFagListView.lua
View File

@ -20,25 +20,21 @@ function GroupMngMatchFagListView.new(group_id)
end end
function M:initData() function M:initData()
self.fag_result_data = {} self.fag_result_data = {}
self.fag_data = {} self.fag_data = {}
if self._view:GetController("page").selectedIndex < 2 then if self._view:GetController("page").selectedIndex < 2 then
self:GetFagData(0) self:GetFagData(0)
else else
self:GetMngFagInfo() self:GetMngFagInfo()
end end
local group = DataManager.groups:get(self.group_id) local group = DataManager.groups:get(self.group_id)
if group.lev < 3 then if group.lev < 3 then
self:GetHpStatistic() self:GetHpStatistic()
end end
end end
function M:FillView() function M:FillView()
self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupMatchFagList") self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupMatchFagList")
local group = DataManager.groups:get(self.group_id) local group = DataManager.groups:get(self.group_id)
if group.lev < 3 then if group.lev < 3 then
@ -48,7 +44,7 @@ function M:FillView()
self.lst_fag = self._view:GetChild("lst_fag") self.lst_fag = self._view:GetChild("lst_fag")
self.lst_fag:SetVirtual() self.lst_fag:SetVirtual()
self.lst_fag.itemRenderer = function(index, obj) self.lst_fag.itemRenderer = function(index, obj)
self:OnRenderItem(index, obj) self:OnRenderItem(index, obj)
end end
self.lst_fag.scrollPane.onPullUpRelease:Set(function() self.lst_fag.scrollPane.onPullUpRelease:Set(function()
self:GetFagData(self.lst_fag.numItems) self:GetFagData(self.lst_fag.numItems)
@ -56,7 +52,7 @@ function M:FillView()
self.lst_fag_result = self._view:GetChild("lst_fag_result") self.lst_fag_result = self._view:GetChild("lst_fag_result")
self.lst_fag_result:SetVirtual() self.lst_fag_result:SetVirtual()
self.lst_fag_result.itemRenderer = function(index, obj) self.lst_fag_result.itemRenderer = function(index, obj)
self:OnRenderItem(index, obj) self:OnRenderItem(index, obj)
end end
self.lst_fag_result.scrollPane.onPullUpRelease:Set(function() self.lst_fag_result.scrollPane.onPullUpRelease:Set(function()
self:GetFagData(self.lst_fag_result.numItems) self:GetFagData(self.lst_fag_result.numItems)
@ -64,24 +60,23 @@ function M:FillView()
-- 切换页面事件，1,2页为上下分，3页是管理员总计 -- 切换页面事件，1,2页为上下分，3页是管理员总计
self._view:GetController("page").onChanged:Set(function() self._view:GetController("page").onChanged:Set(function()
if self._view:GetController("page").selectedIndex < 2 then if self._view:GetController("page").selectedIndex < 2 then
if self._view:GetController("search").selectedIndex == 0 then if self._view:GetController("search").selectedIndex == 0 then
self.quary_id = 0 self.quary_id = 0
self.query_nick = "" self.query_nick = ""
self.fag_data = {} self.fag_data = {}
self:GetFagData(0) self:GetFagData(0)
else else
self.quary_id = 0 self.quary_id = 0
self.query_nick = "" self.query_nick = ""
self.fag_result_data = {} self.fag_result_data = {}
self:GetFagData(0) self:GetFagData(0)
end end
else else
self:GetMngFagInfo() self:GetMngFagInfo()
end end
end) end)
self._view:GetChild("btn_search").onClick:Set(function() self._view:GetChild("btn_search").onClick:Set(function()
@ -94,11 +89,12 @@ function M:FillView()
self:GetFagData(0) self:GetFagData(0)
end) end)
self._view:GetChild("btn_back").onClick:Set(function() self._view:GetChild("btn_back").onClick:Set(function()
self.quary_id = 0 self.quary_id = 0
self.query_nick = "" self.query_nick = ""
end) end)
self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, function() self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"),
self._view:GetChild("btn_date2"), -308, 0, function()
self:GetMngFagInfo() self:GetMngFagInfo()
end) end)
end end
@ -109,56 +105,64 @@ function M:GetFagData(index)
qid = self.quary_id or 0 qid = self.quary_id or 0
qName = self.query_nick or "" qName = self.query_nick or ""
-- 重新获取数据时，清空数据列表 -- 重新获取数据时，清空数据列表
if index == 0 then if index == 0 then
if qid == 0 then if qid == 0 then
self.fag_data = {} self.fag_data = {}
else else
self.fag_result_data = {} self.fag_result_data = {}
end end
end end
ViewUtil.ShowModalWait(nil) ViewUtil.ShowModalWait(nil)
--type：1管理员加分，2管理员减分，3合伙人加分，4合伙人减分 --type：1管理员加分，2管理员减分，3合伙人加分，4合伙人减分
local type = self._view:GetController("page").selectedIndex + 1 local type = self._view:GetController("page").selectedIndex + 1
local group = DataManager.groups:get(self.group_id) local group = DataManager.groups:get(self.group_id)
if group.lev == 3 then if group.lev == 3 then
type = type + 2 type = type + 2
end end
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GetMngHpLog(self.group_id, index, num, type, qid, qName, function(res) fgCtr:FG_GetOptHp(
ViewUtil.CloseModalWait() self.group_id,
if self._is_destroy then index,
return 6,
end -1,
if res.ReturnCode ~= 0 then 0,
ViewUtil.ErrorTip(res.ReturnCode, "获取积分记录失败") function(res)
else ViewUtil.CloseModalWait()
if res.Data.hp_logs ~= nil then if self._is_destroy then
local data = res.Data.hp_logs return
-- if #data == 0 then return end
local local_data = self.fag_data
local lst = self.lst_fag
if qid ~= 0 or self.query_nick ~= "" then
local_data = self.fag_result_data
lst = self.lst_fag_result
self._view:GetController("search").selectedIndex = 1
else
self._view:GetController("search").selectedIndex = 0
end
for i = 1, #data do
local_data[#local_data + 1] = data[i]
end
lst.numItems = #local_data
end end
end if res.ReturnCode ~= 0 then
end) ViewUtil.ErrorTip(res.ReturnCode, "获取积分记录失败")
else
printlog("----------------2222222222---------")
pt(res.Data )
if res.Data.members ~= nil then
local data = res.Data.members
-- if #data == 0 then return end
local local_data = self.fag_data
local lst = self.lst_fag
if qid ~= 0 or self.query_nick ~= "" then
local_data = self.fag_result_data
lst = self.lst_fag_result
self._view:GetController("search").selectedIndex = 1
else
self._view:GetController("search").selectedIndex = 0
end
for i = 1, #data do
local_data[#local_data + 1] = data[i]
end
lst.numItems = #local_data
end
end
end)
end end
-- 获取体力值统计 -- 获取体力值统计
function M:GetHpStatistic() function M:GetHpStatistic()
-- ViewUtil.ShowModalWait(nil, "正在获取数据") -- ViewUtil.ShowModalWait(nil, "正在获取数据")
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GetMngHpStatistic(self.group_id, function(res) fgCtr:FG_GetMngHpStatistic(self.group_id, function(res)
-- ViewUtil.CloseModalWait() -- ViewUtil.CloseModalWait()
if self._is_destroy then if self._is_destroy then
return return
@ -166,17 +170,17 @@ function M:GetHpStatistic()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "获取积分记录失败") ViewUtil.ErrorTip(res.ReturnCode, "获取积分记录失败")
else else
self._view:GetChild("tex_yd_cost").text = d2ad(res.Data.last_hp_cost) self._view:GetChild("tex_yd_cost").text = d2ad(res.Data.last_hp_cost)
self._view:GetChild("tex_td_cost").text = d2ad(res.Data.hp_cost) self._view:GetChild("tex_td_cost").text = d2ad(res.Data.hp_cost)
self._view:GetChild("tex_add").text = d2ad(res.Data.hp_upper) self._view:GetChild("tex_add").text = d2ad(res.Data.hp_upper)
self._view:GetChild("tex_minus").text = d2ad(res.Data.hp_sub) self._view:GetChild("tex_minus").text = d2ad(res.Data.hp_sub)
end end
end) end)
end end
-- 获取管理员总计/合伙人总计 -- 获取管理员总计/合伙人总计
function M:GetMngFagInfo() function M:GetMngFagInfo()
ViewUtil.ShowModalWait(nil) ViewUtil.ShowModalWait(nil)
local begin_time, end_time = self.time_panel1:GetDate() local begin_time, end_time = self.time_panel1:GetDate()
local group = DataManager.groups:get(self.group_id) local group = DataManager.groups:get(self.group_id)
local type = group.lev < 3 and 1 or 2 local type = group.lev < 3 and 1 or 2
@ -189,41 +193,41 @@ function M:GetMngFagInfo()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "获取积分详情失败") ViewUtil.ErrorTip(res.ReturnCode, "获取积分详情失败")
else else
local add_count = 0 local add_count = 0
local minus_count = 0 local minus_count = 0
local lst_fag_info = self._view:GetChild("lst_mgr_data") local lst_fag_info = self._view:GetChild("lst_mgr_data")
lst_fag_info:RemoveChildrenToPool() lst_fag_info:RemoveChildrenToPool()
for i = 1, #res.Data.infos do for i = 1, #res.Data.infos do
local data = res.Data.infos[i] local data = res.Data.infos[i]
local item = lst_fag_info:AddItemFromPool() local item = lst_fag_info:AddItemFromPool()
item:GetChild("tex_mgr").text = not data.lev and "合伙人" or (data.lev == 1 and "盟主" or "副盟主") item:GetChild("tex_mgr").text = not data.lev and "合伙人" or (data.lev == 1 and "盟主" or "副盟主")
item:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) item:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick)
item:GetChild("tex_add").text = d2ad(data.hp_upper) item:GetChild("tex_add").text = d2ad(data.hp_upper)
item:GetChild("tex_minus").text = d2ad(data.hp_sub) item:GetChild("tex_minus").text = d2ad(data.hp_sub)
add_count = add_count + data.hp_upper add_count = add_count + data.hp_upper
minus_count = minus_count + data.hp_sub minus_count = minus_count + data.hp_sub
end end
self._view:GetChild("tex_add2").text = d2ad(add_count) self._view:GetChild("tex_add2").text = d2ad(add_count)
self._view:GetChild("tex_minus2").text = d2ad(minus_count) self._view:GetChild("tex_minus2").text = d2ad(minus_count)
end end
end) end)
end end
-- 填充对象 -- 填充对象
function M:OnRenderItem(index, obj) function M:OnRenderItem(index, obj)
local local_data = (self.quary_id == 0 and self.query_nick == "" ) and self.fag_data or self.fag_result_data local local_data = (self.quary_id == 0 and self.query_nick == "") and self.fag_data or self.fag_result_data
local rdata = local_data[index + 1] local rdata = local_data[index + 1]
local num = d2ad(rdata.hp) local num = d2ad(rdata.hp)
obj:GetChild("tex_mgr_name").text = ViewUtil.stringEllipsis(rdata.m_nick) obj:GetChild("tex_mgr_name").text = ViewUtil.stringEllipsis(rdata.m_nick)
obj:GetChild("tex_mgr_id").text = rdata.mgr_id obj:GetChild("tex_mgr_id").text = rdata.mgr_id
obj:GetChild("tex_obj_name").text = ViewUtil.stringEllipsis(rdata.t_nick) obj:GetChild("tex_obj_name").text = ViewUtil.stringEllipsis(rdata.t_nick)
obj:GetChild("tex_id").text = rdata.uid obj:GetChild("tex_id").text = rdata.uid
obj:GetChild("tex_num").text = num >= 0 and "+".. num or num obj:GetChild("tex_num").text = num >= 0 and "+" .. num or num
obj:GetController("add").selectedIndex = num >=0 and 1 or 0 obj:GetController("add").selectedIndex = num >= 0 and 1 or 0
obj:GetChild("tex_left").text = d2ad(rdata.cur_hp) obj:GetChild("tex_left").text = d2ad(rdata.cur_hp)
obj:GetChild("tex_reason_name_id").text = "给"..ViewUtil.stringEllipsis(rdata.t_nick).. obj:GetChild("tex_reason_name_id").text = "给" .. ViewUtil.stringEllipsis(rdata.t_nick) ..
"(ID:"..rdata.uid..")增加\n"..num.."比赛分" "(ID:" .. rdata.uid .. ")增加\n" .. num .. "比赛分"
obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M",rdata.time) obj:GetChild("tex_time").text = os.date("%Y-%m-%d\n%H:%M", rdata.time)
end end
return M return M

193
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua
View File

@ -4,8 +4,8 @@ local GroupMemberFagLogView = import('.GroupMemberFagLogView')
local GroupSetPermissionView = import('.GroupSetPermissionView') local GroupSetPermissionView = import('.GroupSetPermissionView')
local GroupBanSameTableView = import('.GroupBanSameTableView') local GroupBanSameTableView = import('.GroupBanSameTableView')
local GroupMemberOperateView = import('.GroupMemberOperateView') local GroupMemberOperateView = import('.GroupMemberOperateView')
local GroupAddMemberInfoView=import('.GroupAddMemberInfoView') local GroupAddMemberInfoView = import('.GroupAddMemberInfoView')
local GroupSetUpTeamAlertSystemView=import('..GroupSetUpTeamAlertSystemView') local GroupSetUpTeamAlertSystemView = import('..GroupSetUpTeamAlertSystemView')
local MngPermission = import('.MngPermission') local MngPermission = import('.MngPermission')
@ -20,6 +20,7 @@ function GroupMngMemberListView.new(group_id, blur_view)
self.class = 'GroupMngMemberListView' self.class = 'GroupMngMemberListView'
self.group_id = group_id self.group_id = group_id
self.member_data = {} self.member_data = {}
self.total_data = {}
self:FillView() self:FillView()
return self return self
end end
@ -58,6 +59,7 @@ function M:FillView()
-- 初始化成员列表 -- 初始化成员列表
self.lst_member = self._view:GetChild('lst_member') self.lst_member = self._view:GetChild('lst_member')
self.lst_member:SetVirtual() self.lst_member:SetVirtual()
self.lst_member.itemRenderer = function(index, obj) self.lst_member.itemRenderer = function(index, obj)
self:OnRenderItem(index, obj) self:OnRenderItem(index, obj)
end end
@ -67,18 +69,23 @@ function M:FillView()
self:GetMemberData(self.lst_member.numItems) self:GetMemberData(self.lst_member.numItems)
end end
) )
local btn_detail1 = self._view:GetChild("bth_SetUpTeamAlertSystem") local btn_detail1 = self._view:GetChild("bth_SetUpTeamAlertSystem")
-- 【新增】判断按钮是否存在 -- 【新增】判断按钮是否存在
if btn_detail1 then if btn_detail1 then
btn_detail1.onClick:Set(function() btn_detail1.onClick:Set(function()
local gniv1 = GroupSetUpTeamAlertSystemView.new(self.group_id) local gniv1 = GroupSetUpTeamAlertSystemView.new(self.group_id)
gniv1:Show() gniv1:Show()
end) end)
end end
--local n50=self._view:GetChild('n50')
--print(n50)
--n50.displayObject.gameObject.transform.localPosition.x=214
--print(n50.displayObject.gameObject.transform.localPosition.x)
--local n50=self._view:GetChild('n50')
--print(n50)
--n50.displayObject.gameObject.transform.localPosition.x=214
--print(n50.displayObject.gameObject.transform.localPosition.x)
-- 搜索玩家 -- 搜索玩家
local ctr_search = self._view:GetController('search') local ctr_search = self._view:GetController('search')
self._view:GetChild('btn_search').onClick:Set( self._view:GetChild('btn_search').onClick:Set(
@ -92,10 +99,14 @@ function M:FillView()
return return
end end
qid = tonumber(text) or 0 qid = tonumber(text) or 0
printlog("sssssssssssssssaaaaaaaaaaaaaa", qid)
qnick = text qnick = text
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_FindMember( fgCtr:FG_GetUnderMembers(
self.group_id, self.group_id,
0,
6,
qid, qid,
function(res) function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
@ -105,14 +116,14 @@ function M:FillView()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, '找不到成员') ViewUtil.ErrorTip(res.ReturnCode, '找不到成员')
else else
self._view:GetChild('tex_id').text = ''
ctr_search.selectedIndex = 1 ctr_search.selectedIndex = 1
local item_result = self._view:GetChild('lst_member_find') local item_result = self._view:GetChild('lst_member_find')
item_result:RemoveChildrenToPool() item_result:RemoveChildrenToPool()
for j = 1, #res.Data.members do for j = 1, #res.Data.members do
local tem = item_result:AddItemFromPool() local tem = item_result:AddItemFromPool()
self:FillItem(tem, res.Data.members[j], true) self:FillItem(tem, res.Data.members[j], true)
end end
end end
end, end,
@ -157,7 +168,7 @@ function M:FillView()
function(response) function(response)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if (response.ReturnCode and response.ReturnCode == 0) then if (response.ReturnCode and response.ReturnCode == 0) then
GroupAddMemberInfoView.new(self.group_id,tonumber(self._texnum_str)):SetAddMember(response.Data) GroupAddMemberInfoView.new(self.group_id, tonumber(self._texnum_str)):SetAddMember(response.Data)
self:ClearNumTex() self:ClearNumTex()
--ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1) --ViewUtil.ShowBannerOnScreenCenter('添加成功！', 1)
else else
@ -180,9 +191,6 @@ function M:FillView()
self:initData() self:initData()
end end
) )
end end
-- 快速访问 -- 快速访问
@ -193,8 +201,6 @@ end
-- 获取成员数据 -- 获取成员数据
function M:GetMemberData(index) function M:GetMemberData(index)
--print("11111111111111111111")
--print(debug.traceback())
local group = DataManager.groups:get(self.group_id) local group = DataManager.groups:get(self.group_id)
if index == 0 then if index == 0 then
group:clearMember() group:clearMember()
@ -202,22 +208,38 @@ function M:GetMemberData(index)
ViewUtil.ShowModalWait(nil) ViewUtil.ShowModalWait(nil)
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GroupMembers11( fgCtr:FG_GetUnderMembers(
self.group_id, self.group_id,
index, index,
6, 6,
false, -1,
1,
function(res) function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败') ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败')
else else
self.member_data = group.members local newMembers = res.Data.members
self.lst_member.numItems = group.member_num
-- 实现先清空，后拼接逻辑
if index == 0 then 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) self.member_data = newMembers
else
-- 加载更多：将新数据拼接到现有数据后面
for i = 1, #newMembers do
table.insert(self.member_data, newMembers[i])
end
end
self.lst_member.numItems = #self.member_data
self.total_data = res.Data.total
local total = self.total_data[1]
if total then
local tex_name_hp = self._view:GetChild('tex_name_hp')
tex_name_hp.text = total.sumHp
local tex_total_hp = self._view:GetChild('tex_total_hp')
tex_total_hp.text = total.t_hp1
end end
end end
end end
@ -225,48 +247,48 @@ function M:GetMemberData(index)
end end
-- 修改体力值 -- 修改体力值
local function __change_fag(gid, pid, is_add, cur_hp,member, callback) local function __change_fag(gid, pid, is_add, cur_hp, member, callback)
local gniv = local gniv =
GroupNumberInputView.new( GroupNumberInputView.new(
member, member,
function(num) function(num)
num = ad2d((is_add and num or -num)) num = ad2d((is_add and num or -num))
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_ChangeFag( fgCtr:FG_ChangeFag(
gid, gid,
pid, pid,
num, num,
function(res1) function(res1)
ViewUtil.CloseModalWait()
ViewUtil.CloseModalWait() -- if gniv._is_destroy then
-- if gniv._is_destroy then -- return
-- return -- end
-- end if (res1.ReturnCode == 0) then
if (res1.ReturnCode == 0) then callback(res1.Data)
callback(res1.Data) else
else ViewUtil.ErrorTip(res1.ReturnCode, '更改积分失败！')
ViewUtil.ErrorTip(res1.ReturnCode, '更改积分失败！') end
end end
end
) )
-- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str -- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str
end, end,
is_add and 1 or 2, is_add and 1 or 2,
cur_hp and d2ad(cur_hp) or nil cur_hp and d2ad(cur_hp) or nil
) )
gniv:Show() gniv:Show()
end end
-- 填充成员对象 -- 填充成员对象
function M:FillItem(obj, member, refresh) function M:FillItem(obj, member, refresh)
local group = DataManager.groups:get(self.group_id) local group = DataManager.groups:get(self.group_id)
obj:GetChild('tex_name').text = ViewUtil.stringEllipsis(member.nick) obj:GetChild('tex_name').text = ViewUtil.stringEllipsis(member.nick)
obj:GetChild('btn_head').icon = 'ui://Common/Head0' obj:GetChild('btn_head').icon = 'ui://Common/Head0'
ImageLoad.Load(member.portrait, obj:GetChild('btn_head')._iconObject, self.class) ImageLoad.Load(member.portrait, obj:GetChild('btn_head')._iconObject, self.class)
-- obj.data = member.id -- obj.data = member.id
-- 显示玩家标签，合伙人、管理员 -- 显示玩家标签，合伙人、管理员
local ctr_type = obj:GetController('type') local ctr_type = obj:GetController('type')
@ -282,29 +304,15 @@ function M:FillItem(obj, member, refresh)
local tex_fag = obj:GetChild('tex_fag') local tex_fag = obj:GetChild('tex_fag')
tex_fag.text = d2ad(member.hp) tex_fag.text = d2ad(member.hp)
local tex_Safecompartment = obj:GetChild('tex_Safecompartment')
tex_Safecompartment.text = d2ad(member.bank_hp)
local tex_Numberofsuboinates = obj:GetChild('tex_Numberofsuboinates')
tex_Numberofsuboinates.text = member.underCount
obj:GetChild('tex_id').text = '' .. member.uid 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
-- obj:GetChild('tex_last_login').text = '最近登录\n' .. 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_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) local perm_array = MngPermission.getPermData(group.permission)
-- 体力值操作按钮事件 -- 体力值操作按钮事件
if group.lev < 3 or member.parentId == DataManager.SelfUser.account_id then if group.lev < 3 or member.parentId == DataManager.SelfUser.account_id then
@ -320,7 +328,6 @@ function M:FillItem(obj, member, refresh)
local mp = group:getMember(DataManager.SelfUser.account_id) local mp = group:getMember(DataManager.SelfUser.account_id)
obj:GetChild('btn_fag_add').onClick:Set( obj:GetChild('btn_fag_add').onClick:Set(
function() function()
if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then
return return
end end
@ -379,38 +386,6 @@ function M:FillItem(obj, member, refresh)
) )
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.member_data
-- self._view:GetController('search').selectedIndex = 0
-- else
-- self.lst_member.numItems = self.lst_member.numItems
-- if refresh then
-- self:FillItem(obj, member)
-- end
-- end
-- end
-- )
-- mflv:Show()
-- end
-- )
end end
function M:OnRenderItem(index, obj) function M:OnRenderItem(index, obj)

241
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua
View File

@ -19,13 +19,14 @@ function GroupMngPartnerListView.new(gid, blur_view)
self.group_id = gid self.group_id = gid
self.blur_view = blur_view self.blur_view = blur_view
self.partner_data = {} self.partner_data = {}
self.total_data = {}
self:InitView() self:InitView()
return self return self
end end
function M:initData() function M:initData()
--self._view.visible = true --self._view.visible = true
self:GetPartnerData(0) self:GetPartnerData(0)
end end
function M:InitView() function M:InitView()
@ -35,7 +36,7 @@ function M:InitView()
self.lst_partner = self._view:GetChild("lst_partner") self.lst_partner = self._view:GetChild("lst_partner")
self.lst_partner:SetVirtual() self.lst_partner:SetVirtual()
self.lst_partner.itemRenderer = function(index, obj) self.lst_partner.itemRenderer = function(index, obj)
self:OnRenderItem(index, obj) self:OnRenderItem(index, obj)
end end
self.lst_partner.scrollPane.onPullUpRelease:Set(function() self.lst_partner.scrollPane.onPullUpRelease:Set(function()
self:GetPartnerData(self.lst_partner.numItems) self:GetPartnerData(self.lst_partner.numItems)
@ -44,14 +45,14 @@ function M:InitView()
local btn_search = self._view:GetChild("btn_search") local btn_search = self._view:GetChild("btn_search")
btn_search.onClick:Set(function() btn_search.onClick:Set(function()
local text = self._view:GetChild("tex_id").text local text = self._view:GetChild("tex_id").text
local query_id = tonumber(text) or 0 local query_id = tonumber(text) or 0
local query_nick = text local query_nick = text
self._view:GetChild("tex_id").text = "" self._view:GetChild("tex_id").text = ""
self:QueryPartnerData(query_id, query_nick) self:QueryPartnerData(query_id, query_nick)
end) end)
local btn_back = self._view:GetChild("btn_back") local btn_back = self._view:GetChild("btn_back")
btn_back.onClick:Set(function() btn_back.onClick:Set(function()
self._view:GetController("search").selectedIndex = 0 self._view:GetController("search").selectedIndex = 0
end) end)
@ -61,14 +62,13 @@ function M:InitView()
self.tex_num = self._view:GetChild("tex_num") self.tex_num = self._view:GetChild("tex_num")
self:ClearNumTex() self:ClearNumTex()
for i = 0 ,9 do for i = 0, 9 do
local obj = self._view:GetChild("btn_"..i) local obj = self._view:GetChild("btn_" .. i)
obj.onClick:Add(handler(self , self.OnNumButtonAction)) obj.onClick:Add(handler(self, self.OnNumButtonAction))
i = i + 1 i = i + 1
end end
local btn_ok = self._view:GetChild("btn_ok") local btn_ok = self._view:GetChild("btn_ok")
btn_ok.onClick:Set(function() btn_ok.onClick:Set(function()
ViewUtil.ShowModalWait(nil) ViewUtil.ShowModalWait(nil)
local qid = tonumber(self._view:GetChild("tex_num").text) local qid = tonumber(self._view:GetChild("tex_num").text)
if not qid then if not qid then
@ -85,7 +85,6 @@ function M:InitView()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "找不到成员！") ViewUtil.ErrorTip(res.ReturnCode, "找不到成员！")
else else
local member = res.Data local member = res.Data
if member.parentId ~= 0 and member.parentId ~= DataManager.SelfUser.account_id then if member.parentId ~= 0 and member.parentId ~= DataManager.SelfUser.account_id then
ViewUtil.ErrorTip(res.ReturnCode, "找不到成员！") ViewUtil.ErrorTip(res.ReturnCode, "找不到成员！")
@ -97,7 +96,7 @@ function M:InitView()
return return
end end
local mflv = GroupMngAddPartner.new(self.group_id, member,function () local mflv = GroupMngAddPartner.new(self.group_id, member, function()
self:GetPartnerData(self.lst_partner.numItems) self:GetPartnerData(self.lst_partner.numItems)
self._view:GetController("page").selectedIndex = 0 self._view:GetController("page").selectedIndex = 0
end) end)
@ -106,7 +105,7 @@ function M:InitView()
end) end)
end) end)
local btn_del = self._view:GetChild("btn_del") local btn_del = self._view:GetChild("btn_del")
btn_del.onClick:Add(handler(self , self.OnNumButtonAction)) btn_del.onClick:Add(handler(self, self.OnNumButtonAction))
end end
function M:ClearNumTex() function M:ClearNumTex()
@ -116,52 +115,68 @@ function M:ClearNumTex()
end end
function M:OnNumButtonAction(context) function M:OnNumButtonAction(context)
local typer = string.sub(context.sender.name ,5) local typer = string.sub(context.sender.name, 5)
if typer == "del" then if typer == "del" then
if (self._currenIndex > 0) then if (self._currenIndex > 0) then
self._currenIndex = self._currenIndex - 1 self._currenIndex = self._currenIndex - 1
self._texnum_str = string.sub(self._texnum_str,0,self._currenIndex) self._texnum_str = string.sub(self._texnum_str, 0, self._currenIndex)
self.tex_num.text = self._texnum_str self.tex_num.text = self._texnum_str
end end
else else
if (self._currenIndex < 6) then if (self._currenIndex < 6) then
self._currenIndex = self._currenIndex + 1 self._currenIndex = self._currenIndex + 1
self._texnum_str = self._texnum_str .. typer self._texnum_str = self._texnum_str .. typer
self.tex_num.text = self._texnum_str self.tex_num.text = self._texnum_str
end end
end end
end end
-- 获取合伙人数据 -- 获取合伙人数据
function M:GetPartnerData(index,callback) function M:GetPartnerData(index, callback)
local group = DataManager.groups:get(self.group_id)
local group = DataManager.groups:get(self.group_id) if index == 0 then
if index == 0 then self.partner_data = {}
self.partner_data = {} end
end ViewUtil.ShowModalWait(nil)
ViewUtil.ShowModalWait(nil)
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_GetPartnerList(self.group_id, 0, index, 10, function(res) fgCtr:FG_GetUnderMembers(
self.group_id,
index,
6,
-1,
function(res)
ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败")
else
local newMembers = res.Data.members
ViewUtil.CloseModalWait() -- 实现先清空，后拼接逻辑
if res.ReturnCode ~= 0 then if index == 0 then
ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败") -- 第一页：清空旧数据，直接赋值新数据
else self.partner_data = newMembers
local partners = res.Data.members else
for i = 1, #partners do -- 加载更多：将新数据拼接到现有数据后面
self.partner_data[#self.partner_data + 1] = partners[i] for i = 1, #newMembers do
table.insert(self.partner_data, newMembers[i])
end
end
self.lst_partner.numItems = #self.partner_data
self.total_data = res.Data.total
local total = self.total_data[1]
if total then
local tex_name_hp = self._view:GetChild('tex_name_hp')
tex_name_hp.text = total.sumHp
local tex_total_hp = self._view:GetChild('tex_total_hp')
tex_total_hp.text = total.t_hp1
end
end end
self.lst_partner.numItems = #self.partner_data end)
end
end)
end end
-- 获取合伙人数据 -- 获取合伙人数据
function M:QueryPartnerData(query_id,query_nick) function M:QueryPartnerData(query_id, query_nick)
query_nick = query_nick or "" query_nick = query_nick or ""
query_id = query_id or 0 query_id = query_id or 0
@ -170,19 +185,17 @@ function M:QueryPartnerData(query_id,query_nick)
ViewUtil.ShowModalWait(nil) ViewUtil.ShowModalWait(nil)
local fgCtr = ControllerManager.GetController(NewGroupController) local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_QueryPartnerList(self.group_id, query_id, query_nick, function(res) fgCtr:FG_QueryPartnerList(self.group_id, query_id, query_nick, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败") ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败")
else else
if res.Data.members ~= nil and #res.Data.members > 0 then if res.Data.members ~= nil and #res.Data.members > 0 then
self._view:GetController("search").selectedIndex = 1 self._view:GetController("search").selectedIndex = 1
local lst_partner_search = self._view:GetChild("lst_partner_search") local lst_partner_search = self._view:GetChild("lst_partner_search")
lst_partner_search:RemoveChildrenToPool() lst_partner_search:RemoveChildrenToPool()
for i = 1, #res.Data.members do for i = 1, #res.Data.members do
local tem = lst_partner_search:AddItemFromPool() local tem = lst_partner_search:AddItemFromPool()
self:FillItem(tem,res.Data.members[i]) self:FillItem(tem, res.Data.members[i])
end end
else else
ViewUtil.ErrorTip(res.ReturnCode, "找不到指定的玩家") ViewUtil.ErrorTip(res.ReturnCode, "找不到指定的玩家")
@ -193,11 +206,11 @@ end
-- 管理员权限 -- 管理员权限
local MngPermissionList = { local MngPermissionList = {
DeleteMember = 1,-- 删除成员 DeleteMember = 1, -- 删除成员
AddMember = 2,--添加成员 AddMember = 2, --添加成员
SetFag = 3,--设置体力值 SetFag = 3, --设置体力值
BanPlaying = 4,--禁止游戏 BanPlaying = 4, --禁止游戏
BanSameTable = 5--禁止同桌 BanSameTable = 5 --禁止同桌
} }
local function CheckPermission(lev, permission) local function CheckPermission(lev, permission)
if lev == 2 and not permission then if lev == 2 and not permission then
@ -221,10 +234,10 @@ local function __change_fag(gid, pid, is_add, cur_hp, callback)
if (res1.ReturnCode == 0) then if (res1.ReturnCode == 0) then
callback(res1.Data) callback(res1.Data)
else else
ViewUtil.ErrorTip(res1.ReturnCode,"更改积分失败！") ViewUtil.ErrorTip(res1.ReturnCode, "更改积分失败！")
end end
end) end)
-- item:GetChild("tex_fag").text = (self_user or show_fag) and num or show_fag_str -- 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) end, is_add and 1 or 2, cur_hp and d2ad(cur_hp) or nil)
gniv:Show() gniv:Show()
end end
@ -243,7 +256,6 @@ end
-- 填充合伙人对象 -- 填充合伙人对象
function M:FillItem(obj, partner) function M:FillItem(obj, partner)
local group = DataManager.groups:get(self.group_id) local group = DataManager.groups:get(self.group_id)
local perm_array = MngPermission.getPermData(group.permission) local perm_array = MngPermission.getPermData(group.permission)
@ -252,62 +264,80 @@ function M:FillItem(obj, partner)
obj:GetChild("btn_head").icon = "ui://Common/Head0" obj:GetChild("btn_head").icon = "ui://Common/Head0"
ImageLoad.Load(partner.portrait, obj:GetChild("btn_head")._iconObject, self.class) ImageLoad.Load(partner.portrait, obj:GetChild("btn_head")._iconObject, self.class)
-- 体力值操作按钮事件 -- 体力值操作按钮事件
if group.lev == 1 or group.lev < 3 or (partner.uid ~= DataManager.SelfUser.account_id and group.partnerLev > 0) then -- if group.lev == 1 or group.lev < 3 or (partner.uid ~= DataManager.SelfUser.account_id and group.partnerLev > 0) then
obj:GetController("fag").selectedIndex = 1 -- obj:GetController("fag").selectedIndex = 1
-- else
-- obj:GetController("fag").selectedIndex = 0
-- end
-- 显示玩家标签，合伙人、管理员
local ctr_type = obj:GetController('type')
if partner.lev < 3 then
ctr_type.selectedIndex = partner.lev
elseif partner.partnerLev ~= 0 then
ctr_type.selectedIndex = 3
else else
obj:GetController("fag").selectedIndex = 0 ctr_type.selectedIndex = 0
end end
local fgCtr = ControllerManager.GetController(NewGroupController)
local p = group:getMember(partner.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, partner.uid, true, nil, function(data)
local hp = data.hp
partner.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_partner.numItems = #self.partner_data
-- 搜索出的玩家显示
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, partner.uid, false, partner.hp, function(data)
local hp = data.hp
partner.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_partner.numItems = #self.partner_data
-- 搜索出的玩家显示
if self._view:GetController("search").selectedIndex == 1 then
obj:GetChild("tex_fag").text = d2ad(hp)
end
end)
end)
obj:GetChild("tex_fag").text = d2ad(partner.hp) obj:GetChild("tex_fag").text = d2ad(partner.hp)
obj:GetChild("tex_member_count").text = ""..partner.total local tex_Safecompartment = obj:GetChild('tex_Safecompartment')
tex_Safecompartment.text = d2ad(partner.bank_hp)
local tex_Numberofsuboinates = obj:GetChild('tex_Numberofsuboinates')
tex_Numberofsuboinates.text = partner.underCount
-- local fgCtr = ControllerManager.GetController(NewGroupController)
-- local p = group:getMember(partner.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, partner.uid, true, nil, function(data)
-- local hp = data.hp
-- partner.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_partner.numItems = #self.partner_data
-- -- 搜索出的玩家显示
-- 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, partner.uid, false, partner.hp, function(data)
-- local hp = data.hp
-- partner.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_partner.numItems = #self.partner_data
-- -- 搜索出的玩家显示
-- if self._view:GetController("search").selectedIndex == 1 then
-- obj:GetChild("tex_fag").text = d2ad(hp)
-- end
-- end)
-- end)
obj:GetChild("btn_percent").onClick:Set(function() obj:GetChild("btn_percent").onClick:Set(function()
@ -328,16 +358,11 @@ function M:FillItem(obj, partner)
local btnDetail = obj:GetChild("btn_detail") local btnDetail = obj:GetChild("btn_detail")
--btnDetail.visible = partner.total > 0 --btnDetail.visible = partner.total > 0
btnDetail.onClick:Set(function() btnDetail.onClick:Set(function()
local GroupMngPartnerListView2 = GroupMngPartnerListView2.new(self.group_id,partner.uid) local GroupMngPartnerListView2 = GroupMngPartnerListView2.new(self.group_id, partner.uid)
GroupMngPartnerListView2:Show() GroupMngPartnerListView2:Show()
end) end)
end end
-- 列表对象填充 -- 列表对象填充
function M:OnRenderItem(index, obj) function M:OnRenderItem(index, obj)
local partner = self.partner_data[index + 1] local partner = self.partner_data[index + 1]
@ -346,8 +371,8 @@ end
-- 显示合伙人成员列表 -- 显示合伙人成员列表
function M:ShowPartnerMemberList(partner_id) function M:ShowPartnerMemberList(partner_id)
local pmlv = GroupPartnerMemberListView.new(self.group_id, partner_id) local pmlv = GroupPartnerMemberListView.new(self.group_id, partner_id)
pmlv:Show() pmlv:Show()
end end
-- 显示合伙人奖励 -- 显示合伙人奖励

8
wb_new_ui/.objs/metas/m7iejg46/kwi0hks.info
View File

@ -1,11 +1,3 @@
{ {
"objectStatus": {
"n44_rpaz": {
"collapsed": true
},
"n26_kwi0": {
"collapsed": true
}
},
"fitScreen": "FitSize" "fitScreen": "FitSize"
} }

3
wb_new_ui/.objs/metas/m7iejg46/tkv17ii9.info
View File

@ -3,6 +3,9 @@
"n136_ex3l": { "n136_ex3l": {
"hidden": true "hidden": true
}, },
"n129_omkm": {
"hidden": true
},
"n84_kwi0": { "n84_kwi0": {
"hidden": true "hidden": true
}, },

18
wb_new_ui/.objs/workspace.json
View File

@ -2,20 +2,20 @@
"libview.firstColumnWidth": 398, "libview.firstColumnWidth": 398,
"libview.iconScale": 0, "libview.iconScale": 0,
"doc.openedDocs": [ "doc.openedDocs": [
"ui://3z9lj55vjokmft", "ui://m7iejg46kwi0hkr",
"ui://3n2top74kpmgq4", "ui://m7iejg46cioeho9",
"ui://egnzysm7ffp36a", "ui://m7iejg46tkv17ii9",
"ui://ypulwxjhl9mn14", "ui://m7iejg46tkv17iia"
"ui://4ismcalcndxj36",
"ui://442j0uepygxga",
"ui://niy3ldiwl9mn14"
], ],
"test.device": "1080p Phone", "test.device": "1080p Phone",
"canvasColor": 10066329, "canvasColor": 10066329,
"auxline2": true, "auxline2": true,
"doc.activeDoc": "ui://niy3ldiwl9mn14", "doc.activeDoc": "ui://m7iejg46tkv17ii9",
"libview.twoColumn": false, "libview.twoColumn": false,
"libview.expandedNodes": [], "libview.expandedNodes": [
"m7iejg46",
"/"
],
"auxline1": true, "auxline1": true,
"snapToGrid": true, "snapToGrid": true,
"test.orientation": "landscape", "test.orientation": "landscape",

14
wb_new_ui/assets/NewGroup/mgr/View_GroupMatchFagList.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="1815,1118"> <component size="1815,1118">
<controller name="page" pages="0,,1,,2," selected="0"/> <controller name="page" pages="0,,1,,2," selected="0"/>
<controller name="search" pages="0,,1," selected="0"/> <controller name="search" pages="0,,1," selected="1"/>
<controller name="mng" pages="0,,1," selected="0"/> <controller name="mng" pages="0,,1," selected="0"/>
<controller name="fenleixing" pages="0,,1,,2,,3," selected="0"/> <controller name="fenleixing" pages="0,,1,,2,,3," selected="1"/>
<displayList> <displayList>
<image id="n133_ex3l" name="n133" src="otck7iev" fileName="images/NGXiangTangMui/Rectangle 749.png" xy="-54,160" size="1815,795"/> <image id="n133_ex3l" name="n133" src="otck7iev" fileName="images/NGXiangTangMui/Rectangle 749.png" xy="-54,160" size="1815,795"/>
<image id="n126_b8zx" name="n126" src="otck7iew" fileName="images/NGXiangTangMui/Rectangle 750.png" xy="-47,165" size="1802,90" group="n60_kwi0"> <image id="n126_b8zx" name="n126" src="otck7iew" fileName="images/NGXiangTangMui/Rectangle 750.png" xy="-47,165" size="1802,90" group="n60_kwi0">
@ -40,7 +40,7 @@
<item/> <item/>
<item/> <item/>
</list> </list>
<list id="n129_omkm" name="lst_mgr_data" xy="-36,269" size="1761,491" selectionMode="none" overflow="scroll" lineGap="5" colGap="43" defaultItem="ui://m7iejg46tkv17iia" autoClearItems="true"> <list id="n129_omkm" name="lst_mgr_data" xy="-36,269" size="1761,491" visible="false" selectionMode="none" overflow="scroll" lineGap="5" colGap="43" defaultItem="ui://m7iejg46tkv17iia" autoClearItems="true">
<gearDisplay controller="page" pages="2"/> <gearDisplay controller="page" pages="2"/>
<relation target="" sidePair="width-width"/> <relation target="" sidePair="width-width"/>
<item/> <item/>
@ -53,7 +53,7 @@
<item/> <item/>
<item/> <item/>
</list> </list>
<list id="n90_kwi0" name="lst_fag_result" xy="-37,269" size="1761,397" group="n91_kwi0" selectionMode="none" overflow="scroll" lineGap="5" colGap="43" defaultItem="ui://m7iejg46giw8hf7" autoClearItems="true"> <list id="n90_kwi0" name="lst_fag_result" xy="22,1187" size="1761,397" group="n91_kwi0" selectionMode="none" overflow="scroll" lineGap="5" colGap="43" defaultItem="ui://m7iejg46giw8hf7" autoClearItems="true">
<gearDisplay controller="page" pages="0,1"/> <gearDisplay controller="page" pages="0,1"/>
<relation target="n133_ex3l" sidePair="width-width,top-top"/> <relation target="n133_ex3l" sidePair="width-width,top-top"/>
<item/> <item/>
@ -66,7 +66,7 @@
<item/> <item/>
<item/> <item/>
</list> </list>
<group id="n91_kwi0" name="n91" xy="-37,269" size="1761,397" visible="false" advanced="true"> <group id="n91_kwi0" name="n91" xy="22,1187" size="1761,397" visible="false" advanced="true">
<gearDisplay controller="search" pages="1"/> <gearDisplay controller="search" pages="1"/>
</group> </group>
<component id="n70_kwi0" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="779,729" size="452,96" group="n73_kwi0" visible="false"/> <component id="n70_kwi0" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="779,729" size="452,96" group="n73_kwi0" visible="false"/>
@ -124,10 +124,10 @@
</list> </list>
<group id="n65_kwi0" name="n65" xy="-56,-349" size="951,150" visible="false" advanced="true"/> <group id="n65_kwi0" name="n65" xy="-56,-349" size="951,150" visible="false" advanced="true"/>
<component id="n145_eh0o" name="n145" src="ex3l7iga" fileName="component/Btn/Btn(1)(1).xml" xy="73,983" size="244,92" group="n150_eh0o"> <component id="n145_eh0o" name="n145" src="ex3l7iga" fileName="component/Btn/Btn(1)(1).xml" xy="73,983" size="244,92" group="n150_eh0o">
<Button checked="true" icon="ui://m7iejg46eh0o7iki" selectedIcon="ui://m7iejg46eh0o7ike" controller="fenleixing" page="0"/> <Button icon="ui://m7iejg46eh0o7iki" selectedIcon="ui://m7iejg46eh0o7ike" controller="fenleixing" page="0"/>
</component> </component>
<component id="n146_eh0o" name="n146" src="ex3l7iga" fileName="component/Btn/Btn(1)(1).xml" xy="372,983" size="244,92" group="n150_eh0o"> <component id="n146_eh0o" name="n146" src="ex3l7iga" fileName="component/Btn/Btn(1)(1).xml" xy="372,983" size="244,92" group="n150_eh0o">
<Button icon="ui://m7iejg46eh0o7ikd" selectedIcon="ui://m7iejg46eh0o7ikh" controller="fenleixing" page="1"/> <Button checked="true" icon="ui://m7iejg46eh0o7ikd" selectedIcon="ui://m7iejg46eh0o7ikh" controller="fenleixing" page="1"/>
</component> </component>
<component id="n147_eh0o" name="n147" src="ex3l7iga" fileName="component/Btn/Btn(1)(1).xml" xy="671,983" size="244,92" group="n150_eh0o"> <component id="n147_eh0o" name="n147" src="ex3l7iga" fileName="component/Btn/Btn(1)(1).xml" xy="671,983" size="244,92" group="n150_eh0o">
<Button icon="ui://m7iejg46eh0o7ikc" selectedIcon="ui://m7iejg46eh0o7ikg" controller="fenleixing" page="2"/> <Button icon="ui://m7iejg46eh0o7ikc" selectedIcon="ui://m7iejg46eh0o7ikg" controller="fenleixing" page="2"/>

4
wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="1815,1118"> <component size="1815,1118">
<controller name="search" pages="0,,1," selected="0"/> <controller name="search" pages="0,,1," selected="1"/>
<controller name="mng" pages="0,,1," selected="0"/> <controller name="mng" pages="0,,1," selected="0"/>
<controller name="page" pages="0,,1,,2," selected="0"/> <controller name="page" pages="0,,1,,2," selected="0"/>
<displayList> <displayList>
@ -35,7 +35,7 @@
<item/> <item/>
<item/> <item/>
</list> </list>
<list id="n90_tyis" name="lst_member_find" xy="-24,269" size="1765,554" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" lineGap="11" colGap="5" defaultItem="ui://m7iejg46kwi0hks" align="center" vAlign="middle" autoClearItems="true"> <list id="n90_tyis" name="lst_member_find" xy="-24,269" size="1765,554" group="n45_tqi8" overflow="scroll" scrollBarFlags="2" lineGap="11" colGap="5" defaultItem="ui://m7iejg46kwi0hks" align="center" autoClearItems="true">
<gearDisplay controller="search" pages="1"/> <gearDisplay controller="search" pages="1"/>
<relation target="n115_csp4" sidePair="width-width,top-top"/> <relation target="n115_csp4" sidePair="width-width,top-top"/>
<item/> <item/>

8
wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList.xml
View File

@ -50,9 +50,9 @@
<item/> <item/>
<item/> <item/>
</list> </list>
<list id="n109_tyis" name="lst_partner_search" xy="-12,1226" size="1762,780" group="n77_nk4v" overflow="scroll" defaultItem="ui://m7iejg46cioehoa" autoClearItems="true"> <list id="n109_tyis" name="lst_partner_search" xy="-24,269" size="1762,554" group="n77_nk4v" overflow="scroll" lineGap="17" defaultItem="ui://m7iejg46cioehoa" autoClearItems="true">
<gearDisplay controller="search" pages="1"/> <gearDisplay controller="search" pages="1"/>
<relation target="" sidePair="width-width"/> <relation target="n139_eh0o" sidePair="width-width,top-top"/>
<item/> <item/>
<item/> <item/>
<item/> <item/>
@ -63,10 +63,10 @@
<item/> <item/>
<item/> <item/>
</list> </list>
<component id="n75_cioe" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="901,-36" group="n77_nk4v"> <component id="n75_cioe" name="btn_back" src="efnuhdk" fileName="component/Btn/Btn_back1.xml" xy="838,842" group="n77_nk4v">
<gearDisplay controller="search" pages="1"/> <gearDisplay controller="search" pages="1"/>
</component> </component>
<group id="n77_nk4v" name="n77" xy="-48,-36" size="1801,2042" advanced="true"> <group id="n77_nk4v" name="n77" xy="-48,53" size="1801,885" advanced="true">
<gearDisplay controller="page" pages="0"/> <gearDisplay controller="page" pages="0"/>
</group> </group>
<component id="n114_yre9" name="btn_del" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="394,408" group="n126_yre9"> <component id="n114_yre9" name="btn_del" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" pkg="27vd145b" xy="394,408" group="n126_yre9">

18
wb_new_ui/assets/NewGroup/mgr/component/member/item_member.xml
View File

@ -1,24 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="1765,125"> <component size="1765,125">
<controller name="type" pages="0,,1,,2,,3," selected="0"> <controller name="type" pages="0,,1,,2,,3," selected="3">
<action type="change_page" fromPage="" toPage="1,2" controller="mng" targetPage="1"/> <action type="change_page" fromPage="" toPage="1,2" controller="mng" targetPage="1"/>
<action type="change_page" fromPage="" toPage="3" controller="partner" targetPage="1"/> <action type="change_page" fromPage="" toPage="3" controller="partner" targetPage="1"/>
</controller> </controller>
<controller name="fag" pages="0,,1," selected="0"/> <controller name="fag" pages="0,,1," selected="0"/>
<controller name="mng" pages="0,,1," selected="0"/> <controller name="mng" pages="0,,1," selected="1"/>
<displayList> <displayList>
<text id="n5_kwi0" name="tex_name" xy="432,12" size="280,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="用户名称"/> <text id="n5_kwi0" name="tex_name" xy="432,12" size="280,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="用户名称"/>
<component id="n4_kwi0" name="btn_head" src="kio210" fileName="component/head/Head.xml" pkg="27vd145b" xy="258,10" size="105,105" group="n46_rpaz" touchable="false"/> <component id="n4_kwi0" name="btn_head" src="kio210" fileName="component/head/Head.xml" pkg="27vd145b" xy="258,10" size="105,105" group="n46_rpaz" touchable="false"/>
<text id="n1_kwi0" name="n1" xy="82,35" size="124,54" group="n44_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" text="管理员"> <text id="n1_kwi0" name="n1" xy="62,35" size="164,54" group="n44_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" text="合伙人">
<gearDisplay controller="type" pages="1,2"/> <gearText controller="type" pages="0,2,3" values="普通成员|管理员|合伙人" default="盟主"/>
</text> </text>
<text id="n2_kwi0" name="n2" xy="83,35" size="124,54" group="n44_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" text="合伙人"> <group id="n44_rpaz" name="group_role" xy="62,35" size="164,54" group="n46_rpaz" advanced="true"/>
<gearDisplay controller="type" pages="3"/>
</text>
<text id="n67_s8rw" name="n67" xy="83,35" size="124,54" group="n44_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" autoSize="shrink" text="队员">
<gearDisplay controller="type" pages="0"/>
</text>
<group id="n44_rpaz" name="group_role" xy="82,35" size="125,54" group="n46_rpaz" advanced="true"/>
<text id="n17_kwi0" name="tex_id" xy="432,61" size="279,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#c52b2b" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="100000"/> <text id="n17_kwi0" name="tex_id" xy="432,61" size="279,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#c52b2b" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="100000"/>
<component id="n59_ovii" name="btn_fag_add" src="dq5u7ifm" fileName="component/Btn/Btn(1).xml" xy="1302,13" size="226,99" group="n47_rpaz" scale="0.9,0.9"> <component id="n59_ovii" name="btn_fag_add" src="dq5u7ifm" fileName="component/Btn/Btn(1).xml" xy="1302,13" size="226,99" group="n47_rpaz" scale="0.9,0.9">
<Button icon="ui://m7iejg46s8rw7ihm"/> <Button icon="ui://m7iejg46s8rw7ihm"/>
@ -31,7 +25,7 @@
<text id="n68_s8rw" name="tex_fag" xy="722,13" size="379,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="12345678.00"/> <text id="n68_s8rw" name="tex_fag" xy="722,13" size="379,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="12345678.00"/>
<text id="n69_s8rw" name="tex_Safecompartment" xy="722,61" size="379,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="12345678.00"/> <text id="n69_s8rw" name="tex_Safecompartment" xy="722,61" size="379,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="12345678.00"/>
<text id="n72_tkv1" name="tex_Numberofsuboinates" xy="1115,35" size="165,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" leading="0" autoSize="shrink" singleLine="true" text="9999"/> <text id="n72_tkv1" name="tex_Numberofsuboinates" xy="1115,35" size="165,54" group="n46_rpaz" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" leading="0" autoSize="shrink" singleLine="true" text="9999"/>
<group id="n46_rpaz" name="group_player" xy="82,10" size="1682,105" advanced="true"/> <group id="n46_rpaz" name="group_player" xy="62,10" size="1702,105" advanced="true"/>
<image id="n71_s8rw" name="n71" src="otck7ieu" fileName="images/NGXiangTangMui/Line 65.png" xy="0,123" size="1765,2"/> <image id="n71_s8rw" name="n71" src="otck7ieu" fileName="images/NGXiangTangMui/Line 65.png" xy="0,123" size="1765,2"/>
</displayList> </displayList>
</component> </component>

11
wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_mng_partner.xml
View File

@ -3,6 +3,7 @@
<controller name="mng" pages="0,,1," selected="0"/> <controller name="mng" pages="0,,1," selected="0"/>
<controller name="show_total" pages="0,,1," selected="0"/> <controller name="show_total" pages="0,,1," selected="0"/>
<controller name="fag" pages="0,,1," selected="0"/> <controller name="fag" pages="0,,1," selected="0"/>
<controller name="type" pages="0,,1,,2,,3," selected="3"/>
<displayList> <displayList>
<image id="n52_hp03" name="n52" src="otck7ieu" fileName="images/NGXiangTangMui/Line 65.png" xy="0,123" size="1765,2"> <image id="n52_hp03" name="n52" src="otck7ieu" fileName="images/NGXiangTangMui/Line 65.png" xy="0,123" size="1765,2">
<relation target="" sidePair="width-width"/> <relation target="" sidePair="width-width"/>
@ -23,10 +24,12 @@
</component> </component>
<text id="n29_oj7k" name="tex_fag" xy="722,13" size="379,54" group="n30_oj7k" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="11111"/> <text id="n29_oj7k" name="tex_fag" xy="722,13" size="379,54" group="n30_oj7k" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="11111"/>
<text id="n54_eh0o" name="tex_Safecompartment" xy="722,61" size="379,54" group="n30_oj7k" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="11111"/> <text id="n54_eh0o" name="tex_Safecompartment" xy="722,61" size="379,54" group="n30_oj7k" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" singleLine="true" autoClearText="true" text="11111"/>
<text id="n55_eh0o" name="n55" xy="83,30" size="148,64" group="n30_oj7k" font="ui://27vd145bpxed7ik2" fontSize="48" color="#434343" text="合伙人"/> <text id="n56_f2rs" name="n56" xy="62,35" size="164,54" group="n30_oj7k" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="shrink" text="合伙人">
<group id="n30_oj7k" name="n30" xy="83,13" size="1084,102" group="n31_oj7k"/> <gearText controller="type" pages="0,2,3" values="普通成员|管理员|合伙人" default="盟主"/>
<group id="n31_oj7k" name="group_score" xy="83,13" size="1084,102" advanced="true"/> </text>
<text id="n35_oj7k" name="tex_member_count" xy="1115,35" size="165,54" group="n36_oj7k" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="none" singleLine="true" autoClearText="true" text="23"/> <group id="n30_oj7k" name="n30" xy="62,13" size="1105,102" group="n31_oj7k"/>
<group id="n31_oj7k" name="group_score" xy="62,13" size="1105,102" advanced="true"/>
<text id="n35_oj7k" name="tex_Numberofsuboinates" xy="1115,35" size="165,54" group="n36_oj7k" font="ui://27vd145bpxed7ik2" fontSize="40" color="#434343" align="center" vAlign="middle" autoSize="none" singleLine="true" autoClearText="true" text="23"/>
<group id="n36_oj7k" name="n36" xy="1115,35" size="165,54"/> <group id="n36_oj7k" name="n36" xy="1115,35" size="165,54"/>
<component id="n42_ozaz" name="btn_percent" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="1459,13" size="226,99" group="n40_oj7k"> <component id="n42_ozaz" name="btn_percent" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="1459,13" size="226,99" group="n40_oj7k">
<Button title=" " icon="ui://m7iejg46tkv17ii7"/> <Button title=" " icon="ui://m7iejg46tkv17ii7"/>

BIN
wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes
View File

Binary file not shown.