diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index c8c93dd2..6fd04d2d 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -39,7 +39,7 @@ end local function LoadClickData() local json_data = Utils.LoadLocalFile("clickMode") - if json_data == nil or json_data == "null" then + if json_data == nil or json_data == "null" then return "double" end @@ -283,6 +283,11 @@ function M:InitView(url, isHideIpAdds) local chatText = _view:GetChild('btn_sendText') if chatText then chatText.onClick:Add(function() + if self._room.room_config.config.hpData.BanChat == 1 then + ViewUtil.ShowBannerOnScreenCenter("本房间禁止快捷聊天") + return + end + if self.chat_view == nil then self.chat_view = ChatView.new(self) end @@ -294,6 +299,7 @@ function M:InitView(url, isHideIpAdds) end ]] + --[[ local group = DataManager.groups:get(self._room.group_id) local play = group:getPlay(self._room.play_id) local hpData = json.decode(play.hpData) @@ -301,6 +307,7 @@ function M:InitView(url, isHideIpAdds) ViewUtil.ShowTips("本房间禁止快捷聊天") return end + ]] self.chat_view:Show() end) @@ -311,6 +318,12 @@ function M:InitView(url, isHideIpAdds) self._ctr_voice = _view:GetController('voice') self._chat_Talk.onTouchBegin:Set(function() + + if self._room.room_config.config.hpData.BanChat == 1 then + ViewUtil.ShowBannerOnScreenCenter("本房间禁止快捷聊天") + return + end + if record_baned == 1 then self:__SetRecordEnable() else @@ -914,7 +927,7 @@ function M:EventInit() ) _gamectr:AddEventListener(GameEvent.HOMESTATE, function(...) - local arg = {...} + local arg = { ... } local uid = arg[1].uid local setHome = arg[1].setHome local gameStatus = arg[1].gameStatus @@ -922,9 +935,9 @@ function M:EventInit() local seat = GetSeat(self, uid) local info = self._player_info[self:GetPos(seat)] - if gameStatus == "out" then + if gameStatus == "out" then info:UpdateLineState(0) - elseif gameStatus == "enter" then + elseif gameStatus == "enter" then info:UpdateLineState(1) end end) @@ -1119,7 +1132,7 @@ function M:OnMissile(...) local arg = {...} print("OnMissile 有人发表情了") pt(arg) - + --self:Missile() end ]] @@ -1253,19 +1266,18 @@ function M:SetLanguage(language) end function M:Missile(seat, targetSeat, Missile) - local animUrl = "" local url = "" - if Missile == "boom" then + if Missile == "boom" then animUrl = "ui://Main_Majiang/Missile_boom" url = "ui://Common/boom" - elseif Missile == "egg" then + elseif Missile == "egg" then animUrl = "ui://Main_Majiang/Missile_egg" url = "ui://Common/egg" - elseif Missile == "diamo" then + elseif Missile == "diamo" then animUrl = "ui://Main_Majiang/Missile_diamo" url = "ui://Common/diamo" - elseif Missile == "flower" then + elseif Missile == "flower" then animUrl = "ui://Main_Majiang/Missile_flower" url = "ui://Common/flower" end diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/4918b5270e436c54b44d48f0bb79114 3.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/4918b5270e436c54b44d48f0bb79114 3.png new file mode 100644 index 00000000..9f754bb6 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/4918b5270e436c54b44d48f0bb79114 3.png differ diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/Screenshot_20250412-160003.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/Screenshot_20250412-160003.png new file mode 100644 index 00000000..b703fccd Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/Screenshot_20250412-160003.png differ diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/de87786dd190bbd4d4c7dbfff2484d89_720 1.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/de87786dd190bbd4d4c7dbfff2484d89_720 1.png new file mode 100644 index 00000000..e0fcd657 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/de87786dd190bbd4d4c7dbfff2484d89_720 1.png differ diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/e64501792ed1d68d0c12c5668437a69 1.png b/wb_new_ui/assets/Main_Majiang/Main_new/Image/e64501792ed1d68d0c12c5668437a69 1.png new file mode 100644 index 00000000..3e7bb2b3 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/e64501792ed1d68d0c12c5668437a69 1.png differ diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Image/微信图片_20250813225357_169.jpg b/wb_new_ui/assets/Main_Majiang/Main_new/Image/微信图片_20250813225357_169.jpg new file mode 100644 index 00000000..1153005b Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/Main_new/Image/微信图片_20250813225357_169.jpg differ diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/com_huType.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/com_huType.xml index 6f663727..2ea38b59 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/com_huType.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/com_huType.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml index 6c65e3ea..368d4107 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml @@ -57,11 +57,11 @@ - + - - + + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/ProgressBar_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/ProgressBar_jiangxi.xml index a666a62c..36dcaa9a 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/ProgressBar_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/ProgressBar_jiangxi.xml @@ -1,8 +1,12 @@ - - + + + + + + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml index e0aaa0e6..10d871b4 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml @@ -2,7 +2,7 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml index 19b84f0f..4557270f 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml @@ -2,7 +2,7 @@ - + @@ -31,8 +31,8 @@ - - + + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml index 6d27ad49..41257144 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml @@ -1,5 +1,5 @@ - + @@ -8,30 +8,14 @@ - - - - - - - - - - - - - - - - - - + + - + @@ -46,7 +30,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -80,22 +88,21 @@ - + - - + - - + +