diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua index e1a1b3ec..bad57c8c 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua @@ -99,8 +99,10 @@ function M:_evtNewMailTip(...) print("family event _evtNewMailTip") end -function M:_evtOnNewApply() +function M:_evtOnNewApply(...) print("_evtOnNewApply") + local arg = {...} + pt(arg) self._child_familyAuditNumber:InitList() end diff --git a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua index c9b30702..c80a742a 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua @@ -17,11 +17,8 @@ function FamilyInvitedMsgView.new(blur_view, groupid, pid, invite_id, callback) self.pid = pid self.invite_id = invite_id self.callback = callback - print("lingmeng FGAssistInviteView1") UIPackage.AddPackage('base/newgroup/ui/FGAssist') self:initView("ui://FGAssist/panel_invited") - print("lingmeng FGAssistInviteView2") - return self end @@ -34,7 +31,8 @@ function M:initView(url) self._viewText_playName = self._view:GetChild('tex_play_name') self._viewText_playConfig = self._view:GetChild('text_play_config') - print("lingmeng FGAssistInviteView4") + self._viewText_groupName.emojies = EmojiDitc.EmojiesDitc + self._viewText_playName.emojies = EmojiDitc.EmojiesDitc self._view:GetChild('btn_no').onClick:Set(function() print("lingmeng btn_no") @@ -67,15 +65,15 @@ function M:FillData() --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 = group.name + self._viewText_groupName.text = Utils.TextOmit(group.name, 6) self._viewText_gameName.text = play.game_name self._viewText_inviteName.text = player.nick - self._viewText_playName.text = play.name + 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) - self._viewText_playConfig.text = gamePlay + self._viewText_playConfig.text = play.hp_times/1000 .. "倍," .. gamePlay end function M:Destroy() diff --git a/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua b/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua index b3843a16..f4778593 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua @@ -28,21 +28,21 @@ function FamilyJoinAndCreate:init(root) self.input_name.emojies = EmojiDitc.EmojiesDitc self.input_wxId.emojies = EmojiDitc.EmojiesDitc - self._view:GetChild('btn_create').onClick:Add(function() + self._view:GetChild('btn_create').onClick:Set(function() if self.style.selectedIndex ~= 1 then self.style.selectedIndex = 1 return end end) - self._view:GetChild('btn_join').onClick:Add(function() + self._view:GetChild('btn_join').onClick:Set(function() if self.style.selectedIndex ~= 0 then self.style.selectedIndex = 0 return end end) - self._view:GetChild('btn_c').onClick:Add(function() + self._view:GetChild('btn_c').onClick:Set(function() fgCtr:FG_GroupList(function(res) fgCtr:FG_CreateGroup(self.input_name.text, 1, 2, function(res) if res.ReturnCode == 0 then diff --git a/lua_probject/base_project/Game/View/Family/PlayEditView.lua b/lua_probject/base_project/Game/View/Family/PlayEditView.lua index 15582a9b..337607a1 100644 --- a/lua_probject/base_project/Game/View/Family/PlayEditView.lua +++ b/lua_probject/base_project/Game/View/Family/PlayEditView.lua @@ -75,7 +75,8 @@ function PlayEditView:Init() -- times倍数 local times = json.decode(playList[index].hpData).times obj:GetChild('Label_details'):GetChild('title').text = times / 1000 .. "倍," .. mode:LoadConfigToDetail(playList[index].config) - obj:GetChild('text_playName').text = playList[index].name + obj:GetChild('text_playName').emojies = EmojiDitc.EmojiesDitc + obj:GetChild('text_playName').text = Utils.TextOmit(playList[index].name, 6) 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 2deddaa2..e6a37f8e 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -328,7 +328,7 @@ function M:ChangeNumber(fgCtr, group_id, limit, num, minus_only, sort_type) else list_familyNumber.itemRenderer = function(index, obj) obj:GetChild('title').emojies = EmojiDitc.EmojiesDitc - obj:GetChild('title').text = members[index + 1].nick + obj:GetChild('title').text = Utils.TextOmit(members[index + 1].nick, 5) obj:GetController('type').selectedIndex = members[index + 1].online and members[index + 1].online or 0 if members[index + 1].playing == "startPlaying" then obj:GetController('type').selectedIndex = 2 @@ -395,7 +395,12 @@ function M:UpdateFamilyRoom(fgCtr, id) local config = ExtendManager.GetExtendConfig(gameId) local mode = config:GetGameInfo() local gamePlay = mode:LoadConfigToDetail(playGameInfoTable[roomList[newIndex].pid].config) + local times = json.decode(playList[newIndex].hpData).times + gamePlay = times / 1000 .. "倍," .. gamePlay obj:GetChild('Label_gameRule').title = gamePlay + local roomName = playGameInfoTable[roomList[newIndex].pid].name + roomName = Utils.TextOmit(roomName, 6) + obj:GetChild('game_type').emojies = EmojiDitc.EmojiesDitc obj:GetChild('game_type').text = string.format("(%s)%s", playGameInfoTable[roomList[newIndex].pid].gameName, playGameInfoTable[roomList[newIndex].pid].name, roomList[newIndex].id) diff --git a/lua_probject/base_project/Game/View/LobbyView.lua b/lua_probject/base_project/Game/View/LobbyView.lua index 164d8034..21a2120f 100644 --- a/lua_probject/base_project/Game/View/LobbyView.lua +++ b/lua_probject/base_project/Game/View/LobbyView.lua @@ -187,7 +187,8 @@ function M:InitView(url) lobbyHeadView:Show() end) - view:GetChild("tex_name").text = DataManager.SelfUser.nick_name + view:GetChild("tex_name").emojies = EmojiDitc.EmojiesDitc + view:GetChild("tex_name").text = Utils.TextOmit(DataManager.SelfUser.nick_name, 6) view:GetChild("tex_id").text = tostring(DataManager.SelfUser.account_id) view:GetChild("btn_diamo").text = tostring(DataManager.SelfUser.diamo) diff --git a/wb_new_ui/assets/Common/buttons/Btn_Common.xml b/wb_new_ui/assets/Common/buttons/Btn_Common.xml index a58e7e22..30b599aa 100644 --- a/wb_new_ui/assets/Common/buttons/Btn_Common.xml +++ b/wb_new_ui/assets/Common/buttons/Btn_Common.xml @@ -1,5 +1,5 @@ - + @@ -7,5 +7,5 @@ -