diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua
index 299b3d53..b6cf12d4 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua
@@ -17,7 +17,7 @@ function FamilyEventView.new(root)
mgr_ctr:AddEventListener(GroupMgrEvent.DelRoom, handler(self, self._evtDelRoom))
mgr_ctr:AddEventListener(GroupMgrEvent.UpdateRoom, handler(self, self._evtUpdateRoom))
mgr_ctr:AddEventListener(GroupMgrEvent.UpdatePlayerInfo, handler(self, self._evtUpdatePlayerInfo))
- mgr_ctr:AddEventListener(GroupMgrEvent.BeInvited, handler(self, self._evtInvited))
+ --mgr_ctr:AddEventListener(GroupMgrEvent.BeInvited, handler(self, self._evtInvited))
mgr_ctr:AddEventListener(GroupMgrEvent.UpdateGroup, handler(self, self._evtUpdateGroup))
mgr_ctr:AddEventListener(GroupMgrEvent.NewMailTip, handler(self, self._evtNewMailTip))
mgr_ctr:AddEventListener(GroupMgrEvent.InviteResponse, handler(self, self._evtInviteResponse))
diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua
index 96d353cd..271a2378 100644
--- a/lua_probject/base_project/Game/View/MainView.lua
+++ b/lua_probject/base_project/Game/View/MainView.lua
@@ -772,6 +772,14 @@ function M:EventInit()
GameEvent.Interaction,
function(...)
local arg = { ... }
+ local data = arg[1]
+ local _type = arg[2].type
+ if _type == "Missile" then
+ local sendSeat = arg[2].sendSeat
+ local targetSeat = arg[2].targetSeat
+ self:Missile(sendSeat, targetSeat, arg[3])
+ end
+
local p = arg[1]
if not p or not p.seat or p.seat == 0 then
return
@@ -1211,7 +1219,24 @@ function M:SetLanguage(language)
end
end
-function M:Missile(seat, targetSeat, url, animUrl)
+function M:Missile(seat, targetSeat, Missile)
+
+ local animUrl = ""
+ local url = ""
+ if Missile == "boom" then
+ animUrl = "ui://Main_Majiang/Missile_boom"
+ url = "ui://Common/boom"
+ elseif Missile == "egg" then
+ animUrl = "ui://Main_Majiang/Missile_egg"
+ url = "ui://Common/egg"
+ elseif Missile == "diamo" then
+ animUrl = "ui://Main_Majiang/Missile_diamo"
+ url = "ui://Common/diamo"
+ elseif Missile == "flower" then
+ animUrl = "ui://Main_Majiang/Missile_flower"
+ url = "ui://Common/flower"
+ end
+
local send = self._player_info[self:GetPos(seat)]
local target = self._player_info[self:GetPos(targetSeat)]
diff --git a/lua_probject/base_project/Game/View/playerDetailView.lua b/lua_probject/base_project/Game/View/playerDetailView.lua
index 057be53c..62126f73 100644
--- a/lua_probject/base_project/Game/View/playerDetailView.lua
+++ b/lua_probject/base_project/Game/View/playerDetailView.lua
@@ -1,5 +1,14 @@
local playerDetailView = {}
+local function Send(self, Missile)
+ local _data = {}
+ _data.sendSeat = DataManager.CurrenRoom.self_player.seat --DataManager.SelfUser.account_id
+ _data.targetSeat = self.player.seat
+ _data.type = "Missile"
+ local _gamectr = ControllerManager.GetController(GameController)
+ _gamectr:SendInteraction(DataManager.SelfUser.account_id, _data, Missile)
+end
+
function playerDetailView.New()
setmetatable(playerDetailView, { __index = BaseWindow })
local inst = setmetatable({}, { __index = playerDetailView })
@@ -37,35 +46,23 @@ function playerDetailView:Init()
self.loader_icon = self._view:GetChild("loader_icon")
self.btn_boom.onClick:Set(function()
-
- local _gamectr = ControllerManager.GetController(GameController)
- _gamectr:SendInteraction(DataManager.SelfUser.account_id, self.player.seat, "boom")
-
- local mainView = BaseView.FindView("MainView")
- if mainView then
- mainView:Missile(1, self.player.seat, "ui://Common/boom", "ui://Main_Majiang/Missile_boom")
- end
+ Send(self, "boom")
+ self:Close()
end)
self.btn_egg.onClick:Set(function()
- local mainView = BaseView.FindView("MainView")
- if mainView then
- mainView:Missile(1, self.player.seat, "ui://Common/egg", "ui://Main_Majiang/Missile_egg")
- end
+ Send(self, "egg")
+ self:Close()
end)
self.btn_ring.onClick:Set(function()
- local mainView = BaseView.FindView("MainView")
- if mainView then
- mainView:Missile(1, self.player.seat, "ui://Common/diamo", "ui://Main_Majiang/Missile_diamo")
- end
+ Send(self, "diamo")
+ self:Close()
end)
self.btn_flower.onClick:Set(function()
- local mainView = BaseView.FindView("MainView")
- if mainView then
- mainView:Missile(1, self.player.seat, "ui://Common/flower", "ui://Main_Majiang/Missile_flower")
- end
+ Send(self, "flower")
+ self:Close()
end)
end
diff --git a/wb_new_ui/assets/FGAssist/invite/panel_invited.xml b/wb_new_ui/assets/FGAssist/invite/panel_invited.xml
index b8c24421..73bb1f54 100644
--- a/wb_new_ui/assets/FGAssist/invite/panel_invited.xml
+++ b/wb_new_ui/assets/FGAssist/invite/panel_invited.xml
@@ -26,7 +26,7 @@
-
+
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes
index 712ca048..9ea473c8 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes and b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_fui.bytes differ