diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index a9feb78e..3c4a60a5 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -36,6 +36,16 @@ local function GetPlayer(self, playerId) return nil end +local function LoadClickData() + local json_data = Utils.LoadLocalFile("clickMode") + + if json_data == "null" then + return "double" + end + + return json.decode(json_data) +end + --lingmeng新全局标记 lingmengxin = false @@ -96,6 +106,9 @@ function M:InitView(url, isHideIpAdds) ---- print(url) ---- print(debug.traceback()) BaseView.InitView(self, url) + + self.clickMode = LoadClickData() + -- --[[ 多语言切换(适用于设置界面使用Main_Majiang中SettingView2的游戏) diff --git a/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua index fd276ad8..d159dcdd 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua @@ -243,14 +243,26 @@ function M:__OnClickHandCard(context) self._ctr_seletedGet.selectedIndex = 1 self._flag_seletedGet = 0 local button = context.data - local _room = DataManager.CurrenRoom + + if _room.curren_outcard_seat == _room.self_player.seat then + if self._mainView.clickMode == "single" or Utils.IsDoubleClick(context) or self._click_index == self._view_handCardList.selectedIndex then + local card = button.data + self._mainView:OutCard(card.card_item) + self:ClearChoose() + return + end + end + self._click_index = self._view_handCardList.selectedIndex + + --[[ if ((Utils.IsDoubleClick(context) or self._click_index == self._view_handCardList.selectedIndex) and _room.curren_outcard_seat == _room.self_player.seat) then local card = button.data self._mainView:OutCard(card.card_item) self:ClearChoose() end self._click_index = self._view_handCardList.selectedIndex + ]] end function M:__OnClickGetCard(context, flag) @@ -258,13 +270,25 @@ function M:__OnClickGetCard(context, flag) self._click_index = self._view_handCardList.selectedIndex local button = context.sender local _room = DataManager.CurrenRoom + + if _room.curren_outcard_seat == _room.self_player.seat then + if self._mainView.clickMode == "single" or Utils.IsDoubleClick(context) or self._flag_seletedGet == 1 then + local card = button.data + self._mainView:OutCard(card.card_item) + self:ClearChoose() + return + end + end + self._flag_seletedGet = 1 + + --[[ if ((Utils.IsDoubleClick(context) or self._flag_seletedGet == 1) and _room.curren_outcard_seat == _room.self_player.seat) then local card = button.data self._mainView:OutCard(card.card_item) self:ClearChoose() return end - self._flag_seletedGet = 1 + ]] end function M:ChooseHand(index) diff --git a/lua_probject/main_project/main/majiang/MJSettingViewNew.lua b/lua_probject/main_project/main/majiang/MJSettingViewNew.lua index ec884b60..fb0df013 100644 --- a/lua_probject/main_project/main/majiang/MJSettingViewNew.lua +++ b/lua_probject/main_project/main/majiang/MJSettingViewNew.lua @@ -12,6 +12,10 @@ local function IsRoomOwer() return roomOwner == DataManager.SelfUser.account_id end +local function SaveClickMode(self) + Utils.SaveLocalFile("clickMode", json.encode(self._mainView.clickMode)) +end + function M:Reflash() if IsRoomOwer() then self.cBtn.selectedIndex = 1 @@ -24,6 +28,12 @@ function M:Reflash() if self.flag_witness then self.cBtn.selectedIndex = 0 end + + if self._mainView.clickMode == "single" then + self.cBtnSelect.selectedIndex = 0 + elseif self._mainView.clickMode == "double" then + self.cBtnSelect.selectedIndex = 1 + end end function M:Show() @@ -31,6 +41,11 @@ function M:Show() self:Reflash() end +function M:Close() + SaveClickMode(self) + BaseWindow.Close(self) +end + -- show_dialect是否显示'切换方言'选项 function MJSettingViewNew.new(blur_view, flag_witness) setmetatable(SettingView, { __index = BaseWindow }) @@ -74,15 +89,21 @@ function M:init(url) self.btn_cancelRoom = self._view:GetChild("btn_cancelRoom") self.btn_closeRoom = self._view:GetChild("btn_closeRoom") + self.cBtnSelect = self._view:GetController("cBtnSelect") + self.cBtn = self._view:GetController('cBtn') self.btn_singleClick.onChanged:Set(function() - + if self.btn_singleClick.selected then + self._mainView.clickMode = "single" + end end) self.btn_doubleClick.onChanged:Set(function() - + if self.btn_doubleClick.selected then + self._mainView.clickMode = "double" + end end) self.slider_music.onChanged:Add(function() diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Setting/Setting.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Setting/Setting.xml index 9351c1b3..eb2e95f7 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Setting/Setting.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Setting/Setting.xml @@ -14,7 +14,7 @@