diff --git a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua index 88129da5..213ef463 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua @@ -19,7 +19,7 @@ function FamilyInvitedMsgView.new(groupid, pid, invite_id, blur_view, callback) self.callback = callback print("lingmeng FGAssistInviteView1") UIPackage.AddPackage('base/newgroup/ui/FGAssist') - self:initView("ui://FGAssist/panel_invite") + self:initView("ui://FGAssist/panel_invited") print("lingmeng FGAssistInviteView2") return self @@ -56,7 +56,14 @@ function M:initView(url) end function M:FillData() + local group = DataManager.groups:get(self.groupid) + local play = group:getPlay(self.pid) + local player = group.memberMap[self.invite_id] + self._viewText_groupName.text = group.name + self._viewText_gameName.text = play.game_name + self._viewText_inviteName.text = player.nick + self._viewText_playName.text = play.name end function M:Destroy() diff --git a/lua_probject/base_project/Game/View/PlayerInfoView2.lua b/lua_probject/base_project/Game/View/PlayerInfoView2.lua index ab08da1b..24937130 100644 --- a/lua_probject/base_project/Game/View/PlayerInfoView2.lua +++ b/lua_probject/base_project/Game/View/PlayerInfoView2.lua @@ -220,9 +220,12 @@ function M:ShowInteraction(type, str) Voice.DownLoad( str, function(clip) + print("lingmeng ShowInteraction") if (clip) then + print("lingmeng ShowInteraction1") self:ShowMaskVoice(clip.length) GameApplication.Instance:PlayVoice(clip) + print("lingmeng ShowInteraction2") end end ) diff --git a/wb_new_ui/assets/FGAssist/invite/panel_invited--.xml b/wb_new_ui/assets/FGAssist/invite/panel_invited--.xml deleted file mode 100644 index 6a221383..00000000 --- a/wb_new_ui/assets/FGAssist/invite/panel_invited--.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - -