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

1111

master
罗家炜 2025-11-11 16:36:38 +08:00
parent e31af96f0e
commit 4ca65a4f32
6 changed files with 235 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lua_probject/base_project/Game/View/Lobby/LobbyHeadView.lua
View File

@ -11,9 +11,9 @@ local LobbyHeadView = {}
local M = LobbyHeadView local M = LobbyHeadView
function LobbyHeadView.new(user,agent,callback) function LobbyHeadView.new(user, agent, callback)
setmetatable(M, {__index = BaseWindow}) setmetatable(M, { __index = BaseWindow })
local self = setmetatable({}, {__index = M}) local self = setmetatable({}, { __index = M })
self.class = "LobbyHeadView" self.class = "LobbyHeadView"
self._user = user self._user = user
self._agent = agent self._agent = agent
@ -37,38 +37,38 @@ function M:fill_item(item_name, title, callback)
item.text = title item.text = title
ctr_c1.selectedIndex = 1 ctr_c1.selectedIndex = 1
end end
btn_opt.onClick:Set(function () btn_opt.onClick:Set(function()
callback() callback()
end) end)
end end
function M:fill_user_info() function M:fill_user_info()
local real_info = self._user.real_info local real_info = self._user.real_info
self:fill_item("item_real",real_info and real_info.name or nil,function () self:fill_item("item_real", real_info and real_info.name or nil, function()
local real_view = RealAddressView.new(0,function () local real_view = RealAddressView.new(0, function()
self:fill_user_info() self:fill_user_info()
end) end)
real_view:Show() real_view:Show()
end) end)
local address = self._user.address local address = self._user.address
self:fill_item("item_address",address,function () self:fill_item("item_address", address, function()
local real_view = RealAddressView.new(1,function () local real_view = RealAddressView.new(1, function()
self:fill_user_info() self:fill_user_info()
end) end)
real_view:Show() real_view:Show()
end) end)
local phone = self._user.phone local phone = self._user.phone
self:fill_item("item_phone",phone and ViewUtil.phone_hide(phone) or nil,function () self:fill_item("item_phone", phone and ViewUtil.phone_hide(phone) or nil, function()
local phone_view = PhoneBindView.new(function () local phone_view = PhoneBindView.new(function()
self:fill_user_info() self:fill_user_info()
end) end)
phone_view:Show() phone_view:Show()
end) end)
local password = self._user.password local password = self._user.password
self:fill_item("item_password",password,function () self:fill_item("item_password", password, function()
-- if not phone then -- if not phone then
-- ViewUtil.ShowTips("请绑定手机号") -- ViewUtil.ShowTips("请绑定手机号")
-- return -- return
@ -92,24 +92,24 @@ function M:fill_user_info()
local item_invte = self.user_info:GetChild("item_invte") local item_invte = self.user_info:GetChild("item_invte")
local ctr_invte = item_invte:GetController("c1") local ctr_invte = item_invte:GetController("c1")
ctr_invte.selectedIndex = invitation ctr_invte.selectedIndex = invitation
ctr_invte.onChanged:Set(function () ctr_invte.onChanged:Set(function()
ViewUtil.ShowModalWait() ViewUtil.ShowModalWait()
local loddyctr = ControllerManager.GetController(LoddyController) local loddyctr = ControllerManager.GetController(LoddyController)
local _data = {} local _data = {}
_data.type =5 _data.type = 5
_data.invitation = ctr_invte.selectedIndex _data.invitation = ctr_invte.selectedIndex
loddyctr:UpdateUserInfo(_data,function( res) loddyctr:UpdateUserInfo(_data, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if (res.ReturnCode ==0) then if (res.ReturnCode == 0) then
DataManager.SelfUser.invitation = ctr_invte.selectedIndex DataManager.SelfUser.invitation = ctr_invte.selectedIndex
else else
ViewUtil.ErrorTip(res.ReturnCode,"提交失败") ViewUtil.ErrorTip(res.ReturnCode, "提交失败")
end end
end) end)
end) end)
local acc = self._user.acc local acc = self._user.acc
self:fill_item("item_wx",acc and "(绑定:"..self._user.nick_name..")" or "",function () self:fill_item("item_wx", acc and "(绑定:" .. self._user.nick_name .. ")" or "", function()
local wx_view = WeChatView.new(function() local wx_view = WeChatView.new(function()
self:fill_user_info() self:fill_user_info()
end) end)
@ -128,7 +128,6 @@ function M:fill_user_info()
end) end)
end end
function M:ChangeToLogin() function M:ChangeToLogin()
local _curren_msg = MsgWindow.new(self._root_view, '您是否退出当前账号?', MsgWindow.MsgMode.OkAndCancel) local _curren_msg = MsgWindow.new(self._root_view, '您是否退出当前账号?', MsgWindow.MsgMode.OkAndCancel)
_curren_msg.onOk:Add(function() _curren_msg.onOk:Add(function()
@ -140,7 +139,7 @@ function M:ChangeToLogin()
end end
function M:init(url) function M:init(url)
BaseWindow.init(self,url) BaseWindow.init(self, url)
self._close_destroy = true self._close_destroy = true
self._close_zone = true self._close_zone = true
local view = self._view local view = self._view
@ -150,7 +149,7 @@ function M:init(url)
local ct_state = view:GetController("state") local ct_state = view:GetController("state")
view:GetChild("tex_nickname").text = self._user.nick_name view:GetChild("tex_nickname").text = self._user.nick_name
local str_playerid = self._user.account_id local str_playerid = self._user.account_id
view:GetChild("tex_id").text = "ID:"..str_playerid view:GetChild("tex_id").text = "ID:" .. str_playerid
local btn_head = view:GetChild("btn_head") local btn_head = view:GetChild("btn_head")

22
lua_probject/base_project/Game/View/Lobby/PhoneBindView.lua
View File

@ -3,8 +3,8 @@ local PhoneBindView = {}
local M = PhoneBindView local M = PhoneBindView
function PhoneBindView.new(callback) function PhoneBindView.new(callback)
setmetatable(M, {__index = BaseWindow}) setmetatable(M, { __index = BaseWindow })
local self = setmetatable({}, {__index = M}) local self = setmetatable({}, { __index = M })
self.class = "PhoneBindView" self.class = "PhoneBindView"
self._callback = callback self._callback = callback
self._close_destroy = true self._close_destroy = true
@ -14,7 +14,7 @@ function PhoneBindView.new(callback)
end end
function M:init(url) function M:init(url)
BaseWindow.init(self,url) BaseWindow.init(self, url)
if DataManager.SelfUser.phone then if DataManager.SelfUser.phone then
local ctr_update = self._view:GetController("update") local ctr_update = self._view:GetController("update")
@ -39,7 +39,7 @@ function M:GetCode()
return return
end end
local loddyctr = ControllerManager.GetController(LoddyController) local loddyctr = ControllerManager.GetController(LoddyController)
loddyctr:GetPhoneCode(phone,function( res) loddyctr:GetPhoneCode(phone, function(res)
if res.ReturnCode == 0 then if res.ReturnCode == 0 then
self._view:GetController("code").selectedIndex = 1 self._view:GetController("code").selectedIndex = 1
self._left_time = 120 self._left_time = 120
@ -57,10 +57,10 @@ function M:OnUpdate()
_left_time = _left_time - deltaTime _left_time = _left_time - deltaTime
_left_time = math.max(0, _left_time) _left_time = math.max(0, _left_time)
local leftTime = math.floor(_left_time) local leftTime = math.floor(_left_time)
self._view:GetChild("tex_time").text = tostring(leftTime).."后重新发送" self._view:GetChild("tex_time").text = tostring(leftTime) .. "后重新发送"
self._left_time = _left_time self._left_time = _left_time
else else
self._view:GetController("code").selectedIndex=0 self._view:GetController("code").selectedIndex = 0
UpdateBeat:Remove(self.OnUpdate, self) UpdateBeat:Remove(self.OnUpdate, self)
end end
end end
@ -80,19 +80,19 @@ function M:Bind()
if not code then if not code then
return return
end end
ViewUtil.ShowModalWait(self._root_view,"正在提交...") ViewUtil.ShowModalWait(self._root_view, "正在提交...")
local loddyctr = ControllerManager.GetController(LoddyController) local loddyctr = ControllerManager.GetController(LoddyController)
local _data = {} local _data = {}
_data.type =4 _data.type = 4
_data.phone = phone _data.phone = phone
_data.code = code _data.code = code
loddyctr:UpdateUserInfo(_data,function( res) loddyctr:UpdateUserInfo(_data, function(res)
ViewUtil.CloseModalWait() ViewUtil.CloseModalWait()
if (res.ReturnCode ==0) then if (res.ReturnCode == 0) then
DataManager.SelfUser.phone = phone DataManager.SelfUser.phone = phone
if self._callback then self._callback() end if self._callback then self._callback() end
else else
ViewUtil.ErrorTip(res.ReturnCode,"提交失败") ViewUtil.ErrorTip(res.ReturnCode, "提交失败")
end end
self:Close() self:Close()
end) end)

4
lua_probject/base_project/Game/View/LoginView.lua
View File

@ -18,7 +18,6 @@ end
--@function [parent=#LoginView] init --@function [parent=#LoginView] init
--@param self --@param self
function M:init() function M:init()
UIPackage.AddPackage("base/login/ui/Login") UIPackage.AddPackage("base/login/ui/Login")
@ -78,8 +77,8 @@ function M:init()
if not s then if not s then
print("Error:" .. e) print("Error:" .. e)
end end
DataManager.SelfUser.acc = utez DataManager.SelfUser.acc = utez
-- DataManager.SelfUser.acc = utez
DataManager.SelfUser.nick_name = utez DataManager.SelfUser.nick_name = utez
DataManager.SelfUser.sex = 1 DataManager.SelfUser.sex = 1
DataManager.SelfUser.head_url = "" DataManager.SelfUser.head_url = ""
@ -88,7 +87,6 @@ function M:init()
-- end -- end
-- end) -- end)
end) end)
local btn_phone = view:GetChild("btn_phone") local btn_phone = view:GetChild("btn_phone")

28
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone.lua
View File

@ -698,21 +698,25 @@ function M:RecursionGetPropLog(members, index)
self.groupumberTemp.valid_round = info.valid_count * 100 self.groupumberTemp.valid_round = info.valid_count * 100
self.groupumberTemp.reward_hp = info.pump self.groupumberTemp.reward_hp = info.pump
self.groupumberTemp.total_win = 0 self.groupumberTemp.total_win = 0
ViewUtil.CloseModalWait()
fgCtr:FG_GetMembersCount(self.group_id, function(res)
ViewUtil.CloseModalWait()
if res.ReturnCode == 0 then
self.groupumberTemp.hpall = {} self.groupumberTemp.hpall = {}
self.groupumberTemp.hpall.hp = res.Data.hp_num1 + res.Data.otherHp self.groupumberTemp.hpall.hp = info.hp_num1
self.record_data[1] = self.groupumberTemp self.record_data[1] = self.groupumberTemp
-- for i = 1, #members do
-- self.record_data[#self.record_data + 1] = members[i]
-- end
self:NewRecordTable(1) self:NewRecordTable(1)
else ViewUtil.CloseModalWait()
ViewUtil.ErrorTip(res.ReturnCode, "目标没有总线值") -- fgCtr:FG_GetMembersCount(self.group_id, function(res)
end -- ViewUtil.CloseModalWait()
end) -- if res.ReturnCode == 0 then
-- self.groupumberTemp.hpall = {}
-- self.groupumberTemp.hpall.hp = res.Data.hp_num1 + res.Data.otherHp
-- self.record_data[1] = self.groupumberTemp
-- -- for i = 1, #members do
-- -- self.record_data[#self.record_data + 1] = members[i]
-- -- end
-- self:NewRecordTable(1)
-- else
-- ViewUtil.ErrorTip(res.ReturnCode, "目标没有总线值")
-- end
-- end)
end end
-- self.lst_record.numItems = #self.record_data -- self.lst_record.numItems = #self.record_data
end) end)

76
lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatViewAlone2.lua
View File

@ -138,6 +138,10 @@ function M:InitView()
if res.ReturnCode ~= 0 then if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, '找不到成员') ViewUtil.ErrorTip(res.ReturnCode, '找不到成员')
else else
if not res.Data.members or #res.Data.members == 0 then
ViewUtil.ErrorTip(res.ReturnCode, '找不到成员')
return
end
self.ctr_search.selectedIndex = 1 self.ctr_search.selectedIndex = 1
self:ChangedClear(0) self:ChangedClear(0)
self:InitListRecordFind() self:InitListRecordFind()
@ -303,6 +307,12 @@ function M:ListRenderer(index, obj)
obj:GetChild('btn_super').visible = not dataInfo.partnerLev or dataInfo.partnerLev > 0 obj:GetChild('btn_super').visible = not dataInfo.partnerLev or dataInfo.partnerLev > 0
obj:GetChild('btn_super').onClick:Set(function() obj:GetChild('btn_super').onClick:Set(function()
local myInfo = self._data_record[tempLev][tempIndex]
if myInfo._flag_normol then
ViewUtil.ErrorTip(nil, '已获取全部普通用户')
return
end
myInfo._flag_normol = true
if obj:GetController("more").selectedIndex == 0 then if obj:GetController("more").selectedIndex == 0 then
self:ChangedClear(tempLev) self:ChangedClear(tempLev)
ViewUtil:ShowModalWait() ViewUtil:ShowModalWait()
@ -433,22 +443,30 @@ function M:GetPropLog(index)
self.groupumberTemp.valid_round = info.valid_count * 100 self.groupumberTemp.valid_round = info.valid_count * 100
self.groupumberTemp.reward_hp = info.pump self.groupumberTemp.reward_hp = info.pump
self.groupumberTemp.total_win = 0 self.groupumberTemp.total_win = 0
ViewUtil.CloseModalWait()
fgCtr:FG_GetMembersCount(self.group_id, function(res)
ViewUtil.CloseModalWait()
if res.ReturnCode == 0 then
self.groupumberTemp.hpall = {} self.groupumberTemp.hpall = {}
self.groupumberTemp.hpall.hp = res.Data.hp_num1 + res.Data.otherHp self.groupumberTemp.hpall.hp = info.hp_num1
self.groupumberTemp.hpall.total_member = res.Data.member_num self.groupumberTemp.hpall.total_member = info.member_num or 0
self:InsertTableRecord(1, self.groupumberTemp) self:InsertTableRecord(1, self.groupumberTemp)
self._selectedLev = 1 self._selectedLev = 1
self._selectIndex = 1 self._selectIndex = 1
self._selectIndexList[self._selectedLev] = self._selectIndex self._selectIndexList[self._selectedLev] = self._selectIndex
self:LevGetRecordData(0, self.groupumberTemp) self:LevGetRecordData(0, self.groupumberTemp)
else ViewUtil.CloseModalWait()
ViewUtil.ErrorTip(res.ReturnCode, "目标没有总线值") -- fgCtr:FG_GetMembersCount(self.group_id, function(res)
end -- ViewUtil.CloseModalWait()
end) -- if res.ReturnCode == 0 then
-- self.groupumberTemp.hpall = {}
-- self.groupumberTemp.hpall.hp = res.Data.hp_num1 + res.Data.otherHp
-- self.groupumberTemp.hpall.total_member = res.Data.member_num
-- self:InsertTableRecord(1, self.groupumberTemp)
-- self._selectedLev = 1
-- self._selectIndex = 1
-- self._selectIndexList[self._selectedLev] = self._selectIndex
-- self:LevGetRecordData(0, self.groupumberTemp)
-- else
-- ViewUtil.ErrorTip(res.ReturnCode, "目标没有总线值")
-- end
-- end)
end end
end) end)
end end
@ -462,6 +480,41 @@ function M:MoreChanged(context, data)
if myInfo then if myInfo then
self:ChangedClear(data.lev) self:ChangedClear(data.lev)
ViewUtil:ShowModalWait() ViewUtil:ShowModalWait()
if self.ctr_search.selectedIndex == 1 then
local time_type = self._view:GetController("type").selectedIndex
if self.begin_time ~= nil and self.end_time ~= nil then
time_type = 0
end
local fgCtr = ControllerManager.GetController(NewGroupController)
fgCtr:FG_FindPartnerStat(
self.group_id,
myInfo.uid, 0, 6, time_type, self.begin_time, self.end_time,
function(res)
-- printlog("aaaaaaaaaaaaaaaa22222222222222222222222222222")
-- pt(res)
ViewUtil.CloseModalWait()
if self._is_destroy then
return
end
if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, '找不到成员')
else
if not res.Data.members or #res.Data.members == 0 then
ViewUtil.ErrorTip(res.ReturnCode, '找不到成员')
return
end
self.ctr_search.selectedIndex = 1
self:ChangedClear(0)
self:InitListRecordFind()
self:InsertTableRecord(1, res.Data.members[1])
self._selectedLev = 1
self._selectIndex = 1
self._selectIndexList[self._selectedLev] = self._selectIndex
self:GetAllRecordData(0, { lev = 1, index = 1 })
end
end
)
else
if data.lev == 1 then if data.lev == 1 then
self._selectedLev = 1 self._selectedLev = 1
self._selectIndex = data.index self._selectIndex = data.index
@ -473,6 +526,7 @@ function M:MoreChanged(context, data)
self._selectIndexList[self._selectedLev] = self._selectIndex self._selectIndexList[self._selectedLev] = self._selectIndex
self:GetAllRecordData(0, data) self:GetAllRecordData(0, data)
end end
end
else else
ViewUtil.ErrorTip(nil, "统计页面失效，请重新打开") ViewUtil.ErrorTip(nil, "统计页面失效，请重新打开")
end end
@ -538,12 +592,12 @@ end
---@param index number 递归开始下标，默认传0 ---@param index number 递归开始下标，默认传0
---@param data table 自己拼接的信息，lev为点击数据所在的层级，index为点击数据所在的索引 ---@param data table 自己拼接的信息，lev为点击数据所在的层级，index为点击数据所在的索引
function M:GetNumberRecord(index, data) function M:GetNumberRecord(index, data)
ViewUtil.ShowModalWait("正在获取成员中")
local time_type = self._view:GetController("type").selectedIndex local time_type = self._view:GetController("type").selectedIndex
if self.begin_time ~= nil and self.end_time ~= nil then if self.begin_time ~= nil and self.end_time ~= nil then
time_type = 0 time_type = 0
end end
local myInfo = self._data_record[data.lev][data.index] local myInfo = self._data_record[data.lev][data.index]
ViewUtil.ShowModalWait("正在获取成员中")
local fatherInfo local fatherInfo
if self.ctr_search.selectedIndex == 1 then if self.ctr_search.selectedIndex == 1 then
fatherInfo = {} fatherInfo = {}

108
wb_new_ui/.objs/workspace.json
View File

@ -2,72 +2,66 @@
"libview.firstColumnWidth": 522, "libview.firstColumnWidth": 522,
"libview.iconScale": 0, "libview.iconScale": 0,
"doc.openedDocs": [ "doc.openedDocs": [
"ui://m7iejg46ilon7ias",
"ui://m7iejg46ilon7ia2",
"ui://m7iejg46cvc87i5y",
"ui://m7iejg46r0qx7i6u",
"ui://27vd145bcvc87i5t",
"ui://m7iejg46ruljhmp",
"ui://m7iejg46r96th8e",
"ui://m7iejg4610xl7i1w",
"ui://m7iejg46qlxihsl",
"ui://m7iejg46kwi0hld",
"ui://m7iejg46kwi0hmb",
"ui://m7iejg46kwi0hk0",
"ui://m7iejg46qlxihsm",
"ui://m7iejg46ilon7i9k",
"ui://m7iejg46kwdo7i97",
"ui://m7iejg468h207i99",
"ui://m7iejg46nwgkhx0",
"ui://m7iejg46nwgkhx2",
"ui://m7iejg46kk3uhro",
"ui://m7iejg46l7wn7i83",
"ui://m7iejg46tqi8hwa",
"ui://m7iejg46f6brhwx",
"ui://m7iejg46imp57ih3",
"ui://m7iejg46imp57igy",
"ui://m7iejg46ilon7ibl",
"ui://2d9xdj6zab5pciv",
"ui://2d9xdj6zab5pcji",
"ui://2d9xdj6znld2cjm",
"ui://m7iejg46hsbhhjn",
"ui://m7iejg46imp57ihp",
"ui://m7iejg46f6brhww", "ui://m7iejg46f6brhww",
"ui://m7iejg46t1hqhxw", "ui://v0j9abjygq7m8f",
"ui://2d9xdj6zlumrgj", "ui://v0j9abjygq7med",
"ui://2d9xdj6znlwcgk", "ui://1utjt0r2ufu92i",
"ui://2d9xdj6zl0lzb", "ui://lkq9ne9speuq20",
"ui://m7iejg4610snh5j", "ui://v0j9abjygq7mdk",
"ui://2d9xdj6zfn7fao", "ui://v0j9abjynlefsr",
"ui://lx6k641gajzhoe", "ui://9n9stu2eprgzf0",
"ui://lkq9ne9speuqbv", "ui://9n9stu2eprgzab",
"ui://m7iejg46kk3uhrs", "ui://9n9stu2ethxkcit",
"ui://m7iejg46z3847i6r", "ui://9n9stu2ethxkcis",
"ui://m7iejg46z3847i6m", "ui://9n9stu2eprgzee",
"ui://m7iejg46kwi0hkr" "ui://27vd145b7jqkcdl",
"ui://27vd145bhznkce2",
"ui://egnzysm7ffp3c5",
"ui://1utjt0r2ufu980",
"ui://9n9stu2eprgz88",
"ui://vplxondscioehnx",
"ui://niy3ldiwl9mn2s",
"ui://z3z0ysurajif77",
"ui://eyxz924gffp33y",
"ui://v0j9abjygq7m8k",
"ui://v0j9abjygq7m74",
"ui://v0j9abjygq7mh2",
"ui://4skil1l6bw4ggk",
"ui://4skil1l6dzx8118",
"ui://lkq9ne9speuq5a",
"ui://yzaioi79f55qvx",
"ui://yzaioi79seby1av",
"ui://v6yvqp7wf55qvx",
"ui://9n9stu2eprgz89",
"ui://9n9stu2em9jaha",
"ui://9n9stu2ehxjccif"
], ],
"test.device": "720p Phone", "test.device": "720p Phone",
"canvasColor": 10066329, "canvasColor": 10066329,
"auxline2": true, "auxline2": true,
"doc.activeDoc": "ui://m7iejg46f6brhww", "doc.activeDoc": "ui://vplxondscioehnx",
"libview.twoColumn": false, "libview.twoColumn": false,
"libview.expandedNodes": [ "libview.expandedNodes": [
"27vd145b", "442j0uep",
"/", "/",
"27vd145b", "442j0uep",
"/buttons/", "/component/",
"27vd145b", "9n9stu2e",
"/font/",
"27vd145b",
"/font/images/",
"27vd145b",
"/font/images/btn_keyboard/",
"27vd145b",
"/font/images/win/",
"m7iejg46",
"/", "/",
"m7iejg46", "9n9stu2e",
"/mgr/" "/component/",
"9n9stu2e",
"/component/Result/",
"9n9stu2e",
"/image/",
"9n9stu2e",
"/image/btn/",
"lkq9ne9s",
"/",
"lkq9ne9s",
"/component/",
"lkq9ne9s",
"/component/clearing/"
], ],
"auxline1": true, "auxline1": true,
"snapToGrid": true, "snapToGrid": true,