From 5dbe82c6547af89fb26174cda1a7023da641aada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Thu, 28 Aug 2025 15:02:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=91=98=E6=88=98=E7=BB=A9=E6=96=B0?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/GameController.lua | 1 + .../Game/Controller/NewGroupController.lua | 17 ++++ lua_probject/base_project/Game/Protocol.lua | 2 + .../Game/View/Family/FamilyNumberRecord.lua | 58 +++++------ .../base_project/Game/View/MainView.lua | 38 +++---- .../Game/View/PlayerInfoView2.lua | 25 +++-- .../base_project/Game/View/WitnessView.lua | 34 ++++++- .../extend/majiang/fuzhou/EXGameInfo.lua | 8 +- .../extend/majiang/jinxi/EXGameInfo.lua | 6 +- .../extend/majiang/lichuan/EXGameInfo.lua | 4 + .../extend/majiang/lichuan/EXMainView.lua | 6 +- .../extend/majiang/lichuan/EXWitnessView.lua | 57 +++-------- .../extend/majiang/nancheng/EXGameInfo.lua | 4 + .../main/majiang/MJPlayerCardInfoView.lua | 17 ++-- .../main/majiang/MJSettingViewNew.lua | 2 +- .../Main_new/Main/Comp_ConterBox.xml | 2 +- .../Main_new/Main/Component/Comp_jing.xml | 4 +- .../Component/com_OutCard_Vertical.xml | 4 +- .../NewHandCard/Player_card_info_S.xml | 5 + .../Main_new/Main_new_2_jiangxi.xml | 41 ++++---- .../Main_new/Main_new_3_jiangxi.xml | 2 +- .../Main_new_4/Component/Btn_HandCard.xml | 8 +- .../Main_new_4/Component/Comp_4_3_FZ_Card.xml | 4 +- .../Main_new/Main_new_4_jiangxi.xml | 20 ++-- .../Main_Majiang/Main_new/com_notice.xml | 4 +- .../Main_Majiang/images/centerFont/0.png | Bin 0 -> 1378 bytes .../Main_Majiang/images/centerFont/1.png | Bin 0 -> 714 bytes .../Main_Majiang/images/centerFont/2.png | Bin 0 -> 1246 bytes .../Main_Majiang/images/centerFont/3.png | Bin 0 -> 1383 bytes .../Main_Majiang/images/centerFont/4.png | Bin 0 -> 1130 bytes .../Main_Majiang/images/centerFont/5.png | Bin 0 -> 1230 bytes .../Main_Majiang/images/centerFont/6.png | Bin 0 -> 1493 bytes .../Main_Majiang/images/centerFont/7.png | Bin 0 -> 1077 bytes .../Main_Majiang/images/centerFont/8.png | Bin 0 -> 1562 bytes .../Main_Majiang/images/centerFont/9.png | Bin 0 -> 1402 bytes .../images/centerFont/centerFont.fnt | 11 ++ wb_new_ui/assets/Main_Majiang/package.xml | 11 ++ .../main_majiang/ui/Main_Majiang_atlas0.png | Bin 4120888 -> 3589774 bytes .../main_majiang/ui/Main_Majiang_atlas0_1.png | Bin 4627176 -> 4712212 bytes .../main_majiang/ui/Main_Majiang_atlas0_2.png | Bin 3584931 -> 3638622 bytes .../main_majiang/ui/Main_Majiang_atlas0_3.png | Bin 1339603 -> 1357196 bytes .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 383457 -> 384804 bytes .../Modules/FairyGUI/Scripts/UI/GList.cs | 96 ++++++++++++++++++ .../Assets/Scripts/Editor/CustomSettings.cs | 1 + .../Assets/Source/Generate/LuaBinder.cs | 1 + 45 files changed, 332 insertions(+), 161 deletions(-) create mode 100644 wb_new_ui/assets/Main_Majiang/images/centerFont/0.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/centerFont/1.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/centerFont/2.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/centerFont/3.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/centerFont/4.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/centerFont/5.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/centerFont/6.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/centerFont/7.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/centerFont/8.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/centerFont/9.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/centerFont/centerFont.fnt diff --git a/lua_probject/base_project/Game/Controller/GameController.lua b/lua_probject/base_project/Game/Controller/GameController.lua index d8d50922..0bd55f0a 100644 --- a/lua_probject/base_project/Game/Controller/GameController.lua +++ b/lua_probject/base_project/Game/Controller/GameController.lua @@ -166,6 +166,7 @@ function M:ExitWitnessGame(pid, gid, rid) _data["gid"] = gid _data["room_id"] = rid _client:send(Protocol.GAME_Exit_WITNESS_ROOM, _data) + _client:destroy() end --聊天 diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index 1103d33a..43e3ebfa 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -897,6 +897,23 @@ function M:FG_GetMemberRank(group_id, pid, limit, num, begin_time, end_time, typ end) end +-- 排行筛选游戏，江西用于成员战绩 +function M:FG_GetMemberRank_2(group_id, pid, limit, num, begin_time, end_time, gameId, limitScore, callback) + local _client = ControllerManager.GroupClient + local data = {} + data.id = group_id + data.pid = pid + data.beginTime = begin_time + data.endTime = end_time + data.limit = limit + data.num = num + data.gameId = gameId + data.limitScore = limitScore + _client:send(Protocol.WEB_FG_MEMBER_RANK_2, data, function(res) + callback(res) + end) +end + -- 局数统计 function M:FG_GetRoundStat(group_id, pid, callback) local _client = ControllerManager.GroupClient diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index 12f66713..ee4a6749 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -311,6 +311,8 @@ Protocol = { WEB_FG_GET_REWARDS_STATISTIC = "group/log/get_reward_count", -- 获取成员排名 WEB_FG_MEMBER_RANK = "group/log/get_member_rank", + -- 获取带筛选游戏的排名 + WEB_FG_MEMBER_RANK_2 = "group/log/get_member_rank_2", -- 获取局数统计 WEB_FG_GET_ROUND_STATISTIC = "group/log/get_round_count", -- 成员体力值详情 diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index e87a673e..d5b7555a 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -96,8 +96,7 @@ function FamilyNumberRecord.New(root, page) end) box_type.onChanged:Set(function() - -- self._data_seletedType = box_type.value - self._data_seletedType = 0 + self._data_seletedType = box_type.value self:OnClickSortType() end) @@ -234,7 +233,7 @@ end function M:InitBoxType() local items = { "扑克", "麻将" } - local values = { "1", "2" } + local values = { "0", "1" } local games = DataManager.SelfUser.games for i = 1, #games do @@ -453,40 +452,41 @@ function M:NumverRankRenderer(groupId) end function M:OnClickSortType() - print("lingmengOnClickSortType") self.rank = {} local fgCtr = ControllerManager.GetController(NewGroupController) self:RecursionGetNumberRank(fgCtr, 0, 0, 0, 0) end function M:RecursionGetNumberRank(fgCtr, index, round, win, cost) - fgCtr:FG_GetMemberRank(self.group_id, 0, index * 2, 2, self._data_leftTime, self._data_rightTime, nil, function(res) - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取排行榜失败") - return - else - local info = res.Data - if info.ranks and #info.ranks > 0 then - for i = 1, #info.ranks do - table.insert(self.rank, info.ranks[i]) - round = round + self.rank[i].round - win = win + self.rank[i].win - end - self:RecursionGetNumberRank(fgCtr, index + 1, round, win, cost) + fgCtr:FG_GetMemberRank_2(self.group_id, 0, index * 2, 2, self._data_leftTime, self._data_rightTime, + self._data_seletedType, self._data_sortType, + function(res) + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取排行榜失败") + return else - round = math.floor(round / 2) - self._view:GetChild('text_allRound').text = round - self._view:GetChild('text_winNum').text = win - self.showRank = self.rank - self._viewList_numverRecord.numItems = #self.showRank - end + local info = res.Data + if info.ranks and #info.ranks > 0 then + for i = 1, #info.ranks do + table.insert(self.rank, info.ranks[i]) + round = round + self.rank[i].round + win = win + self.rank[i].win + end + self:RecursionGetNumberRank(fgCtr, index + 1, round, win, cost) + else + round = math.floor(round / 2) + self._view:GetChild('text_allRound').text = round + self._view:GetChild('text_winNum').text = win + self.showRank = self.rank + self._viewList_numverRecord.numItems = #self.showRank + end - self.text_score_majiang.text = 0 - info.mj_score - self.text_score_poker.text = 0 - info.pk_score - self.MJScore = info.mj_score - self.PKScore = info.pk_score - end - end) + self.text_score_majiang.text = 0 - info.mj_score + self.text_score_poker.text = 0 - info.pk_score + self.MJScore = info.mj_score + self.PKScore = info.pk_score + end + end) end function M:OnClickNumberRank(groupId, uid, round) diff --git a/lua_probject/base_project/Game/View/MainView.lua b/lua_probject/base_project/Game/View/MainView.lua index 131b57ad..39aee266 100644 --- a/lua_probject/base_project/Game/View/MainView.lua +++ b/lua_probject/base_project/Game/View/MainView.lua @@ -377,6 +377,7 @@ function M:InitView(url, isHideIpAdds) self:EventInit() self._popEvent = true self._left_time = 0 + print("lingmeng _left_time1", self._left_time) self.dismiss_room_cd_time = 0 local btn_back_exit = _view:GetChild('btn_back_exit') --btn_back_exit.displayObject.gameObject:SetActive(false) @@ -896,6 +897,7 @@ function M:EventInit() local arg = { ... } local p = arg[1] local info = self._player_info[self:GetPos(p.seat)] + self._left_time = tonumber(arg[3]) or 0 if info and info.IsShowTGTips then info:IsShowTGTips(arg[2], arg[3]) @@ -1347,23 +1349,25 @@ function M:OnUpdate() _left_time = _left_time - deltaTime _left_time = math.max(0, _left_time) local leftTime = math.floor(_left_time) - if leftTime < 10 then - self._tex_leftTime.text = '0' .. tostring(leftTime) - for i = 2, 4 do - local text = self["_tex_leftTime" .. i] - if text then - text.text = '0' .. tostring(leftTime) - end - end - else - self._tex_leftTime.text = tostring(leftTime) - for i = 2, 4 do - local text = self["_tex_leftTime" .. i] - if text then - text.text = tostring(leftTime) - end - end - end + --旧的拼接方式 + -- if leftTime < 10 then + -- self._tex_leftTime.text = '0' .. tostring(leftTime) + -- for i = 2, 4 do + -- local text = self["_tex_leftTime" .. i] + -- if text then + -- text.text = '0' .. tostring(leftTime) + -- end + -- end + -- else + -- self._tex_leftTime.text = tostring(leftTime) + -- for i = 2, 4 do + -- local text = self["_tex_leftTime" .. i] + -- if text then + -- text.text = tostring(leftTime) + -- end + -- end + -- end + self._tex_leftTime.text = string.format("%02d", _left_time) self._left_time = _left_time -- 桌面計時器聲音 if not self._curtime then diff --git a/lua_probject/base_project/Game/View/PlayerInfoView2.lua b/lua_probject/base_project/Game/View/PlayerInfoView2.lua index c1390c95..d6db898b 100644 --- a/lua_probject/base_project/Game/View/PlayerInfoView2.lua +++ b/lua_probject/base_project/Game/View/PlayerInfoView2.lua @@ -68,14 +68,16 @@ function M:IsShowTGTips(isShow, time) if time == nil then time = 0 end self.isShowTGTimer = isShow - if self.PlayerTGTips and self.PlayerTGTips.displayObject.gameObject then - self.PlayerTGTips.displayObject.gameObject:SetActive(isShow) - end + -- if self.PlayerTGTips and self.PlayerTGTips.displayObject.gameObject then + -- self.PlayerTGTips.displayObject.gameObject:SetActive(isShow) + -- end self.currentTime = 0 if isShow then - if self.PlayerTGTips then - self.PlayerTGTips.text = "开启托管剩余时间" .. time .. "s" - end + --关闭头像上的显示倒计时，在页面中显示 + -- if self.PlayerTGTips then + -- self.PlayerTGTips.text = "开启托管剩余时间" .. time .. "s" + -- end + --显示在中间转盘里 self.totalTime = time TimerManager.AddTimer(self.OnUpdate, self) else @@ -91,9 +93,12 @@ function M:OnUpdate() self.currentTime = 0 self.totalTime = self.totalTime - 1 --printlog("当前计时器===>>>",self.totalTime) - if self.PlayerTGTips then - self.PlayerTGTips.text = "开启托管剩余时间" .. self.totalTime .. "s" - end + --关闭头像上的显示倒计时，在页面中显示 + -- if self.PlayerTGTips then + -- self.PlayerTGTips.text = "开启托管剩余时间" .. self.totalTime .. "s" + -- end + + if self.totalTime <= 0 then self.isShowTGTimer = false @@ -170,7 +175,6 @@ function M:FillData(player) end function M:UpdateScore(score, doAnimation) - local lastScore = tonumber(self._tex_score.text) if not score then @@ -368,7 +372,6 @@ function M:Destroy() end function M:ScoreAnimation(score) - if score == 0 then return end diff --git a/lua_probject/base_project/Game/View/WitnessView.lua b/lua_probject/base_project/Game/View/WitnessView.lua index 770a720e..a0f1dc4e 100644 --- a/lua_probject/base_project/Game/View/WitnessView.lua +++ b/lua_probject/base_project/Game/View/WitnessView.lua @@ -1,5 +1,6 @@ local MJSettingView = require("main.majiang.MJSettingViewNew") local TableBG = require("Game.Data.TableBG") +local MJMainView = require("main.majiang.MJMainView") local bg_config = { { id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" }, @@ -15,7 +16,6 @@ function WitnessView:init() end function WitnessView:InitView() - self.btn_setting = self._view:GetChild("btn_setting") self.com_logocType = self._view:GetChild("com_logo"):GetController("cType") @@ -27,6 +27,38 @@ function WitnessView:InitView() local default_bg = 1 TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config) + + self.com_notice = self._view:GetChild("com_notice") +end + +function WitnessView:Show() + getmetatable(WitnessView).__index.Show(self) + self:DoNoticeAnimation() +end + +function WitnessView:DoNoticeAnimation() + self.noticeIndex = self.noticeIndex or 1 + if not DataManager.GameNotice or #DataManager.GameNotice == 0 then + return + end + + local text_notice = self.com_notice:GetChild("text_notice") + text_notice.text = DataManager.GameNotice[self.noticeIndex] + local speed = 44 + local time = text_notice.width / speed + + text_notice.x = self.com_notice.width + + local tween = text_notice:TweenMove(Vector2(-text_notice.width, text_notice.y), time):OnComplete(function() + self:DoNoticeAnimation() + end) + + tween:SetEase(EaseType.Linear) + + self.noticeIndex = self.noticeIndex + 1 + if self.noticeIndex > #DataManager.GameNotice then + self.noticeIndex = 1 + end end return WitnessView diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua index 4e8badc0..f28f944b 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua @@ -173,15 +173,15 @@ function M:LoadConfigData(data) self._config:GetChild("n93").text = string.format("奖%s马", data.jiangma * 2) end -function M:LoadConfigToDetail(data, hpdata) +function M:LoadConfigToDetail(data) local configData = data if type(data) == 'string' then configData = json.decode(data) end - local hpData = hpdata - if type(hpdata) == 'string' then - hpData = json.decode(hpdata) + local hpData = data.hpData + if type(hpData) == 'string' then + hpData = json.decode(hpData) end local returnString = string.format("人数%s人", configData.maxPlayers) diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua index 6ccddf07..0a98c6cd 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua @@ -169,12 +169,16 @@ function M:LoadConfigData(data) self._config:GetChild("n93").text = string.format("奖%s马", data.jiangma * 2) end -function M:LoadConfigToDetail(data, hpData) +function M:LoadConfigToDetail(data) local configData = data if type(data) == 'string' then configData = json.decode(data) end + local hpData = data.hpData + if type(hpData) == 'string' then + hpData = json.decode(hpData) + end local returnString = string.format("人数%s人", configData.maxPlayers) if configData.jiangma then diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua index b9b7e194..3b6006f7 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua @@ -157,6 +157,10 @@ function M:LoadConfigToDetail(data) configData = json.decode(data) end + local hpData = data.hpData + if type(hpData) == 'string' then + hpData = json.decode(hpData) + end local returnString = string.format("人数%s人,%s,%s,%s", configData.maxPlayers, configData.zimo == 0 and "只能自摸" or "自摸可点炮", diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index f508c77a..5e15cd14 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -250,7 +250,7 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...) local arg = { ... } - self._left_time = 15 + -- self._left_time = 15 local seat = arg[1] self:UpdateCardBox(self:GetPos(seat)) -- if seat == self._room.self_player.seat then @@ -267,7 +267,8 @@ function M:EventInit() local _gcm_outcard_url = "ui://Main_Majiang/Gcm_OutCard" _gamectr:AddEventListener(TX_GameEvent.OutCard, function(...) self:__CloseTip() - self._left_time = 0 + + local arg = { ... } local p = arg[1] local card = arg[2] @@ -492,6 +493,7 @@ function M:EventInit() self:PlayMJSound("end_music.mp3") self:UnmarkSelfTuoguan() self._left_time = 0 + self:UpdateCardBox(0) self._ctr_cardbox.selectedIndex = 0 local arg = { ... } diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua index 0adf33a9..f81c98fa 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua @@ -192,7 +192,7 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...) print("lingmeng witness EventTurn") local arg = { ... } - self._left_time = 15 + -- self._left_time = 15 local seat = arg[1] self:UpdateCardBox(self:GetPos(seat)) local playerInfo = self._player_info[self:GetPos(seat)] @@ -252,13 +252,12 @@ function M:EventInit() end) _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...) - print("lingmeng witness ZPResult1") - self._popEvent = false + local _room = self._room self._left_time = 0 self:UpdateCardBox(0) self._ctr_cardbox.selectedIndex = 0 local arg = { ... } - self:ShowHand(arg) + MJMainView.ShowHand(self, arg) local result = arg[1] local liuju = result.liuju local data = result.info_list @@ -274,55 +273,21 @@ function M:EventInit() -- end) -- end self:RemoveCursor() - if self._clearingView == nil then - self._clearingView = EXClearingView.new(self._root_view) - coroutine.start(function() - coroutine.wait(0.5) - self._clearingView:Show() - self._popEvent = true - end) - end - print("lingmeng witness ZPResult2") + self._clearingView = EXClearingView.new(self._root_view) + coroutine.start(function() + coroutine.wait(0.5) + self._clearingView:Show() + self._popEvent = true + end) if _room.curren_round ~= _room.room_config.round then -- if #niao == 0 then self._view:GetChild("n13").visible = false end - for i = 1, #data do - local p = _room:GetPlayerBySeat(data[i].seat) - if p then - p.total_score = data[i].total_score - local card_info = self._player_card_info[self:GetPos(p.seat)] - local info = self._player_info[self:GetPos(p.seat)] - card_info:Clear() - card_info:ResetCardType() - if _room:checkHpNonnegative() then - p.cur_hp = data[i].hp_info.cur_hp - end - -- info:UpdateScore() - info._view:GetChild("zhanji").visible = true - local num = data[i].hp_info.total_score - if num >= 0 then - info._view:GetController("text_color").selectedIndex = 0 - info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num) - else - info._view:GetController("text_color").selectedIndex = 1 - info._view:GetChild("text_jifen").text = num --d2ad(num) - end - - info._view:GetChild("mask_piao").title = "" - info._view:GetController("piao_niao").selectedIndex = 0 - p.fz_list = {} - end - end - self._clearingView:InitData(0, _room, result, nil, function(...) DataManager.CurrenRoom.self_player.card_list = {} self._ctr_state.selectedIndex = 2 self._clearingView = nil - end, 1) + end) end - print("lingmeng witness ZPResult3") - - -- self._player_card_info[1]:ShowHuTip() end) _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...) @@ -344,6 +309,7 @@ function M:EventInit() ControllerManager.ChangeController(LoddyController) end) + _gamectr:AddEventListener(TX_GameEvent.EvnetPiaoTip, function() print("lingmeng witness EvnetPiaoTip") end) @@ -436,6 +402,7 @@ function M:OnUpdate() else print("witness error") print(result) + error(result) -- self._gamectr = ControllerManager.GetController(GameController) -- if self._gamectr then -- self._gamectr:ResetConnect() diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua index e0b5df95..e079207d 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua @@ -184,6 +184,10 @@ function M:LoadConfigToDetail(data) configData = json.decode(data) end + local hpData = data.hpData + if type(hpData) == 'string' then + hpData = json.decode(hpData) + end local returnString = string.format("人数%s人,%s马%s%s%s%s%s%s,%s", configData.maxPlayers, configData.jiangma and string.format("奖%d", configData.jiangma * 2) or "不奖", diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua index 05328ea1..76eb73a4 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua @@ -65,13 +65,13 @@ function M:init() self._view_getCard = self._view:GetChild('Btn_HandCard2') end - -- if self.direction == "S" then - -- self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowHorizontal_left2right_bottom2top - -- elseif self.direction == "N" then - -- self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowHorizontal_right2left_top2bottom - -- elseif self.direction == "E" then - -- self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowVertical_right2left_bottom2top - -- end + if self.direction == "S" then + self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowHorizontal_left2right_bottom2top + elseif self.direction == "N" then + self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowHorizontal_right2left_top2bottom + elseif self.direction == "E" then + self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowVertical_right2left_bottom2top + end end function M:SetPlayer(p) @@ -477,8 +477,6 @@ function M:ResetCardType() end function M:ShowHand(cards) - self._view_handCardList:RemoveChildren() - local list = self._view_handCardList local cardType = self._viewText_cardInfo["Out_Card"] if self._viewText_cardInfo['IS_SIDE'] == "true" then @@ -486,6 +484,7 @@ function M:ShowHand(cards) cardType = self._viewText_cardInfo["Hand_Card"] end + list:RemoveChildren() --list:RemoveChildren() local passcard = false for _, card in pairs(cards) do diff --git a/lua_probject/main_project/main/majiang/MJSettingViewNew.lua b/lua_probject/main_project/main/majiang/MJSettingViewNew.lua index fb0df013..8b5d889f 100644 --- a/lua_probject/main_project/main/majiang/MJSettingViewNew.lua +++ b/lua_probject/main_project/main/majiang/MJSettingViewNew.lua @@ -25,7 +25,7 @@ function M:Reflash() self.cBtn.selectedIndex = 1 end - if self.flag_witness then + if self._flag_witness then self.cBtn.selectedIndex = 0 end diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Comp_ConterBox.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Comp_ConterBox.xml index ea6b487b..be986fb9 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Comp_ConterBox.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Comp_ConterBox.xml @@ -21,7 +21,7 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/Comp_jing.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/Comp_jing.xml index ee9f7ab2..6d36aacb 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/Comp_jing.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/Comp_jing.xml @@ -2,10 +2,10 @@ - + - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Component/com_OutCard_Vertical.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Component/com_OutCard_Vertical.xml index 549503ce..d24cf891 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Component/com_OutCard_Vertical.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Component/com_OutCard_Vertical.xml @@ -1,11 +1,11 @@ - + - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml index fa7c4044..84ced940 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml @@ -15,12 +15,14 @@ + + @@ -38,6 +40,7 @@ + @@ -74,10 +77,12 @@ + + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml index a99e8678..a53375b7 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml @@ -18,10 +18,15 @@ + + + + + - + @@ -29,37 +34,32 @@ - + - + - + - + - - - - - - - - + + + - + - + - + @@ -141,14 +141,14 @@ - + - + - + @@ -185,8 +185,9 @@ - + + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml index a519f00e..0145cf83 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml @@ -23,7 +23,7 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml index 78e651ed..aa311a9b 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml @@ -3,16 +3,16 @@ - + - + - + - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml index 9e9b6525..cb1c1c96 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml @@ -1,11 +1,11 @@ - + - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml index 2207aa44..5f21b773 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml @@ -37,6 +37,7 @@ + @@ -44,6 +45,7 @@ + @@ -51,6 +53,7 @@ + @@ -58,6 +61,7 @@ + @@ -163,28 +167,28 @@