diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index f60b0fc4..a2bc1efa 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -60,7 +60,6 @@ function M:InitView(url, isHideIpAdds) ---- print("url===>>>") ---- print(url) ---- print(debug.traceback()) - print("=============================InitView2", self, url) BaseView.InitView(self, url) -- diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index f315aa63..bc06eb54 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -28,8 +28,6 @@ function M:InitView(url) if self._room.room_config.people_num == 2 then MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num) else - print("=============================InitView", self, - "ui://Main_Majiang/Main_" .. room.room_config.people_num .. "_s2") MJMainView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num .. "_s2") end self._hu_tip = HuTipView.new(self) @@ -51,11 +49,37 @@ function M:InitView(url) self.jing = self._view:GetChild('jing') + local showNextCtr = self._view:GetController('showNext') + local ShowNextConfrimCtr = self._view:GetController('showNextConfrim') + local showNextList = self._view:GetChild('list_showNext') + local pop_showNextConfrim = self._view:GetChild('pop_showNextConfrim') + self._view:GetChild('btn_showNext').onClick:Set(function() + showNextCtr.selectedIndex = 1 + end) + self._view:GetChild('btn_sendShow').onClick:Set(function() + self:SendShowNext(ShowNextConfrimCtr) + end) + self._view:GetChild('btn_closeShow').onClick:Set(function() + ShowNextConfrimCtr.selectedIndex = 0 + showNextCtr.selectedIndex = 0 + showNextList.selectedIndex = -1 + self._showNextName = nil + end) + showNextList.onClickItem:Set(function(context) + self:ClickShowNext(context, ShowNextConfrimCtr) + end) + ShowNextConfrimCtr.onChanged:Set(function() + pop_showNextConfrim:GetChild("btn_ShowCard").icon = self._showNextName + end) + pop_showNextConfrim:GetChild("btn_center").onClick:Set(function() + local _gamectr = ControllerManager.GetController(GameController) + _gamectr:SendNextCard(string.sub(self._showNextName, -3)) + ShowNextConfrimCtr.selectedIndex = 0 + showNextCtr.selectedIndex = 0 + showNextList.selectedIndex = -1 + self._showNextName = nil + end) if self._room.room_config.people_num == 2 then - local showNextCtr = self._view:GetController('showNext') - local ShowNextConfrimCtr = self._view:GetController('showNextConfrim') - local showNextList = self._view:GetChild('list_showNext') - local pop_showNextConfrim = self._view:GetChild('pop_showNextConfrim') local btn_closeRoom = self._view:GetChild("btn_setting") self._view:GetChild('btn_closeRoom').onClick:Set(function() @@ -93,33 +117,6 @@ function M:InitView(url) --]] end) - self._view:GetChild('btn_showNext').onClick:Set(function() - showNextCtr.selectedIndex = 1 - end) - - self._view:GetChild('btn_sendShow').onClick:Set(function() - self:SendShowNext(ShowNextConfrimCtr) - end) - self._view:GetChild('btn_closeShow').onClick:Set(function() - ShowNextConfrimCtr.selectedIndex = 0 - showNextCtr.selectedIndex = 0 - showNextList.selectedIndex = -1 - self._showNextName = nil - end) - showNextList.onClickItem:Set(function(context) - self:ClickShowNext(context, ShowNextConfrimCtr) - end) - ShowNextConfrimCtr.onChanged:Set(function() - pop_showNextConfrim:GetChild("btn_ShowCard").icon = self._showNextName - end) - pop_showNextConfrim:GetChild("btn_center").onClick:Set(function() - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:SendNextCard(string.sub(self._showNextName, -3)) - ShowNextConfrimCtr.selectedIndex = 0 - showNextCtr.selectedIndex = 0 - showNextList.selectedIndex = -1 - self._showNextName = nil - end) btn_closeRoom.onClick:Add(handler(self, function() local settingView = SettingView.new(self) settingView:Show() diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes index 0b8e13f1..c837dc1d 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes differ