fpgajie
/
yunque9
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改成员

master
罗家炜 2025-06-19 23:14:44 +08:00
parent 8e927cf593
commit 08fa583c33
9 changed files with 426 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua
View File

@ -6,9 +6,9 @@ local GroupGameSettingView = {}
local M = GroupGameSettingView
function GroupGameSettingView.new(blur_view, gid, pid , room_config, callback)
setmetatable(M, {__index = BaseWindow})
local self = setmetatable({}, {__index = M})
function GroupGameSettingView.new(blur_view, gid, pid, room_config, hpdata, callback)
setmetatable(M, { __index = BaseWindow })
local self = setmetatable({}, { __index = M })
self.class = "GroupGameSettingView"
self._animation = false
self._full = true
@ -24,6 +24,7 @@ function GroupGameSettingView.new(blur_view, gid, pid , room_config, callback)
if room_config then
self.room_config = json.decode(room_config)
end
self.lastHpdata = hpdata
self.rewards_data = {}
self.callback = callback
self._full = true
@ -32,7 +33,7 @@ function GroupGameSettingView.new(blur_view, gid, pid , room_config, callback)
end
function M:init(url)
BaseWindow.init(self,url)
BaseWindow.init(self, url)
self.hpData = {}
self:FillGameData()
@ -77,7 +78,7 @@ function M:FillGameData()
index = i
end
end
self.gl_view = GameListView.new(lst_game,index,self.room_config)
self.gl_view = GameListView.new(lst_game, index, self.room_config)
local btn_close = lst_game:GetChild("btn_close")
btn_close.onClick:Set(function()
self:Destroy()
@ -89,10 +90,9 @@ function M:FillGameData()
end
end
local tuoguanTimeList={10,30,60,120,180,240,300}
local tuoguanTimeList = { 10, 30, 60, 120, 180, 240, 300 }
-- 显示玩法体力值配置
function M:FillFagData()
local mod = self.gl_view:GetModeData()
local game_id = mod.data.game_data.game_id
@ -161,14 +161,14 @@ function M:FillFagData()
local tex_join_limit = panel_play_set:GetChild("tex_join_limit")
tex_join_limit.text = hpData and d2ad(hpData.limitInRoom) or 0
btn_join_limit.onClick:Set(function()
self:__input_num(tex_join_limit,"limitInRoom")
self:__input_num(tex_join_limit, "limitInRoom")
end)
--机器人
local btn_robot_room = panel_fag:GetChild("robot_room")
local tex_robot_room = panel_fag:GetChild("tex_robot_room")
tex_robot_room.text = hpData and (hpData.robot_room and (hpData.robot_room) or 0) or 0
btn_robot_room.onClick:Set(function()
self:__input_num(tex_robot_room,"robot_room")
self:__input_num(tex_robot_room, "robot_room")
end)
--抢庄限制
@ -185,9 +185,9 @@ function M:FillFagData()
tex_exit_limit.text = hpData and hpData.limitPlay and d2ad(hpData.limitPlay) or 1
btn_exit_limit.onClick:Set(function()
-- self:__input_num(tex_exit_limit, "limitPlay")
local gfiv = GroupNumberInputView.new(self._root_view,function(num)
local gfiv = GroupNumberInputView.new(self._root_view, function(num)
if num == 0 then
ViewUtil.ErrorMsg(nil,-9,"不能输入0")
ViewUtil.ErrorMsg(nil, -9, "不能输入0")
return
end
tex_exit_limit.text = num
@ -213,7 +213,6 @@ function M:FillFagData()
value = value - 1
tex_times.text = tostring(value)
end
end)
local btn_add = panel_play_set:GetChild("btn_add")
@ -228,7 +227,7 @@ function M:FillFagData()
local tex_times_room = panel_play_set:GetChild("tex_times_room")
if hpData and hpData.tex_times_room then
tex_times_room.text = hpData.tex_times_room/1000
tex_times_room.text = hpData.tex_times_room / 1000
else
tex_times_room.text = 1
end
@ -241,7 +240,6 @@ function M:FillFagData()
value = value - 1
tex_times_room.text = tostring(value)
end
end)
local btn_add_room = panel_play_set:GetChild("btn_add_room")
@ -313,7 +311,7 @@ function M:FillFagData()
base_pump = d2ad(hpData.basePump)
end
local tex_base_pump = panel_fag:GetChild("tex_base_pump")
tex_base_pump.text = ""..base_pump
tex_base_pump.text = "" .. base_pump
local btn_base_pump = panel_fag:GetChild("btn_base_pump")
btn_base_pump.onClick:Set(function()
@ -340,7 +338,7 @@ function M:FillFagData()
_data.tuoguan = btn_tuoguan.selected
_data.tuoguan_active_time = _data.tuoguan and tuoguanTimeList[(tonumber(cb_tuoguan_time.value))] or 0
_data.tuoguan_active_timeIndex=tonumber(cb_tuoguan_time.value)
_data.tuoguan_active_timeIndex = tonumber(cb_tuoguan_time.value)
_data.tuoguan_result_type = _data.tuoguan and tonumber(cb_tuoguan_type.value) or 0
if btn_BanDismiss.selected then
_data.isBanDismiss = 1
@ -349,37 +347,37 @@ function M:FillFagData()
if btn_hidden then
_data.isHidden = btn_hidden.selected and 1 or 0
else
_data.isHidden=0
_data.isHidden = 0
end
if btn_vip then
_data.isvip = btn_vip.selected and 1 or 0
else
_data.isvip=0
_data.isvip = 0
end
local hpType = mod.data.game_data.hpType
self.hpData.limitInRoom = ad2d(tonumber(panel_play_set:GetChild("tex_join_limit").text))
self.hpData.limitPlay = ad2d(tonumber(panel_play_set:GetChild("tex_exit_limit").text))
self.hpData.limitloot = 0-- ad2d(tonumber(panel_play_set:GetChild("tex_bank_limit").text))
self.hpData.limitloot = 0 -- ad2d(tonumber(panel_play_set:GetChild("tex_bank_limit").text))
self.hpData.robot_room = (tonumber(panel_fag:GetChild("tex_robot_room").text))
self.hpData.type = self._type
self.hpData.limitPump = self._limitPump
local hpOnOff = ctr_switch.selectedIndex
if game_id == 41 then
if self.hpData.limitloot < ad2d(_data.up_bank) then
ViewUtil.ErrorMsg(self._root_view,-9,"抢庄限制必须大于等于" .. _data.up_bank)
ViewUtil.ErrorMsg(self._root_view, -9, "抢庄限制必须大于等于" .. _data.up_bank)
return
end
end
if hpType > 1 and hpOnOff == 1 then
if self.hpData.limitInRoom < self.hpData.limitPlay then
ViewUtil.ErrorMsg(self._root_view,-9,"进入限制必须大于等于退出限制")
ViewUtil.ErrorMsg(self._root_view, -9, "进入限制必须大于等于退出限制")
return
end
if self.hpData.limitPlay == 0 then
ViewUtil.ErrorMsg(self._root_view,-9,"退出房间限制不能为0")
ViewUtil.ErrorMsg(self._root_view, -9, "退出房间限制不能为0")
return
end
end
@ -403,7 +401,8 @@ function M:FillFagData()
-- tem.limitPump = tonumber(r_item:GetChild("cb_type").value)
-- 抽水次数 固定抽水要发小数
local cb_method = r_item:GetChild("cb_method")
local proportion = string.gsub(string.gsub(r_item:GetChild("cb_proportion" .. cb_method.value).title, "抽", ""), "次", "")
local proportion = string.gsub(
string.gsub(r_item:GetChild("cb_proportion" .. cb_method.value).title, "抽", ""), "次", "")
if cb_method.value == "1" then proportion = ad2d(proportion) end
-- 抽水分数
-- self.hpData.pumpProportion = tonumber(proportion)
@ -415,7 +414,6 @@ function M:FillFagData()
local vsend = string.gsub(r_item:GetChild("cb_min_send").title, "分", "")
tem.UpperLimitReward = ad2d(tonumber(vsend))
else
local v = string.gsub(r_item:GetChild("cb_max").title, "分", "")
-- self.hpData.UpperLimit = ad2d(tonumber(v))
@ -464,7 +462,8 @@ function M:FillFagData()
ViewUtil.ShowModalWait(self._root_view)
if not self.play then
-- 新增玩法
fgCtr:FG_AddPlay(self.group_id, game_id, _data, name, self.hpData, hpOnOff, group.type, self.table_color, function(res)
fgCtr:FG_AddPlay(self.group_id, game_id, _data, name, self.hpData, hpOnOff, group.type, self.table_color,
function(res)
if self._is_destroy then
return
end
@ -478,7 +477,7 @@ function M:FillFagData()
play.game_name = mod.data.game_data.name
play.gameId = game_id
play.hpOnOff = hpOnOff
play.hpData= json.encode(self.hpData)
play.hpData = json.encode(self.hpData)
play.id = res.Data.pid
play.xipai_rewards_val = self.hpData.xipairewards_val
play.anchou_rewards_val = self.hpData.anchou_rewards_val
@ -493,18 +492,19 @@ function M:FillFagData()
play.config = json.encode(_data)
play.hp_times = self.hpData.times
play.maxPlayers = _data.maxPlayers
play.roomNum=self.hpData.tex_times_room/1000
play.maxRound=res.Data.maxRound
play.roomNum = self.hpData.tex_times_room / 1000
play.maxRound = res.Data.maxRound
ViewUtil.ShowBannerOnScreenCenter("添加玩法成功")
self.callback(play)
self:Destroy()
else
ViewUtil.ErrorTip(res.ReturnCode,"添加玩法失败！")
ViewUtil.ErrorTip(res.ReturnCode, "添加玩法失败！")
end
end)
else
-- 修改玩法
fgCtr:FG_UpdatePlay(self.group_id,game_id,_data,name,self.hpData,hpOnOff,self.play.id, group.type, self.table_color, function(res)
fgCtr:FG_UpdatePlay(self.group_id, game_id, _data, name, self.hpData, hpOnOff, self.play.id, group.type,
self.table_color, function(res)
if self._is_destroy then
return
end
@ -519,7 +519,7 @@ function M:FillFagData()
play.gameId = game_id
play.id = self.play.id
play.hpOnOff = hpOnOff
play.hpData= json.encode(self.hpData)
play.hpData = json.encode(self.hpData)
play.xipai_rewards_val = self.hpData.xipairewards_val
play.anchou_rewards_val = self.hpData.anchou_rewards_val
play.reward = self.hpData.rewards_val
@ -533,12 +533,12 @@ function M:FillFagData()
play.config = json.encode(_data)
play.hp_times = self.hpData.times
play.maxPlayers = _data.maxPlayers
play.roomNum=self.hpData.tex_times_room/1000
play.maxRound=res.Data.maxRound
play.roomNum = self.hpData.tex_times_room / 1000
play.maxRound = res.Data.maxRound
self.callback(play)
self:Destroy()
else
ViewUtil.ErrorTip(res.ReturnCode,"修改玩法失败！")
ViewUtil.ErrorTip(res.ReturnCode, "修改玩法失败！")
end
end)
end
@ -559,15 +559,15 @@ function M:OnRenderItem(index, obj)
local data = self.rewards_data[index]
-- 抽水方法，固定、浮动
local cb_method = obj:GetChild("cb_method")
cb_method.value = tostring(self._type)
cb_method.onChanged:Set(function()
local tem = membe_clone(self.rewards_data[1])
tem.pumpProportion = 0
self._type = tonumber(cb_method.value)
self.rewards_data = {}
self.rewards_data[1] = tem
self:UpdateRewards()
end)
cb_method.value = 1
-- cb_method.onChanged:Set(function()
-- local tem = membe_clone(self.rewards_data[1])
-- tem.pumpProportion = 0
-- self._type = tonumber(cb_method.value)
-- self.rewards_data = {}
-- self.rewards_data[1] = tem
-- self:UpdateRewards()
-- end)
--大赢家
local tem = obj:GetController("c1").selectedIndex
for i = 1, 2 do
@ -596,6 +596,7 @@ function M:OnRenderItem(index, obj)
end
local cb_proportion1 = obj:GetChild("cb_proportion1")
local cb_proportion2 = obj:GetChild("cb_proportion2")
print(cb_method.value)
obj:GetChild("cb_proportion" .. cb_method.value).title = "抽" .. val .. "次"
cb_proportion1.onChanged:Set(function()
data.pumpProportion = ad2d(string.gsub(string.gsub(cb_proportion1.title, "抽", ""), "次", ""))
@ -625,7 +626,6 @@ function M:OnRenderItem(index, obj)
end
obj:GetController("give_owner").onChanged:Add(function()
if obj:GetController("give_owner").selectedIndex == 0 then
data.UpperLimitReward = 0
self:UpdateRewards()
@ -651,11 +651,11 @@ function M:OnRenderItem(index, obj)
if next_data then
tem = string.format("小于%s", d2ad(next_data.UpperLimit))
end
local tem1 =""
local tem1 = ""
if UpperLimitReward ~= 0 then
tem1 = string.format(",每个玩家赠送盟主%s分",UpperLimitReward)
tem1 = string.format(",每个玩家赠送盟主%s分", UpperLimitReward)
end
str_min_tip = string.format("(低于%s分不抽水%s)", UpperLimit,tem1)
str_min_tip = string.format("(低于%s分不抽水%s)", UpperLimit, tem1)
-- str_max_tip = string.format("(低于%s按此设置抽水)", UpperLimit)
elseif index == #self.rewards_data then
str_min_tip = string.format("(大于等于%s按此设置抽水)", UpperLimit)
@ -672,9 +672,9 @@ function M:OnRenderItem(index, obj)
local input_limit = 1000
local btn_input = obj:GetChild("btn_input")
btn_input.onClick:Set(function()
local gfiv = GroupNumberInputView.new(self._root_view,function(num)
local gfiv = GroupNumberInputView.new(self._root_view, function(num)
if num > input_limit then
ViewUtil.ErrorMsg(self._root_view,-9,"输入最大不能超过" .. input_limit)
ViewUtil.ErrorMsg(self._root_view, -9, "输入最大不能超过" .. input_limit)
return
end
cb_proportion1.title = "抽" .. num .. "次"
@ -695,15 +695,15 @@ function M:OnRenderItem(index, obj)
end
local btn_input2 = obj:GetChild("btn_input2")
btn_input2.onClick:Set(function()
local gfiv = GroupNumberInputView.new(self._root_view,function(num)
local gfiv = GroupNumberInputView.new(self._root_view, function(num)
if num > input_limit2 then
ViewUtil.ErrorMsg(nil,-9,"输入值不能超过" .. input_limit2)
ViewUtil.ErrorMsg(nil, -9, "输入值不能超过" .. input_limit2)
return
elseif num >= max_v then
ViewUtil.ErrorMsg(nil,-9,"输入值必须小于" .. max_v)
ViewUtil.ErrorMsg(nil, -9, "输入值必须小于" .. max_v)
return
elseif num <= min_v then
ViewUtil.ErrorMsg(nil,-9,"输入值必须大于" .. min_v)
ViewUtil.ErrorMsg(nil, -9, "输入值必须大于" .. min_v)
return
end
-- cb_min.title = num .. "分"
@ -715,8 +715,7 @@ function M:OnRenderItem(index, obj)
local btn_input2_send = obj:GetChild("btn_input2_send")
btn_input2_send.onClick:Set(function()
local gfiv = GroupNumberInputView.new(self._root_view,function(num)
local gfiv = GroupNumberInputView.new(self._root_view, function(num)
data.UpperLimitReward = ad2d(num)
self:UpdateRewards()
end, 3)
@ -726,15 +725,15 @@ function M:OnRenderItem(index, obj)
local tem = string.gsub(cb_min.title, "分", "")
local tem = tonumber(tem)
if tem > input_limit2 then
ViewUtil.ErrorMsg(nil,-9,"输入值不能超过" .. input_limit2)
ViewUtil.ErrorMsg(nil, -9, "输入值不能超过" .. input_limit2)
return
elseif tem >= max_v then
cb_min.title = d2ad(data.UpperLimit) .. "分"
ViewUtil.ErrorMsg(nil,-9,"输入值必须小于" .. max_v)
ViewUtil.ErrorMsg(nil, -9, "输入值必须小于" .. max_v)
return
elseif tem <= min_v then
cb_min.title = d2ad(data.UpperLimit) .. "分"
ViewUtil.ErrorMsg(nil,-9,"输入值必须大于" .. min_v)
ViewUtil.ErrorMsg(nil, -9, "输入值必须大于" .. min_v)
return
end
data.UpperLimit = ad2d(string.gsub(cb_min.title, "分", ""))
@ -754,7 +753,7 @@ function M:OnRenderItem(index, obj)
local tem = tonumber(tem)
if tem > max_v then
self:SetIndex(cb_max, d2ad(data.UpperLimit))
ViewUtil.ErrorMsg(nil,-9,"输入值必须小于" .. max_v)
ViewUtil.ErrorMsg(nil, -9, "输入值必须小于" .. max_v)
return
-- elseif tem <= min_v then
-- self:SetIndex(cb_max, d2ad(data.UpperLimit))
@ -775,7 +774,7 @@ function M:OnRenderItem(index, obj)
return
end
local ul = cb_method.value == "1" and data.UpperLimit + 10 or ad2d(cb_max.values[cb_max.selectedIndex + 1])
local tem = {type = data.type, pumpProportion = data.pumpProportion, UpperLimit = ul}
local tem = { type = data.type, pumpProportion = data.pumpProportion, UpperLimit = ul }
table.insert(self.rewards_data, tem)
self:UpdateRewards()
end)
@ -803,7 +802,7 @@ end
function M:__input_num(tex, filed, itype)
itype = itype or 0
local gfiv = GroupNumberInputView.new(self._root_view,function(num)
local gfiv = GroupNumberInputView.new(self._root_view, function(num)
tex.text = num
if filed == "robot_room" then
--printlog("cccccccccccccccc ",num)
@ -811,7 +810,6 @@ function M:__input_num(tex, filed, itype)
else
self.hpData[filed] = ad2d(num)
end
end, itype)
gfiv:Show()
end

66
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGameListView.lua
View File

@ -5,8 +5,8 @@ local GroupMngGameListView = {}
local M = GroupMngGameListView
function GroupMngGameListView.new(gid, blur_view)
setmetatable(M, {__index = BaseWindow})
local self = setmetatable({}, {__index = M})
setmetatable(M, { __index = BaseWindow })
local self = setmetatable({}, { __index = M })
self.class = "GroupMngGameListView"
self.group_id = gid
self.blur_view = blur_view
@ -67,9 +67,10 @@ function M:OnRenderItem(index, obj)
local str_reward_type = play.rewardType == 1 and "赢家返点" or (play.rewardType == 2 and "人头返点")
local str_reward_val = play.rewardValueType == 1 and "百分比返点" or "固定值返点"
local str_hp_type = hpData.type == 1 and "固定抽水" or "浮动抽水"
local str_base_pump = (hpData.basePump ~= nil and hpData.basePump > 0) and "抽水保障".. d2ad(hpData.basePump) or ""
local str_base_pump = (hpData.basePump ~= nil and hpData.basePump > 0) and "抽水保障" .. d2ad(hpData.basePump) or ""
local str_pump = ""
local str_hp_winner = hpData.limitPump == 0 and "大赢家" or hpData.limitPump == 1 and "所有赢家" or hpData.limitPump == 2 and "两个赢家" or hpData.limitPump == 2 and "三个赢家" or "所有玩家平分"
local str_hp_winner = hpData.limitPump == 0 and "大赢家" or hpData.limitPump == 1 and "所有赢家" or
hpData.limitPump == 2 and "两个赢家" or hpData.limitPump == 2 and "三个赢家" or "所有玩家平分"
if hpData.rewards_list then
-- for i = 1, #hpData.rewards_list do
local rd = hpData.rewards_list[#hpData.rewards_list]
@ -81,7 +82,8 @@ function M:OnRenderItem(index, obj)
str_pump = string.format(" 抽%s次 %s分", pump, d2ad(hpData.UpperLimit))
end
local str_fag = string.format("%s %s%s", str_hp_type, str_hp_winner, str_pump)
local str = string.format("%s %s 进入门槛%s 倍数%s %s %s", str_reward_type, str_reward_val, d2ad(hpData.limitInRoom), d2ad(hpData.times), str_base_pump, str_fag)
local str = string.format("%s %s 进入门槛%s 倍数%s %s %s", str_reward_type, str_reward_val, d2ad(hpData.limitInRoom),
d2ad(hpData.times), str_base_pump, str_fag)
-- local str = string.format("进入门槛%s 倍数%s %s %s", d2ad(hpData.limitInRoom), d2ad(hpData.times), str_reward_type, str_reward_val)
if game and game.hpType > 1 then
str = string.format("%s 抢庄限制%s 退出限制%s", str, d2ad(hpData.limitloot), d2ad(hpData.limitPlay))
@ -93,17 +95,14 @@ function M:OnRenderItem(index, obj)
-- end
-- end
hpStr = "[color=#08a805]积分设置:[/color]".."[color=#2365bb]"..str.."[/color]"
hpStr = "[color=#08a805]积分设置:[/color]" .. "[color=#2365bb]" .. str .. "[/color]"
else
hpStr = "[color=#08a805]积分设置:[/color]".."积分关闭"
hpStr = "[color=#08a805]积分设置:[/color]" .. "积分关闭"
end
--obj:GetChild("tex_fag_info").text = "积分关闭"
local gameStr
if not game then
gameStr = "没有添加该玩法"
else
-- 副圈主初始化扩展
if group.lev == 2 then
@ -116,15 +115,15 @@ function M:OnRenderItem(index, obj)
exconfig:FillRoomConfig(r, data)
gameStr = string.gsub(r.room_config:GetDes(), "\r", "")
gameStr = "[color=#08a805]玩法说明:[/color]".."[color=#2365bb]"..gameStr.."[/color]"
gameStr = "[color=#08a805]玩法说明:[/color]" .. "[color=#2365bb]" .. gameStr .. "[/color]"
end
obj:GetChild("com_gameinfo"):GetChild("tex_room_info").text = hpStr.."\n"..gameStr
obj:GetChild("com_gameinfo"):GetChild("tex_room_info").text = hpStr .. "\n" .. gameStr
obj:GetChild("btn_del").onClick:Set(function()
local msg_del = MsgWindow.new(nil, "删除该玩法,该玩法的相关数据也会被清除。\r确定要删除吗？", MsgWindow.MsgMode.OkAndCancel)
msg_del.onOk:Add(function( ... )
msg_del.onOk:Add(function(...)
local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait()
fgCtr:FG_DelPlay(self.group_id, play.id, function(res)
@ -138,14 +137,14 @@ function M:OnRenderItem(index, obj)
local group = DataManager.groups:get(self.group_id)
group.update_play = true
else
ViewUtil.ErrorTip(res.ReturnCode,"删除玩法失败")
ViewUtil.ErrorTip(res.ReturnCode, "删除玩法失败")
end
end)
end)
msg_del:Show()
end)
obj:GetChild("btn_edit").onClick:Set(function()
self:EditPlay(play.id, play.config)
self:EditPlay(play.id, play.config, play.hpData)
end)
obj:GetChild("btn_ban").onClick:Set(function()
self:BanPlay(play.id, 1)
@ -165,11 +164,9 @@ function M:OnRenderItem(index, obj)
-- obj:GetChild("btn_select").onClick:Set(function()
-- self:MarkPlay(MarkSelect,play.id,MarkSelect.selected)
-- end)
end
function M:MarkPlay(markS,pid,isMark)
function M:MarkPlay(markS, pid, isMark)
local fgCtr = ControllerManager.GetController(NewGroupController)
ViewUtil.ShowModalWait()
fgCtr:FG_MarkPlay(self.group_id, pid, isMark, function(res)
@ -183,43 +180,40 @@ function M:MarkPlay(markS,pid,isMark)
self:SetSortOrder(group.playList)
self.lst_play.numItems = #group.playList
else
markS.selected=not isMark
ViewUtil.ErrorTip(res.ReturnCode,"设置失败,或已达设置上限")
markS.selected = not isMark
ViewUtil.ErrorTip(res.ReturnCode, "设置失败,或已达设置上限")
end
end)
end
function M:SetSortOrder(playList)
if playList and #playList>0 then
local oldList={}
local newList={}
for i=1,#playList do
if playList and #playList > 0 then
local oldList = {}
local newList = {}
for i = 1, #playList do
if playList[i].mark then
table.insert(newList,playList[i])
table.insert(newList, playList[i])
else
table.insert(oldList,playList[i])
table.insert(oldList, playList[i])
end
end
if #newList>0 then
for i=1,#newList do
table.insert(oldList,newList[i])
if #newList > 0 then
for i = 1, #newList do
table.insert(oldList, newList[i])
end
end
DataManager.groups:get(self.group_id).playList=oldList
DataManager.groups:get(self.group_id).playList = oldList
end
end
-- 设置玩法
function M:EditPlay(pid, config)
function M:EditPlay(pid, config, hpdata)
if #DataManager.SelfUser.games == 0 then
ViewUtil.ErrorTip(nil, "请先至游戏大厅创建房间添加玩法")
return
end
local tem = GroupGameSettingView.new(self.blur_view, self.group_id, pid, config, function(play)
local tem = GroupGameSettingView.new(self.blur_view, self.group_id, pid, config, hpdata, function(play)
local group = DataManager.groups:get(self.group_id)
group:addPlay(play)
self:FillView()
@ -243,7 +237,7 @@ function M:BanPlay(pid, ban)
group:banPlay(pid, ban)
self.lst_play.numItems = #group.playList
else
ViewUtil.ErrorTip(res.ReturnCode,"设置失败")
ViewUtil.ErrorTip(res.ReturnCode, "设置失败")
end
end)
end

41
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua
View File

@ -15,7 +15,7 @@ local MngPermission = import('.MngPermission')
local GroupMngMemberHpListView = {
numberMap = { {}, {} },
backTable = {},
pageNum = 10,
pageNum = 20,
start = 1,
page = 1
}
@ -95,12 +95,12 @@ function M:FillView()
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.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')
@ -223,26 +223,38 @@ function M:GetMemberData(index)
ViewUtil.ShowModalWait(nil, "亲友圈成员较多，请稍后")
local fgCtr = ControllerManager.GetController(NewGroupController)
self.member_data = {}
self.all_member_data = {}
self:RecursionGetMenberData(fgCtr, 0)
end
function M:RecursionGetMenberData(fgCtr, index)
fgCtr:FG_GroupMembers12(
self.group_id,
index,
self.curGroup.total_member_num,
index * 67,
67,
self.stype,
self.online,
function(res)
ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then
ViewUtil.CloseModalWait()
ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败')
self:Destroy()
return
else
self.all_member_data = group.members
if res.Data.members and #res.Data.members > 0 then
local mumbers = res.Data.members
-- self.member_data = self.all_member_data
self.member_data = {}
for i = 1, #self.all_member_data do
local number = self.all_member_data[i]
for i = 1, #mumbers do
local number = mumbers[i]
if number.uid == DataManager.SelfUser.account_id or number.parentId == DataManager.SelfUser.account_id then
table.insert(self.member_data, number)
end
table.insert(self.all_member_data, number)
end
self:RecursionGetMenberData(fgCtr, index + 1)
else
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)
@ -252,6 +264,7 @@ function M:GetMemberData(index)
end
end
end
end
)
end

38
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPiLaoZhi.lua
View File

@ -229,6 +229,10 @@ function M:FillView()
ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人奖励失败")
else
self.rewards = res.Data.rewards
if not self.rewards then
ViewUtil.ErrorTip(nil, "玩法为空")
return
end
self.lst_rewards.numItems = #self.rewards
end
end)
@ -257,26 +261,35 @@ function M:GetMemberData(index)
end
ViewUtil.ShowModalWait(nil, "亲友圈成员较多，请稍后")
local fgCtr = ControllerManager.GetController(NewGroupController)
self.member_data = {}
self:RecursionGetMenberData(fgCtr, 0)
end
function M:RecursionGetMenberData(fgCtr, index)
fgCtr:FG_GroupMembers12(
self.group_id,
index,
self.curGroup.total_member_num,
index * 67,
67,
self.stype,
self.online,
function(res)
ViewUtil.CloseModalWait()
if res.ReturnCode ~= 0 then
ViewUtil.CloseModalWait()
ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败')
self:Destroy()
return
else
local members = group.members
-- local tempNumberList = {}
-- for i = 1, #members do
-- if members[i].lev < 3 or members[i].partnerLev ~= 0 then
-- table.insert(tempNumberList, members[i])
-- end
-- end
self.member_data = members
self.page = math.ceil(#group.members / self.pageNum)
if res.Data.members and #res.Data.members > 0 then
local mumbers = res.Data.members
-- self.member_data = self.all_member_data
for i = 1, #mumbers do
local number = mumbers[i]
table.insert(self.member_data, number)
end
self:RecursionGetMenberData(fgCtr, index + 1)
else
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)
if index == 0 then
@ -285,6 +298,7 @@ function M:GetMemberData(index)
end
end
end
end
)
end

24
wb_new_ui/.objs/metas/m7iejg46/kwi0hkl.info
View File

@ -1,20 +1,26 @@
{
"objectStatus": {
"n147_10tp2": {
"hidden": true
},
"n175_upe1": {
"hidden": true
},
"n165_umid": {
"collapsed": true
},
"n145_10tp2": {
"hidden": true
},
"n147_10tp2": {
"hidden": true
},
"n156_10tp2": {
"hidden": true,
"collapsed": true
},
"n165_umid": {
"collapsed": true
},
"n122_cioe": {
"hidden": true
},
"n175_upe1": {
"hidden": true
},
"n141_u26u": {
"hidden": true
}
}
}

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

@ -1 +1,7 @@
{}
{
"objectStatus": {
"n109_g21o": {
"hidden": true
}
}
}

13
wb_new_ui/.objs/workspace.json
View File

@ -1,5 +1,5 @@
{
"libview.firstColumnWidth": 297,
"libview.firstColumnWidth": 522,
"expanded_nodes": [
"27vd145b",
"/",
@ -37,6 +37,11 @@
"ui://ppu1wv76j4mf9k",
"ui://v6yvqp7wf55qwa",
"ui://v6yvqp7wf55qw7",
"ui://m7iejg46kwi0hkb",
"ui://m7iejg46mpllhv2",
"ui://m7iejg46kwi0hkl",
"ui://m7iejg46mpllhv5",
"ui://m7iejg46mkdvhdu",
"ui://v6yvqp7wf55qw5",
"ui://v6yvqp7waen81bs",
"ui://v6yvqp7waen81b0",
@ -70,7 +75,7 @@
"test.device": "720p Phone",
"canvasColor": 10066329,
"auxline2": true,
"doc.activeDoc": "ui://v6yvqp7wf55qw7",
"doc.activeDoc": "ui://m7iejg46mpllhv5",
"libview.twoColumn": false,
"libview.expandedNodes": [
"s63l0suw",
@ -88,7 +93,9 @@
"v6yvqp7w",
"/component/",
"v6yvqp7w",
"/component/Main/"
"/component/Main/",
"v6yvqp7w",
"/component/Main/component/"
],
"auxline1": true,
"snapToGrid": true,

22
wb_new_ui/assets/NewGroup/mgr/component/game/panel_fag.xml
View File

@ -8,7 +8,7 @@
<controller name="edit_type" pages="0,新建,1,修改，赢家返点,2,修改，人头返点,3," selected="0"/>
<controller name="enable_join_limit" exported="true" pages="0,,1," selected="0"/>
<controller name="alliance" pages="0,,1," selected="0"/>
<controller name="rewards_value" pages="0,百分比,1,固定值" selected="1"/>
<controller name="rewards_value" homePageType="specific" homePage="1" pages="0,百分比,1,固定值" selected="0"/>
<controller name="edit_value_type" pages="0,新建,1,百分比,2,固定值" selected="0"/>
<controller name="rewards1" pages="0,,1,,2," selected="0"/>
<controller name="edit_type1" pages="0,,1,,2,,3," selected="0"/>
@ -33,7 +33,7 @@
<relation target="" sidePair="center-center%"/>
<Button title="人头返点" titleFontSize="20" controller="rewards" page="1"/>
</component>
<group id="n122_cioe" name="n122" xy="588,8" size="185,36" group="n114_kwi0" advanced="true">
<group id="n122_cioe" name="n122" xy="588,8" size="185,36" group="n114_kwi0" visible="false" advanced="true">
<gearDisplay controller="edit_type" pages="0,2"/>
<gearXY controller="edit_type" pages="0,1,2" values="588,8|853,3|588,8" default="581,79"/>
</group>
@ -54,27 +54,27 @@
<relation target="" sidePair="center-center%"/>
</text>
<group id="n128_g21o" name="n128" xy="824,1" size="432,49" group="n114_kwi0" advanced="true"/>
<component id="n141_u26u" name="n141" src="h1uu3f" fileName="component/create_room/Btn_cr_checkbox.xml" pkg="27vd145b" xy="330,59" size="206,36" group="n114_kwi0">
<component id="n141_u26u" name="n141" src="h1uu3f" fileName="component/create_room/Btn_cr_checkbox.xml" pkg="27vd145b" xy="330,59" size="206,36" group="n114_kwi0" visible="false">
<gearDisplay controller="edit_value_type" pages="0,1"/>
<relation target="" sidePair="center-center%"/>
<Button title="百分比返点" titleFontSize="20" controller="rewards_value" page="0"/>
<Button checked="true" title="百分比返点" titleFontSize="20" controller="rewards_value" page="0"/>
</component>
<component id="n142_u26u" name="n142" src="h1uu3f" fileName="component/create_room/Btn_cr_checkbox.xml" pkg="27vd145b" xy="589,61" size="206,36" group="n114_kwi0">
<component id="n142_u26u" name="n142" src="h1uu3f" fileName="component/create_room/Btn_cr_checkbox.xml" pkg="27vd145b" xy="589,10" size="206,36" group="n114_kwi0">
<gearDisplay controller="edit_value_type" pages="0,2"/>
<gearXY controller="edit_value_type" pages="0,2" values="589,61|331,61" default="404,61"/>
<gearXY controller="edit_value_type" pages="0,2" values="589,10|331,61" default="404,61"/>
<relation target="" sidePair="center-center%"/>
<Button checked="true" title="固定值返点" titleFontSize="20" controller="rewards_value" page="1"/>
<Button title="固定值返点" titleFontSize="20" controller="rewards_value" page="1"/>
</component>
<group id="n114_kwi0" name="n114" xy="330,1" size="926,96" group="n133_ozaz" advanced="true"/>
<group id="n133_ozaz" name="n133" xy="62,1" size="1194,96" advanced="true"/>
<group id="n114_kwi0" name="n114" xy="330,1" size="926,94" group="n133_ozaz" advanced="true"/>
<group id="n133_ozaz" name="n133" xy="62,1" size="1194,94" advanced="true"/>
<component id="n111_kwi0" name="n111" src="kwi0hjx" fileName="mgr/component/comm/mng_label.xml" xy="90,109" size="183,135" group="n140_ozaz" controller="type,1">
<relation target="" sidePair="center-center%"/>
<Button title="抽水:" titleFontSize="20"/>
</component>
<list id="n125_mpll" name="lst_rewards" xy="267,118" size="905,141" group="n140_ozaz" lineGap="10" defaultItem="ui://m7iejg46mpllhv5" align="center">
<list id="n125_mpll" name="lst_rewards" xy="268,154" size="905,141" group="n140_ozaz" touchable="false" lineGap="10" defaultItem="ui://m7iejg46mpllhv5" align="center">
<item/>
</list>
<group id="n140_ozaz" name="n140" xy="90,109" size="1082,150"/>
<group id="n140_ozaz" name="n140" xy="90,109" size="1083,186"/>
<component id="n143_10tp2" name="n143" src="kwi0hjx" fileName="mgr/component/comm/mng_label.xml" xy="62,262" size="200,57" group="n156_10tp2" controller="type,1">
<relation target="" sidePair="center-center%"/>
<Button title="洗牌返点:" titleFontSize="20"/>

14
wb_new_ui/assets/NewGroup/mgr/component/play_set/item_rewards.xml
View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="905,135">
<controller name="c1" pages="0,,6,,7," selected="0"/>
<controller name="type" pages="0,,1,,2,,3," selected="1">
<controller name="type" pages="0,,1,,2,,3," selected="0">
<action type="change_page" fromPage="0,1" toPage="2,3" controller="c1" targetPage="0"/>
</controller>
<controller name="last" pages="0,,1," selected="1"/>
<controller name="last" pages="0,,1," selected="0"/>
<controller name="first" pages="0,,1," selected="0"/>
<controller name="give_owner" pages="0,,1," selected="0"/>
<displayList>
<component id="n96_kwi0" name="cb_method" src="mkdvhdu" fileName="component/Btn/ComboBox1.xml" xy="4,0" size="199,49" controller="type,1">
<gearLook controller="type" pages="2,3" values="1,0,0,0|1,0,0,0" default="1,0,0,1"/>
<component id="n96_kwi0" name="cb_method" src="mkdvhdu" fileName="component/Btn/ComboBox1.xml" xy="4,-1" size="199,49" touchable="false" controller="type,0">
<gearLook controller="type" pages="0,2,3" values="1,0,0,0|1,0,0,0|1,0,0,0" default="1,0,0,1"/>
<relation target="" sidePair="center-center%"/>
<ComboBox title="固定抽水" visibleItemCount="5" direction="down" selectionController="c1">
<item title="固定抽水" value="1"/>
@ -59,7 +59,7 @@
<relation target="" sidePair="center-center%"/>
</component>
<group id="n119_124ey" name="n119" xy="221,0" size="554,50"/>
<component id="n108_mpll" name="cb_type2" src="mkdvhdu" fileName="component/Btn/ComboBox1.xml" xy="221,0" size="193,49" group="n120_124ey" controller="type,1">
<component id="n108_mpll" name="cb_type2" src="mkdvhdu" fileName="component/Btn/ComboBox1.xml" xy="221,0" size="193,49" group="n120_124ey" touchable="false" controller="type,1">
<gearDisplay controller="c1" pages="1,2"/>
<relation target="" sidePair="center-center%"/>
<ComboBox visibleItemCount="5" direction="down">
@ -69,7 +69,7 @@
<item title="三个赢家" value="3"/>
</ComboBox>
</component>
<component id="n99_kwi0" name="cb_proportion2" src="mkdvhdu" fileName="component/Btn/ComboBox1.xml" xy="438,0" size="193,49" group="n120_124ey" controller="type,1">
<component id="n99_kwi0" name="cb_proportion2" src="mkdvhdu" fileName="component/Btn/ComboBox1.xml" xy="438,0" size="193,49" group="n120_124ey" touchable="false" controller="type,1">
<gearDisplay controller="c1" pages="1"/>
<relation target="" sidePair="center-center%"/>
<ComboBox visibleItemCount="5" direction="down">
@ -198,6 +198,6 @@
<group id="n111_vz9l" name="n111" xy="438,71" size="365,49" group="n109_g21o" advanced="true">
<gearDisplay controller="c1" pages="1"/>
</group>
<group id="n109_g21o" name="n109" xy="-3,50" size="868,86"/>
<group id="n109_g21o" name="n109" xy="-3,50" size="868,86" visible="false" advanced="true"/>
</displayList>
</component>