diff --git a/lua_probject/main_project/main/majiang/GameInfoWindow.lua b/lua_probject/main_project/main/majiang/GameInfoWindow.lua new file mode 100644 index 00000000..e32dcf53 --- /dev/null +++ b/lua_probject/main_project/main/majiang/GameInfoWindow.lua @@ -0,0 +1,38 @@ +local GameInfoWindow = {} + +function GameInfoWindow.New() + setmetatable(GameInfoWindow, { __index = BaseWindow }) + local ints = setmetatable({}, { __index = GameInfoWindow }) + ints:init("ui://Main_Majiang/com_gameInfoWindow") + return ints +end + +function GameInfoWindow:Reflash() + + local config = self.room.room_config.config + local times = self.room.room_config.config.hpData.times + local game_id = self.room.game_id + local Info = ExtendManager.GetExtendConfig(game_id):GetGameInfo() + local text = Info:LoadConfigToDetail(config) + + self.tex_tex.text = times / 1000 .. "倍," .. text +end + +function GameInfoWindow:Show(room) + BaseWindow.Show(self) + self.room = room + self:Reflash() +end + +function GameInfoWindow:init(url) + BaseWindow.init(self, url) + + self.tex_tex = self._view:GetChild("tex_tex") + self.btn_quit = self._view:GetChild("btn_quit") + + self.btn_quit.onClick:Set(function() + self:Close() + end) +end + +return GameInfoWindow diff --git a/wb_new_ui/assets/FGAssist/invite/image/invite/mj_club_waitingroom_yaoqing_btn.png b/wb_new_ui/assets/FGAssist/invite/image/invite/mj_club_waitingroom_yaoqing_btn.png new file mode 100644 index 00000000..1ee09565 Binary files /dev/null and b/wb_new_ui/assets/FGAssist/invite/image/invite/mj_club_waitingroom_yaoqing_btn.png differ diff --git a/wb_new_ui/assets/FGAssist/invite/image/invite/mj_club_waitingroom_yaoqing_btn2.png b/wb_new_ui/assets/FGAssist/invite/image/invite/mj_club_waitingroom_yaoqing_btn2.png new file mode 100644 index 00000000..3fbb3ab2 Binary files /dev/null and b/wb_new_ui/assets/FGAssist/invite/image/invite/mj_club_waitingroom_yaoqing_btn2.png differ diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/GameInfoWindow/Component/btn_quit.xml b/wb_new_ui/assets/Main_Majiang/Main_new/GameInfoWindow/Component/btn_quit.xml new file mode 100644 index 00000000..2e6f4fa1 --- /dev/null +++ b/wb_new_ui/assets/Main_Majiang/Main_new/GameInfoWindow/Component/btn_quit.xml @@ -0,0 +1,10 @@ + + +