diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index 15abcd01..a2c44be8 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -412,6 +412,9 @@ end -- 邀请在线玩家 function M:FG_InvitePlayer(group_id, tag, player_id, roomid, pid, game_name, callback) + if not self._mgr_client then + return + end local _data = {} _data.groupId = group_id _data.tagId = tag @@ -456,12 +459,7 @@ end --被邀请玩家收到邀请 function M:FG_ResponseInvited(evt_data) - local invite_id = evt_data.invite_id - local g_name = evt_data.g_name - local roomid = evt_data.roomid - local pid = evt_data.pid - local groupid = evt_data.groupId - DispatchEvent(self._dispatcher, GroupMgrEvent.InviteResponse, invite_id, g_name, roomid, pid, groupid) + DispatchEvent(self._dispatcher, GroupMgrEvent.InviteResponse, evt_data) end -- 设置助理，来用给对面刷新界面 tagId=助理 diff --git a/lua_probject/base_project/Game/Controller/LoginController.lua b/lua_probject/base_project/Game/Controller/LoginController.lua index a5002067..fa832904 100644 --- a/lua_probject/base_project/Game/Controller/LoginController.lua +++ b/lua_probject/base_project/Game/Controller/LoginController.lua @@ -55,6 +55,7 @@ local function __Login(cmd, _data, callBack) user.phone = account.phone user.address = account.address user.games = FilterGame(data.games) + user.havaPsw = account.havaPassword if Application.platform == RuntimePlatform.WindowsPlayer or Application.platform == RuntimePlatform.WindowsEditor then --GameApplication.Instance.printLog = true else diff --git a/lua_probject/base_project/Game/IGameInfo.lua b/lua_probject/base_project/Game/IGameInfo.lua index 5ff784a2..0582ac26 100644 --- a/lua_probject/base_project/Game/IGameInfo.lua +++ b/lua_probject/base_project/Game/IGameInfo.lua @@ -41,10 +41,10 @@ end function M:OnChangeOption(ctype) self:ShowRoomPrice(ctype) - local round = self._config:GetController("round") - round.onChanged:Set(function() - self:ShowVariablePrice(ctype) - end) + -- local round = self._config:GetController("round") + -- round.onChanged:Set(function() + -- self:ShowVariablePrice(ctype) + -- end) end function M:ShowVariablePrice(ctype) diff --git a/lua_probject/base_project/Game/View/FGAssistView.lua b/lua_probject/base_project/Game/View/FGAssistView.lua index 9be52dfc..76de296e 100644 --- a/lua_probject/base_project/Game/View/FGAssistView.lua +++ b/lua_probject/base_project/Game/View/FGAssistView.lua @@ -63,7 +63,6 @@ function FGAssistView.new(blur_view, group_id, callback) self.callback = callback self:init("ui://FGAssist/panel_assist") - print("lingmeng FGAssistView new") return self end @@ -191,28 +190,27 @@ end -- end function M:GetOnlinePlayers(index) index = index or 0 - print("lingmeng GetOnlinePlayers", self.group_id) local group = DataManager.groups:get(self.group_id) local fgCtr = ControllerManager.GetController(NewGroupController) - if not group then - fgCtr:FG_GroupList(function(res) - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "连接亲友圈失败") - else - fgCtr:FG_EnterGroup(self.group_id, function(res) - ViewUtil:CloseModalWait2() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "连接亲友圈失败") - else - self:GetOnlinePlayersshow(fgCtr, DataManager.groups:get(self.group_id), index) - return 1 - end - end) - end - end) - else - self:GetOnlinePlayersshow(fgCtr, group, index) - end + -- if not group then + fgCtr:FG_GroupList(function(res) + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "连接亲友圈失败") + else + fgCtr:FG_EnterGroup(self.group_id, function(res) + ViewUtil:CloseModalWait2() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "连接亲友圈失败") + else + self:GetOnlinePlayersshow(fgCtr, DataManager.groups:get(self.group_id), index) + return 1 + end + end) + end + end) + -- else + -- self:GetOnlinePlayersshow(fgCtr, group, index) + -- end end function M:GetOnlinePlayersshow(fgCtr, group, index) diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua index b0b01186..f85ad213 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua @@ -167,20 +167,22 @@ end function M:_evtInviteResponse(...) local arg = { ... } - local invite_id = arg[1] - local g_name = arg[2] - local roomid = arg[3] - local pid = arg[4] - local groupid = arg[5] + local evt_data = arg[1] + local invite_id = evt_data.invite_id + local nik = evt_data.nik + local g_name = evt_data.g_name + local roomid = evt_data.roomid + local pid = evt_data.pid + local groupid = evt_data.groupId + local playInfo = evt_data.pinfo local roomCtr = ControllerManager.GetController(RoomController) - local gameId = DataManager.groups:get(groupid):getPlay(pid).gameId UIPackage.AddPackage('base/newgroup/ui/FGAssist') local imv = FGInvitedMsgView.new( self._root_view, groupid, - pid, - invite_id, + playInfo, + nik, function() roomCtr:PublicJoinRoom( Protocol.WEB_FG_JOIN_ROOM, @@ -199,7 +201,8 @@ function M:_evtInviteResponse(...) return else UpdateBeat:Remove(self.OnUpdate, self) - ViewManager.ChangeView(ViewManager.View_Main, gameId, { _flag_showTip = true }) + ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id, + { _flag_showTip = true }) end end, groupid, diff --git a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua index 38efa988..53f570d0 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua @@ -4,7 +4,7 @@ local FamilyInvitedMsgView = {} local M = FamilyInvitedMsgView setmetatable(M, { __index = BaseWindow }) -function FamilyInvitedMsgView.new(blur_view, groupid, pid, invite_id, callback) +function FamilyInvitedMsgView.new(blur_view, groupid, pinfo, nik, callback) print("lingmeng FGAssistInviteView") local self = setmetatable({}, { __index = M }) self.class = "FGAssistInviteView" @@ -14,8 +14,8 @@ function FamilyInvitedMsgView.new(blur_view, groupid, pid, invite_id, callback) self._put_map = false self._close_destroy = true self.groupid = groupid - self.pid = pid - self.invite_id = invite_id + self.pinfo = pinfo + self.nik = nik self.callback = callback UIPackage.AddPackage('base/newgroup/ui/FGAssist') self:initView("ui://FGAssist/panel_invited") @@ -35,45 +35,35 @@ function M:initView(url) self._viewText_playName.emojies = EmojiDitc.EmojiesDitc self._view:GetChild('btn_no').onClick:Set(function() - print("lingmeng btn_no") self:Destroy() end) - print("lingmeng FGAssistInviteView5") self._view:GetChild('btn_yes').onClick:Set(function() - print("lingmeng btn_yes", self.callback) - if self.callback then self.callback() end self:Destroy() end) - print("lingmeng FGAssistInviteViewend") self:FillData() end function M:FillData() local group = DataManager.groups:get(self.groupid) - local play = group:getPlay(self.pid) - local player = group.memberMap[self.invite_id] - - if player == nil then - return - end + local play = self.pinfo --print("lingmeng FillData", self.groupid, self.pid, self.invite_id, type(self.invite_id), type(self.groupid),player) --pt(group.memberMap) self._viewText_groupName.text = Utils.TextOmit(group.name, 6, "...") self._viewText_gameName.text = play.game_name - self._viewText_inviteName.text = player.nick + self._viewText_inviteName.text = self.nik self._viewText_playName.text = Utils.TextOmit(play.name, 6, "...") local config = ExtendManager.GetExtendConfig(play.gameId) local mode = config:GetGameInfo() local gamePlay = mode:LoadConfigToDetail(play.config, play.hpData) - self._viewText_playConfig.text = play.hp_times / 1000 .. "倍," .. gamePlay + self._viewText_playConfig.text = gamePlay end function M:Destroy() diff --git a/lua_probject/base_project/Game/View/IdPasswordLoginView.lua b/lua_probject/base_project/Game/View/IdPasswordLoginView.lua new file mode 100644 index 00000000..1d638d74 --- /dev/null +++ b/lua_probject/base_project/Game/View/IdPasswordLoginView.lua @@ -0,0 +1,118 @@ +local IdPasswordLoginView = {} + +local M = IdPasswordLoginView + +function IdPasswordLoginView.new(type, callback) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) + self.class = "IdPasswordLoginView" + self._callback = callback + self._close_destroy = true + self.codeType = type + self:init("ui://Login/IDLogin") + + return self +end + +function M:init(url) + BaseWindow.init(self, url) + + local btn_login = self._view:GetChild("btn_login") + btn_login.onClick:Add(handler(self, function() + self:login() + end)) +end + +function M:login() + if self.codeType == 0 then + local uid = self:CheckInputId() + if not uid then + return + end + local loginCtr = ControllerManager.GetController(LoginController) + local passwd = self:CheckInputPasswd() + if not passwd then + return + end + ViewUtil.ShowModalWait2() + loginCtr:IdPasswordLogin(uid, passwd, function(res) + ViewUtil.CloseModalWait2() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "ID或者密码错误") + return + end + self._callback(res) + end) + else + ---[[ + --直接登入 + local loginCtr = ControllerManager.GetController(LoginController) + + local phone = self:CheckInputPhone() + if not phone then + return + end + + local code = self:CheckInputPhoneCode() + if not code then + return + end + + loginCtr:PhoneLogin(phone, code, function(res) + if res.ReturnCode ~= 0 then + local msg_txt = "验证码错误" + if (Table_Error_code_Map[res.ReturnCode] ~= nil) then + msg_txt = Table_Error_code_Map[res.ReturnCode].note + end + local guo_msg = MsgWindow.new(self._root_view, msg_txt, MsgWindow.MsgMode.OnlyOk) + guo_msg._new_hide = false + guo_msg:Show() + return + end + self._callback(res) + self:Destroy() + end) + end +end + +function M:Destroy() + getmetatable(M).__index.Destroy(self) +end + +function M:CheckInputId() + local uid = self._view:GetChild("phone_input").text + if not (string.len(uid) >= 6) then + ViewUtil.ShowTips("请输入正确的用户ID") + return + end + return uid +end + +function M:CheckInputPasswd() + local tex_passwd = self._view:GetChild("tex_passwd").text + if string.len(tex_passwd) < 8 then + ViewUtil.ShowTips("密码最少八位") + return + end + return tex_passwd +end + +function M:CheckInputPhone() + local phone = self._view:GetChild("phone_input").text + if not (string.len(phone) == 11) then + ViewUtil.ShowTips("请输入正确的电话号码") + return + end + return phone +end + +function M:CheckInputPhoneCode() + local code = self._view:GetChild("code_input").text + if string.len(code) ~= 6 then + ViewUtil.ShowTips("请输入正确的验证码") + return + end + return code +end + +return M diff --git a/lua_probject/base_project/Game/View/Lobby/LobbyPlayerInfoView.lua b/lua_probject/base_project/Game/View/Lobby/LobbyPlayerInfoView.lua index ad639d3c..2b185868 100644 --- a/lua_probject/base_project/Game/View/Lobby/LobbyPlayerInfoView.lua +++ b/lua_probject/base_project/Game/View/Lobby/LobbyPlayerInfoView.lua @@ -1,5 +1,5 @@ --设置窗口对象 -local PhoneLoginView = import(".PhoneLoginView2") +local PasswordUpdateView = import(".PasswordUpdateView") local LobbyPlayerInfoView = {} @@ -12,6 +12,7 @@ function LobbyPlayerInfoView.new(user, callback) self._close_destroy = true self.user = user self._callback = callback + self._loadAll = 0 self:init('ui://Lobby/PlayerInfo') return self end @@ -31,16 +32,23 @@ function M:init(url) view:GetController('ctr_sex').selectedIndex = user.sex - 1 view:GetChild('ip').text = DataManager.SelfUser.currenIp ImageLoad.Load(DataManager.SelfUser.head_url, view:GetChild("btn_PlayerHead")._iconObject) - GameApplication.Instance:GetPublicIP(function(ip) - DataManager.SelfUser.currenIp = ip - end) + if DataManager.SelfUser.currenIp then + self._loadAll = self._loadAll + 1 + else + GameApplication.Instance:GetPublicIP(function(ip) + DataManager.SelfUser.currenIp = ip + view:GetChild('ip').text = DataManager.SelfUser.currenIp + self:CheckAllload() + end) + end + --change view:GetChild('choose_id').text = user.account_id view:GetChild('choose_diamo').text = user.diamo - if user.phone and #user.phone == 11 then - self._view:GetChild('btn_changeInfo').visible = false - self._view:GetChild('btn_changeInfo').touchable = false - end + -- if user.phone and #user.phone == 11 then + -- self._view:GetChild('btn_changeInfo').visible = false + -- self._view:GetChild('btn_changeInfo').touchable = false + -- end self.Lable_name = view:GetChild('Lable_name'):GetChild('text') self.Lable_name.text = user.nick_name self.group_sex = view:GetController('group_sex') @@ -105,18 +113,30 @@ function M:init(url) end) end) + local pswType = DataManager.SelfUser.havaPsw and 1 or 0 local btn_changeInfo = self._view:GetChild('btn_changeInfo') + btn_changeInfo:GetController('type').selectedIndex = pswType btn_changeInfo.onClick:Set(function() - local phoneLoginView = PhoneLoginView.new(1, function(res) - view:GetChild('phone').text = res.Data.phone - user.phone = res.Data.phone - if user.phone and #user.phone == 11 then - self._view:GetChild('btn_changeInfo').visible = false - self._view:GetChild('btn_changeInfo').touchable = false - end + local passwordUpdateView = PasswordUpdateView.new(pswType, function(res) + pswType = DataManager.SelfUser.havaPsw and 1 or 0 + btn_changeInfo:GetController('type').selectedIndex = pswType end) - phoneLoginView:Show() + passwordUpdateView:Show() + end) + + local loddyCtr1 = ControllerManager.GetController(LoddyController) + loddyCtr1:GetUserInfo(function(res) + if res.ReturnCode == 0 then + self:CheckAllload() + end end) end +function M:CheckAllload() + self._loadAll = self._loadAll + 1 + if self._loadAll >= 2 then + self:Show() + end +end + return M diff --git a/lua_probject/base_project/Game/View/Lobby/PasswordUpdateView.lua b/lua_probject/base_project/Game/View/Lobby/PasswordUpdateView.lua new file mode 100644 index 00000000..36a30ca8 --- /dev/null +++ b/lua_probject/base_project/Game/View/Lobby/PasswordUpdateView.lua @@ -0,0 +1,157 @@ +local PasswordUpdateView = {} + +local M = PasswordUpdateView + +function PasswordUpdateView.new(type, callback) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) + self.class = "PasswordUpdateView" + self._callback = callback + self._close_destroy = true + -- self.codeType = type + self.codeType = 0 + self:init("ui://Lobby/PasswordSet") + + return self +end + +function M:init(url) + BaseWindow.init(self, url) + self.login_type = self._view:GetController("type") + self.login_type.selectedIndex = self.codeType + + local btn_login = self._view:GetChild("btn_login") + btn_login.onClick:Add(handler(self, function() + self:Bind() + end)) +end + +function M:Bind() + if self.codeType == 0 then + local passwd = self:CheckInputPasswd() + if not passwd then + return + end + local loddyctr = ControllerManager.GetController(LoddyController) + local _data = {} + _data.password = passwd + _data.type = 3 + ViewUtil.ShowModalWait2() + loddyctr:UpdateUserInfo(_data, function(res) + ViewUtil.CloseModalWait2() + if (res.ReturnCode == 0) then + DataManager.SelfUser.havaPsw = true + self.login_type.selectedIndex = 1 + if self._callback then self._callback() end + else + ViewUtil.ErrorTip(res.ReturnCode, "提交失败") + end + self:Close() + end) + else + local myPwd = self:CheckInputPasswd2() + if not myPwd then + return + end + + local passwd = self:CheckInputPasswd() + if not passwd then + return + end + local loddyctr = ControllerManager.GetController(LoddyController) + local _data = {} + _data.password = passwd + _data.type = 3 + ViewUtil.ShowModalWait2() + loddyctr:UpdateUserInfo(_data, function(res) + ViewUtil.CloseModalWait2() + if (res.ReturnCode == 0) then + DataManager.SelfUser.havaPsw = true + self.login_type.selectedIndex = 1 + if self._callback then self._callback() end + else + ViewUtil.ErrorTip(res.ReturnCode, "提交失败") + end + self:Close() + end) + end +end + +function M:Destroy() + UpdateBeat:Remove(self.OnUpdate, self) + getmetatable(M).__index.Destroy(self) +end + +function M:CheckInputId() + local uid = self._view:GetChild("phone_input").text + if not (string.len(uid) >= 6) then + ViewUtil.ShowTips("请输入正确的用户ID") + return + end + return uid +end + +function M:CheckInputPasswd2() + local tex_passwd = self._view:GetChild("my_input").text + if string.len(tex_passwd) < 8 then + ViewUtil.ShowTips("旧密码最少八位") + return + end + return tex_passwd +end + +function M:CheckInputPasswd() + local tex_frist_passwd = self._view:GetChild("phone_input").text + local tex_confrim_passwd = self._view:GetChild("code_input").text + + if string.len(tex_frist_passwd) < 8 then + ViewUtil.ShowTips("密码最少八位") + return + end + + local flg_xiaozimu = false + local flg_dazimu = false + local fla_shuzi = false + for i = 1, #tex_frist_passwd do + local oneChar = string.sub(tex_frist_passwd, i, i) + print("lingmeng Bind", oneChar, string.byte(oneChar)) + if string.byte(oneChar) >= 65 and string.byte(oneChar) <= 90 then + flg_dazimu = true + elseif string.byte(oneChar) >= 97 and string.byte(oneChar) <= 122 then + flg_xiaozimu = true + elseif string.byte(oneChar) >= 48 and string.byte(oneChar) <= 57 then + fla_shuzi = true + end + end + if not ((flg_xiaozimu or flg_dazimu) and fla_shuzi) then + ViewUtil.ShowTips("密码必须同时包含字母和数字") + return + end + + if tex_frist_passwd ~= tex_confrim_passwd then + ViewUtil.ShowTips("确认密码必须和输入密码保持一致") + return + end + + return tex_confrim_passwd +end + +function M:CheckInputPhone() + local phone = self._view:GetChild("phone_input").text + if not (string.len(phone) == 11) then + ViewUtil.ShowTips("请输入正确的电话号码") + return + end + return phone +end + +function M:CheckInputPhoneCode() + local code = self._view:GetChild("code_input").text + if string.len(code) ~= 6 then + ViewUtil.ShowTips("请输入正确的验证码") + return + end + return code +end + +return M diff --git a/lua_probject/base_project/Game/View/Lobby/PhonePasswordView.lua b/lua_probject/base_project/Game/View/Lobby/PhonePasswordView.lua index 3fd35581..c2bda02e 100644 --- a/lua_probject/base_project/Game/View/Lobby/PhonePasswordView.lua +++ b/lua_probject/base_project/Game/View/Lobby/PhonePasswordView.lua @@ -83,15 +83,6 @@ function M:Bind() end local _data = {} - -- if self.ctr_update.selectedIndex == 1 then - - -- local code = self:CheckInputCode() - -- if not code then - -- return - -- end - -- _data.phone = DataManager.SelfUser.phone - -- _data.code = code - -- end ViewUtil.ShowModalWait2(self._root_view, "正在提交...") local loddyctr = ControllerManager.GetController(LoddyController) _data.password = password diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua index 86571aa8..4182ece1 100644 --- a/lua_probject/base_project/Game/View/LobbyView.lua +++ b/lua_probject/base_project/Game/View/LobbyView.lua @@ -193,7 +193,7 @@ function M:InitView(url) local lobbyPlayerInfoView = LobbyPlayerInfoView.new(DataManager.SelfUser, function() ImageLoad.Load(DataManager.SelfUser.head_url, btn_head._iconObject) end) - lobbyPlayerInfoView:Show() + -- lobbyPlayerInfoView:Show() end) diff --git a/lua_probject/base_project/Game/View/LoginView.lua b/lua_probject/base_project/Game/View/LoginView.lua index c6fca6ec..dc43a80a 100644 --- a/lua_probject/base_project/Game/View/LoginView.lua +++ b/lua_probject/base_project/Game/View/LoginView.lua @@ -1,4 +1,5 @@ local PhoneLoginView = import(".PhoneLoginView2") +local IdPasswordLoginView = import(".IdPasswordLoginView") LoginView = {} @@ -90,13 +91,26 @@ function M:init() -- end) local btn_phone_code = view:GetChild("btn_phone_code") - btn_phone_code.onClick:Set(function() - if self.agree.selectedIndex == 0 then - ViewUtil.ErrorTip(self._root_view, "请勾选同意《用户协议》") - return - end - self:PhoneCodeLogin() - end) + if btn_phone_code then + btn_phone_code.onClick:Set(function() + if self.agree.selectedIndex == 0 then + ViewUtil.ErrorTip(self._root_view, "请勾选同意《用户协议》") + return + end + self:PhoneCodeLogin() + end) + end + + local btn_id = view:GetChild("btn_id") + if btn_id then + btn_id.onClick:Set(function() + if self.agree.selectedIndex == 0 then + ViewUtil.ErrorTip(self._root_view, "请勾选同意《用户协议》") + return + end + self:IDLogin() + end) + end end function M:Destroy() @@ -228,7 +242,7 @@ end function M:IDLogin() local _idView = nil - _idView = IDLoginView.new(function(res) + _idView = IdPasswordLoginView.new(0, function(res) if res.ReturnCode == 0 then _idView:Destroy() end diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index f943a43d..60d5cc99 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -584,7 +584,6 @@ function M:InitView(url, isHideIpAdds) _room.group_id ~= 0 and "亲友圈," or "", _room.room_config.config.hpData.maxRound) data.description = gamePlay data.type = 0 - pt("lingmeng share ", data) ViewUtil.__share(data) end) end diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua index dad74487..bd0c1319 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua @@ -24,6 +24,20 @@ function M:FillData() local com_editSetting = self._config:GetChild("com_editSetting") com_editSetting:GetController("cGps").selectedIndex = 2 + + local ctr_round = self._config:GetController("round") + if ctr_round.selectedIndex == 0 then + com_editSetting:GetController("oneRound").selectedIndex = 1 + else + com_editSetting:GetController("oneRound").selectedIndex = 0 + end + self._config:GetController("round").onChanged:Set(function() + if ctr_round.selectedIndex == 0 then + com_editSetting:GetController("oneRound").selectedIndex = 1 + else + com_editSetting:GetController("oneRound").selectedIndex = 0 + end + end) -- if oldGameVersion == 2 then -- self._config:GetController("xipai").selectedIndex = 0 diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index 6de90403..cd33e9a8 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -516,7 +516,7 @@ function M:EventInit() self:PlayMJMusic("gameover.mp3") end else - self:ShowHand(arg) + -- self:ShowHand(arg) self:PlayMJMusic("gameover.mp3") end local liuju = result and result.liuju or nil diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua index ef3f6278..ca27e786 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua @@ -24,6 +24,20 @@ function M:FillData() local com_editSetting = self._config:GetChild("com_editSetting") com_editSetting:GetController("cGps").selectedIndex = 2 + + local ctr_round = self._config:GetController("round") + if ctr_round.selectedIndex == 0 then + com_editSetting:GetController("oneRound").selectedIndex = 1 + else + com_editSetting:GetController("oneRound").selectedIndex = 0 + end + self._config:GetController("round").onChanged:Set(function() + if ctr_round.selectedIndex == 0 then + com_editSetting:GetController("oneRound").selectedIndex = 1 + else + com_editSetting:GetController("oneRound").selectedIndex = 0 + end + end) -- if oldGameVersion == 2 then -- self._config:GetController("xipai").selectedIndex = 0 diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index 6197a337..2c063afe 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -516,7 +516,7 @@ function M:EventInit() self:PlayMJMusic("gameover.mp3") end else - self:ShowHand(arg) + -- self:ShowHand(arg) self:PlayMJMusic("gameover.mp3") end local liuju = result and result.liuju or nil diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua index e58fe6e9..e44aa26a 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua @@ -22,6 +22,20 @@ function M:FillData() com_editSetting:GetController("cGps").selectedIndex = 2 self._config:GetController("jingbibo").selectedIndex = 1 + local ctr_round = self._config:GetController("round") + if ctr_round.selectedIndex == 0 then + com_editSetting:GetController("oneRound").selectedIndex = 1 + else + com_editSetting:GetController("oneRound").selectedIndex = 0 + end + self._config:GetController("round").onChanged:Set(function() + if ctr_round.selectedIndex == 0 then + com_editSetting:GetController("oneRound").selectedIndex = 1 + else + com_editSetting:GetController("oneRound").selectedIndex = 0 + end + end) + -- if oldGameVersion == 2 then -- self._config:GetController("xipai").selectedIndex = 0 diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 3771d893..1a939b65 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -515,7 +515,7 @@ function M:EventInit() self:PlayMJMusic("gameover.mp3") end else - self:ShowHand(arg) + -- self:ShowHand(arg) self:PlayMJMusic("gameover.mp3") end local liuju = result and result.liuju or nil diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua index c63d651f..1783b342 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua @@ -24,6 +24,20 @@ function M:FillData() local com_editSetting = self._config:GetChild("com_editSetting") com_editSetting:GetController("cGps").selectedIndex = 2 + + local ctr_round = self._config:GetController("round") + if ctr_round.selectedIndex == 0 then + com_editSetting:GetController("oneRound").selectedIndex = 1 + else + com_editSetting:GetController("oneRound").selectedIndex = 0 + end + self._config:GetController("round").onChanged:Set(function() + if ctr_round.selectedIndex == 0 then + com_editSetting:GetController("oneRound").selectedIndex = 1 + else + com_editSetting:GetController("oneRound").selectedIndex = 0 + end + end) -- if oldGameVersion == 2 then -- self._config:GetController("xipai").selectedIndex = 0 diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index 8521c05b..e8d7c16a 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -515,7 +515,7 @@ function M:EventInit() self:PlayMJMusic("gameover.mp3") end else - self:ShowHand(arg) + -- self:ShowHand(arg) self:PlayMJMusic("gameover.mp3") end local liuju = result and result.liuju or nil diff --git a/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua b/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua index c8ff25b4..973ce45f 100644 --- a/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua @@ -25,6 +25,20 @@ function M:FillData(view, index) local com_editSetting = self._config:GetChild("com_editSetting") com_editSetting:GetController("cGps").selectedIndex = 2 + + local ctr_round = self._config:GetController("round") + if ctr_round.selectedIndex == 0 then + com_editSetting:GetController("oneRound").selectedIndex = 1 + else + com_editSetting:GetController("oneRound").selectedIndex = 0 + end + self._config:GetController("round").onChanged:Set(function() + if ctr_round.selectedIndex == 0 then + com_editSetting:GetController("oneRound").selectedIndex = 1 + else + com_editSetting:GetController("oneRound").selectedIndex = 0 + end + end) -- else -- self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_RunFastNew/Creat_RunFast_yueyang") -- end diff --git a/wb_new_ui/assets/FGAssist/invite/panel_invited.xml b/wb_new_ui/assets/FGAssist/invite/panel_invited.xml index 3bdb3112..74cd8474 100644 --- a/wb_new_ui/assets/FGAssist/invite/panel_invited.xml +++ b/wb_new_ui/assets/FGAssist/invite/panel_invited.xml @@ -23,7 +23,7 @@ - + diff --git a/wb_new_ui/assets/Info_MJ_FuZhou/Label_Detail_83.xml b/wb_new_ui/assets/Info_MJ_FuZhou/Label_Detail_83.xml index 459703e7..570a8f57 100644 --- a/wb_new_ui/assets/Info_MJ_FuZhou/Label_Detail_83.xml +++ b/wb_new_ui/assets/Info_MJ_FuZhou/Label_Detail_83.xml @@ -15,13 +15,13 @@