diff --git a/lua_probject/base_project/Game/Controller/LoginController.lua b/lua_probject/base_project/Game/Controller/LoginController.lua index fa832904..02fed4df 100644 --- a/lua_probject/base_project/Game/Controller/LoginController.lua +++ b/lua_probject/base_project/Game/Controller/LoginController.lua @@ -55,7 +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 + user.havaPsw = data.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/View/Family/FamilAllRank.lua b/lua_probject/base_project/Game/View/Family/FamilAllRank.lua index 0faaa531..127a7c62 100644 --- a/lua_probject/base_project/Game/View/Family/FamilAllRank.lua +++ b/lua_probject/base_project/Game/View/Family/FamilAllRank.lua @@ -91,7 +91,9 @@ function M:InitTime() return serverDayValues, serverDayItems end -function M:ShouRanks() +function M:ShouRanks(root, groupId) + self._father = root + self.group_id = groupId self._lastTpe = self._father.familyType.selectedIndex self._father.familyType.selectedIndex = 0 self._view.visible = true diff --git a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua index 4653c834..84f2a725 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua @@ -88,6 +88,8 @@ function FamilyAuditNumber:ClickBtn(isAllow, uid, tag) else end + fgCtr:FG_GroupMembers12(self._group.id, 0, self._group.total_member_num + 1, 2, 2, function(res) + end) local group = DataManager.groups:get(self._group.id) group.joins = group.joins - 1 @@ -100,6 +102,7 @@ function FamilyAuditNumber:ClickBtn(isAllow, uid, tag) self:Reflash() Broadcast.Send(BroadcastEvent.OnJoinsChange) + Broadcast.Send(BroadcastEvent.OnMemberChange) --[[ local view = BaseView.FindView("FamilyMainView") diff --git a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua index 53f570d0..53171fc9 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua @@ -57,7 +57,7 @@ function M:FillData() self._viewText_groupName.text = Utils.TextOmit(group.name, 6, "...") self._viewText_gameName.text = play.game_name - self._viewText_inviteName.text = self.nik + self._viewText_inviteName.text = ViewUtil.stringEllipsis(self.nik) self._viewText_playName.text = Utils.TextOmit(play.name, 6, "...") local config = ExtendManager.GetExtendConfig(play.gameId) diff --git a/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua b/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua index 8ab6c0e8..afe3f673 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua @@ -51,8 +51,9 @@ function FamilyJoinAndCreate:init(root) ViewUtil.CloseModalWait2() if res.ReturnCode == 0 then root.familyType.selectedIndex = 1 - -- root:ConnetFamily(1, DataManager.groups.groupList, true) + Utils.SaveLocalFile("Family_lastID" .. DataManager.SelfUser.account_id, res.Data.info.id) root:Reflash() + -- root:ConnetFamily(1, DataManager.groups.groupList, true) else ViewUtil.ErrorTip(res.ReturnCode, '创建大联盟失败!') end diff --git a/lua_probject/base_project/Game/View/Family/PlayEditView.lua b/lua_probject/base_project/Game/View/Family/PlayEditView.lua index dd46d6df..5cefdace 100644 --- a/lua_probject/base_project/Game/View/Family/PlayEditView.lua +++ b/lua_probject/base_project/Game/View/Family/PlayEditView.lua @@ -76,7 +76,7 @@ function PlayEditView:Init() obj:GetChild('Label_details'):GetChild('title').text = mode:LoadConfigToDetail(playList[index].config, playList[index].hpData) obj:GetChild('text_playName').emojies = EmojiDitc.EmojiesDitc - obj:GetChild('text_playName').text = Utils.TextOmit(playList[index].name, 6, "...") + obj:GetChild('text_playName').text = playList[index].name obj:GetController('type').selectedIndex = 1 obj:GetChild('btn_del').onClick:Set(function() ViewUtil.ShowTwoChooose("是否要删除该玩法", function() diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index d4b7f928..65603634 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -306,6 +306,7 @@ function M:Reflash() end local btn = self.list_family:GetChildAt(chooseIndex - 1) btn.onClick:Call() + self._view:GetController('listFamily').selectedIndex = chooseIndex - 1 else self:JoinFamily(true) self.btn_chatRoom.visible = false @@ -472,7 +473,7 @@ function M:ShowAllRank() self._ViewChild_AllRank = FamilAllRank.New(self, self._group.id) return end - self._ViewChild_AllRank:ShouRanks() + self._ViewChild_AllRank:ShouRanks(self, self._group.id) end function M:OpenAllNumber(group) @@ -800,7 +801,7 @@ function M:FillSameRoomInfo(obj, type, playInfo) obj:GetChild('Label_gameRule').title = gamePlay local roomName = playInfo.name - roomName = Utils.TextOmit(roomName, 6, "") + roomName = roomName obj:GetChild('game_type').emojies = EmojiDitc.EmojiesDitc obj:GetChild('game_type').text = string.format(" (%s) %s", playInfo.game_name, roomName) obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = type diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua index 4182ece1..6c2854ae 100644 --- a/lua_probject/base_project/Game/View/LobbyView.lua +++ b/lua_probject/base_project/Game/View/LobbyView.lua @@ -172,6 +172,7 @@ function M:InitView(url) local btn_invite = self._view:GetChild("btn_invite") btn_invite.onClick:Add(function() + GameApplication.Instance:CopyToClipboard(DataManager.DownLink or "暂无链接") local _curren_msg = MsgWindow.new(self._root_view, "下载地址已复制，请到浏览器粘贴", MsgWindow.MsgMode.OnlyOk) _curren_msg:Show() end) diff --git a/lua_probject/base_project/Game/View/LoginView.lua b/lua_probject/base_project/Game/View/LoginView.lua index dc43a80a..b6d34d18 100644 --- a/lua_probject/base_project/Game/View/LoginView.lua +++ b/lua_probject/base_project/Game/View/LoginView.lua @@ -174,8 +174,8 @@ local function __login_response(self, response) local roomid = user.room_id if (string.len(roomid) > 1) then + ViewUtil.ShowModalWait2(self._root_view, "正在加入房间...") if user.group_id == 0 then - ViewUtil.ShowModalWait2(self._root_view, "正在加入房间...") __join_room(roomid, response) return else @@ -199,6 +199,7 @@ local function __login_response(self, response) end self._mesList = mesl DataManager.GameNotice = mesl + DataManager.DownLink = data.share_link end end end) @@ -313,8 +314,9 @@ function M:LoginCallBack(result, data) end --在进入前重连房间，如果有 -function M:ReconnectRoom(groupId) +function M:ReconnectRoom(groupId, times) local roomId = DataManager.SelfUser.room_id + local times = times or 0 print("===============================ReconnectRoom", roomId, 1) if roomId and #roomId > 0 then local roomCtr = ControllerManager.GetController(RoomController) @@ -324,17 +326,24 @@ function M:ReconnectRoom(groupId) false, function(response) if (response.ReturnCode == -1) then + ViewUtil.CloseModalWait2() ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, 'response.ReturnCode == -1') RestartGame() return end if response.ReturnCode ~= 0 then - ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败') - FamilyView.lastId = groupId - ViewManager.ChangeView(ViewManager.View_Family) + -- if times >= 6 then + -- ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败') + -- FamilyView.lastId = groupId + -- ViewManager.ChangeView(ViewManager.View_Family) + -- return + -- else + self:ReconnectRoom(groupId, times + 1) return + -- end else + ViewUtil.CloseModalWait2() UIPackage.AddPackage("base/lobby/ui/Lobby") FamilyView.lastId = groupId DataManager.SelfUser.room_id = "" diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index 60d5cc99..02e3a1f8 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -6,6 +6,7 @@ local SettingView = import('.SettingView') local PlayerDistanceView = import('.PlayerDistanceView') local FGAssistView = import('.FGAssistView') local MissileSender = import(".MissileSender") +local SharePicture = import('.SharePicture') local function GetSeat(self, uId) for _, player in pairs(self._room.player_list) do @@ -584,7 +585,7 @@ function M:InitView(url, isHideIpAdds) _room.group_id ~= 0 and "亲友圈," or "", _room.room_config.config.hpData.maxRound) data.description = gamePlay data.type = 0 - ViewUtil.__share(data) + self:ShareAndOneChoose(data) end) end ------------------------------------------------------------ @@ -1511,6 +1512,13 @@ function M:GetPlayer(playId) end end +function M:ShareAndOneChoose(data) + local sharePicture = SharePicture.new(function() + ViewUtil.__share(data) + end) + sharePicture:Show() +end + -- 托管时关闭一些提示窗口，如起手胡、吃碰提示、海底,由扩展实现 function M:closeTipOnTuoguan() end diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua index a1f1c482..949895e3 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua @@ -4,6 +4,38 @@ local GroupRoomColorView = import(".GroupRoomColorView") local GameListView = require "Game/View/Lobby/GameListView" local GroupGameSettingView = {} +-- UTF-8 正则匹配每一个字符（包括 emoji） +local function utf8_chars(str) + local chars = {} + for uchar in str:gmatch("[%z\1-\127\194-\244][\128-\191]*") do + table.insert(chars, uchar) + end + return chars +end + +-- 截取前 n 个字符（安全处理 Emoji） +local function sub(str, start_char, end_char) + local chars = utf8_chars(str) + local sub = {} + for i = start_char or 1, end_char or #chars do + if chars[i] then + table.insert(sub, chars[i]) + else + break + end + end + return table.concat(sub) +end + +-- 获取 UTF-8 字符个数 +local function len(str) + local count = 0 + for _ in str:gmatch("[%z\1-\127\194-\244][\128-\191]*") do + count = count + 1 + end + return count +end + local M = GroupGameSettingView function GroupGameSettingView.new(blur_view, gid, pid, room_config, callback) @@ -49,6 +81,9 @@ function M:init(url) self.btn_closeTimesPage = self._view:GetChild("btn_closeTimesPage") self._view:GetChild("tex_name").emojies = EmojiDitc.EmojiesDitc + self._view:GetChild("tex_name").onFocusOut:Set(function() + self._view:GetChild("tex_name").text = sub(self._view:GetChild("tex_name").text, 1, 7) + end) self.cTimesPage = self._view:GetController("cTimesPage") diff --git a/lua_probject/base_project/Game/View/ViewUtil.lua b/lua_probject/base_project/Game/View/ViewUtil.lua index 65985b98..8e169ee8 100644 --- a/lua_probject/base_project/Game/View/ViewUtil.lua +++ b/lua_probject/base_project/Game/View/ViewUtil.lua @@ -410,7 +410,7 @@ function ViewUtil.ShowOneInput(data, callback) end function ViewUtil.__share(data) - local url = "https://ttfenfa.com/index.php/login" + local url = DataManager.DownLink or "https://ttfenfa.com/index.php/login" local json_data = {} json_data['title'] = data.title local mediaObject = {} diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index cd33e9a8..60115822 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -245,6 +245,7 @@ function M:EventInit() local card_info = self._player_card_info[self:GetPos(p.seat)] card_info:Clear() card_info:UpdateHandCard() + card_info._view_handCardList.touchable = true if _room.curren_round == 1 then self._touxiangMove:Play() end diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index 2c063afe..1066fbbd 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -243,6 +243,7 @@ function M:EventInit() local card_info = self._player_card_info[self:GetPos(p.seat)] card_info:Clear() card_info:UpdateHandCard() + card_info._view_handCardList.touchable = true if _room.curren_round == 1 then self._touxiangMove:Play() end diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 1a939b65..6472b7fd 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -243,6 +243,7 @@ function M:EventInit() local card_info = self._player_card_info[self:GetPos(p.seat)] card_info:Clear() card_info:UpdateHandCard() + card_info._view_handCardList.touchable = true if _room.curren_round == 1 then self._touxiangMove:Play() end diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index e8d7c16a..c2a154f8 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -241,6 +241,7 @@ function M:EventInit() local card_info = self._player_card_info[self:GetPos(p.seat)] card_info:Clear() card_info:UpdateHandCard() + card_info._view_handCardList.touchable = true if _room.curren_round == 1 then self._touxiangMove:Play() end diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua index 3eefe863..6508cc00 100644 --- a/lua_probject/main_project/main/majiang/MJMainView.lua +++ b/lua_probject/main_project/main/majiang/MJMainView.lua @@ -791,6 +791,7 @@ function M:OnHuCard(...) self._player_card_info[1]._ctr_tip.selectedIndex = 0 self._player_card_info[1]._ctr_showGuoHu.selectedIndex = 0 + self._player_card_info[1]._view_handCardList.touchable = false self:ShowHand(scoreData) info:ShowHuCard(win_card, index == 1) diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew/Label_Detail_Play.xml b/wb_new_ui/assets/Info_Poker_RunFastNew/Label_Detail_Play.xml index 7fc73b88..dd8d0f73 100644 --- a/wb_new_ui/assets/Info_Poker_RunFastNew/Label_Detail_Play.xml +++ b/wb_new_ui/assets/Info_Poker_RunFastNew/Label_Detail_Play.xml @@ -23,24 +23,24 @@