From d70d367fd7689568258b0e9f91190addb5647ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com>
Date: Fri, 12 Sep 2025 15:36:45 +0800
Subject: [PATCH] tonmgbu
---
.../Game/Controller/NewGroupController.lua | 19 +++
lua_probject/base_project/Game/IGameInfo.lua | 4 +
lua_probject/base_project/Game/Protocol.lua | 2 +
.../Game/View/Family/FamilyRecord.lua | 3 +-
.../MngView/GroupGameSettingView_jaingxi.lua | 2 -
.../base_project/Game/View/WitnessView.lua | 92 +++++++++-
.../extend/majiang/fuzhou/EXClearingView.lua | 12 ++
.../extend/majiang/fuzhou/EXGameInfo.lua | 3 +
.../extend/majiang/fuzhou/EXMainView.lua | 4 +-
.../majiang/fuzhou/EXPlayerInfoView.lua | 8 +-
.../extend/majiang/fuzhou/EXWitnessView.lua | 161 +++++-------------
.../extend/majiang/fuzhou/ExtendConfig.lua | 27 ++-
.../extend/majiang/jinxi/EXClearingView.lua | 12 ++
.../extend/majiang/jinxi/EXGameInfo.lua | 3 +
.../extend/majiang/lichuan/EXClearingView.lua | 12 ++
.../extend/majiang/lichuan/EXGameInfo.lua | 8 +-
.../extend/majiang/lichuan/EXWitnessView.lua | 15 +-
.../extend/majiang/lichuan/ExtendConfig.lua | 27 ++-
.../extend/majiang/nancheng/EXGameInfo.lua | 17 +-
.../main_project/main/majiang/MJMainView.lua | 11 +-
.../main/majiang/MJPlayerCardInfoView.lua | 4 +
.../main/majiang/MJWitnessView.lua | 10 +-
.../assets/Info_MJ_FuZhou/Label_Detail_83.xml | 4 +-
.../assets/Info_MJ_JinXi/Label_Detail_83.xml | 8 +-
.../Info_MJ_LiChuan/Label_Detail_83.xml | 12 +-
.../Info_MJ_NanCheng/Label_Detail_83.xml | 4 +-
.../Main_new/Clearing/clearing.xml | 7 +-
.../Main_new/Main_new_3_jiangxi.xml | 14 +-
.../Main_new/Main_new_4_jiangxi.xml | 2 +-
.../ART/base/Family/ui/Family_fui.bytes | Bin 129735 -> 129757 bytes
.../base/common/sound/timeup_alarm.mp3.meta | 2 +-
.../main_majiang/sound/clickCard.mp3.meta | 2 +-
.../main_majiang/sound/timeup_alarm.mp3.meta | 2 +-
.../main_majiang/ui/Main_Majiang_fui.bytes | Bin 364233 -> 364342 bytes
.../fuzhou/ui/Info_MJ_FuZhou_fui.bytes | Bin 22706 -> 22711 bytes
.../majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes | Bin 22392 -> 22396 bytes
.../lichuan/ui/Info_MJ_LiChuan_fui.bytes | Bin 18342 -> 18352 bytes
.../nancheng/ui/Info_MJ_NanCheng_fui.bytes | Bin 22662 -> 22667 bytes
.../Assets/StreamingAssets/init1_1.json | 20 +--
.../Assets/StreamingAssets/init2_1.json | 60 +++----
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin 3213250 -> 3212763 bytes
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin 1811706 -> 1821566 bytes
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin 14064195 -> 14080845 bytes
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin 6972954 -> 6972994 bytes
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin 11373065 -> 11392194 bytes
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin
..._pack1.0.7.bytes => asset_pack1.0.8.bytes} | Bin
...ack1.0.26.bytes => asset_pack1.0.27.bytes} | Bin 6460234 -> 6460364 bytes
...ack1.0.27.bytes => asset_pack1.0.28.bytes} | Bin 3651448 -> 3651568 bytes
...ack1.0.43.bytes => asset_pack1.0.44.bytes} | Bin 3504807 -> 3502809 bytes
...ack1.0.40.bytes => asset_pack1.0.41.bytes} | Bin 4501561 -> 4501735 bytes
.../poker/runfast/asset_pack1.0.25.bytes | Bin 0 -> 5396982 bytes
60 files changed, 354 insertions(+), 239 deletions(-)
rename wb_unity_pro/Pack/Android32/base/Family/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (94%)
rename wb_unity_pro/Pack/Android32/base/base_script/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (96%)
rename wb_unity_pro/Pack/Android32/base/chat/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (100%)
rename wb_unity_pro/Pack/Android32/base/common/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (99%)
rename wb_unity_pro/Pack/Android32/base/embed/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (100%)
rename wb_unity_pro/Pack/Android32/base/lobby/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (97%)
rename wb_unity_pro/Pack/Android32/base/login/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (100%)
rename wb_unity_pro/Pack/Android32/base/main_majiang/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (96%)
rename wb_unity_pro/Pack/Android32/base/main_pokemajiang/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (100%)
rename wb_unity_pro/Pack/Android32/base/main_poker/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (100%)
rename wb_unity_pro/Pack/Android32/base/main_zipai/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (100%)
rename wb_unity_pro/Pack/Android32/base/main_zipaimajiang/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (100%)
rename wb_unity_pro/Pack/Android32/base/newgroup/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (100%)
rename wb_unity_pro/Pack/Android32/base/rank/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (100%)
rename wb_unity_pro/Pack/Android32/base/static/{asset_pack1.0.7.bytes => asset_pack1.0.8.bytes} (100%)
rename wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/{asset_pack1.0.26.bytes => asset_pack1.0.27.bytes} (99%)
rename wb_unity_pro/Pack/Android32/extend/majiang/jinxi/{asset_pack1.0.27.bytes => asset_pack1.0.28.bytes} (99%)
rename wb_unity_pro/Pack/Android32/extend/majiang/lichuan/{asset_pack1.0.43.bytes => asset_pack1.0.44.bytes} (99%)
rename wb_unity_pro/Pack/Android32/extend/majiang/nancheng/{asset_pack1.0.40.bytes => asset_pack1.0.41.bytes} (99%)
create mode 100644 wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.25.bytes
diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua
index e5516726..5417ee40 100644
--- a/lua_probject/base_project/Game/Controller/NewGroupController.lua
+++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua
@@ -1049,6 +1049,25 @@ function M:FG_GetGroupRecordSpe(group_id, platform, qid, includeMembers, limit,
end)
end
+-- 战绩记录
+function M:FG_GetGroupRecordSpe2(group_id, platform, qid, includeMembers, limit, num, begin_time, end_time, time_type,
+ callback)
+ local _client = ControllerManager.GroupClient
+ local data = {}
+ data.id = group_id
+ data.qid = qid
+ data.platform = platform
+ data.includeMembers = includeMembers
+ data.limit = limit
+ data.num = num
+ data.bt = begin_time
+ data.et = end_time
+ data.tt = time_type
+ _client:send(Protocol.WEB_FG_GET_RECORD2, data, function(res)
+ callback(res)
+ end)
+end
+
-- 获取战绩
function M:FG_GetGroupPersonRecord(group_id, platform, qid, time_type, begin_time, end_time, limit, num, callback)
local _client = ControllerManager.GroupClient
diff --git a/lua_probject/base_project/Game/IGameInfo.lua b/lua_probject/base_project/Game/IGameInfo.lua
index c30c46f1..a5e2ff59 100644
--- a/lua_probject/base_project/Game/IGameInfo.lua
+++ b/lua_probject/base_project/Game/IGameInfo.lua
@@ -68,6 +68,10 @@ function M:ShowVariablePrice(ctype)
-- tex_owner.text = price
end
+function M:SetDefault()
+
+end
+
function M:LoadConfigToDetail(data)
local returnString = ''
diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua
index a848357c..9300afd9 100644
--- a/lua_probject/base_project/Game/Protocol.lua
+++ b/lua_probject/base_project/Game/Protocol.lua
@@ -328,6 +328,8 @@ Protocol = {
WEB_FG_GET_PROPORTION_LOG = "group/log/get_hplog_pump",
-- 获取战绩
WEB_FG_GET_RECORD = "group/log/get_records",
+ -- 战绩记录
+ WEB_FG_GET_RECORD2 = "group/log/get_records_owner",
-- 获取个人战绩
WEB_FG_GET_PERSON_RECORD = "group/log/get_person_records",
-- 获取成员战绩
diff --git a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua
index dc25e318..81975670 100644
--- a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua
@@ -208,8 +208,7 @@ function M:RecordItemRenderer(data, obj)
end
function M:RecursionRecord(fgCtr, index, uid, leftTime, rightTime)
- print("lingmeng RecursionRecord", self.group_id, GetPlatform(), uid, 0, index * 60, 60, leftTime, rightTime, 3)
- fgCtr:FG_GetGroupRecordSpe(self.group_id, GetPlatform(), uid, 0, index * 60, 60, leftTime, rightTime, 0,
+ fgCtr:FG_GetGroupRecordSpe2(self.group_id, GetPlatform(), uid, 0, index * 60, 60, leftTime, rightTime, 0,
function(res)
if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "查看个人战绩失败")
diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
index 8ac25c3a..e5a0fbe6 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
@@ -183,8 +183,6 @@ function M:FillGameData()
self.cJiesan.selectedIndex = hpData.JieShan - 1
self.cChat.selectedIndex = hpData.BanChat
self.cMisslie.selectedIndex = hpData.BanMissile
- else
- self.cGps.selectedIndex = 2
end
end
diff --git a/lua_probject/base_project/Game/View/WitnessView.lua b/lua_probject/base_project/Game/View/WitnessView.lua
index 15d537e2..fe3281af 100644
--- a/lua_probject/base_project/Game/View/WitnessView.lua
+++ b/lua_probject/base_project/Game/View/WitnessView.lua
@@ -172,6 +172,96 @@ function M:EventInit()
end
end
)
+
+ _gamectr:AddEventListener(GameEvent.OnUpdateInfo, function(...)
+ local arg = { ... }
+ local p = arg[1]
+ local t = arg[2]
+ -- 托管状态变化
+ if t == 5 then
+ if p == DataManager.CurrenRoom.self_player then
+ if p.entrust then
+ self:closeTipOnTuoguan()
+ self:MarkSelfTuoguan()
+ else
+ self:UnmarkSelfTuoguan()
+ end
+ else
+ local player_info = self._player_info[self:GetPos(p.seat)]
+ if p.entrust then
+ player_info:MarkTuoguan()
+ else
+ player_info:UnmarkTuoguan()
+ end
+ end
+ end
+ end)
+end
+
+-- 标记自己托管
+function M:MarkSelfTuoguan()
+ if self._com_tuoguan then
+ return
+ end
+
+
+ self._com_tuoguan = UIPackage.CreateObjectFromURL('ui://Common/com_tuoguan_self')
+ local com_tuoguan = self._com_tuoguan
+ GRoot.inst:AddChild(com_tuoguan)
+ --com_tuoguan:Center()
+ --com_tuoguan.y = GRoot.inst.height - com_tuoguan.height
+ --com_tuoguan.x = (GRoot.inst.width - com_tuoguan.width) * 0.5
+ -- local _msg_view = nil
+ -- com_tuoguan:GetChild('n0').onClick:Set(
+ -- function()
+ -- if _msg_view then
+ -- _msg_view:Dispose()
+ -- end
+ -- local _curren_msg = UIPackage.CreateObjectFromURL('ui://Common/MessageBox')
+ -- _msg_view = _curren_msg
+ -- _msg_view:GetChild('btn_ok').onClick:Set(
+ -- function()
+ -- _msg_view:Dispose()
+ -- _msg_view = nil
+ -- self._gamectr:Entrust(false)
+ -- end
+ -- )
+ -- _msg_view:GetChild('btn_close').onClick:Set(
+ -- function()
+ -- _msg_view:Dispose()
+ -- _msg_view = nil
+ -- end
+ -- )
+
+ -- _msg_view:GetChild('btn_close1').onClick:Set(
+ -- function()
+ -- _msg_view:Dispose()
+ -- _msg_view = nil
+ -- end
+ -- )
+ -- local roate = GRoot.inst.width / GRoot.inst.height
+ -- local num = 100
+ -- if roate < 1.9 then
+ -- num = 250
+ -- end
+ -- com_tuoguan:AddChild(_msg_view)
+ -- _msg_view:GetChild('tex_message').text = '确定要取消托管吗？'
+ -- _msg_view.x = (com_tuoguan.width - _msg_view.width) * 0.5 - num
+ -- _msg_view.y = (com_tuoguan.height - com_tuoguan.y - _msg_view.height) * 0.5
+ -- end
+ -- )
+end
+
+-- 取消标记自己托管
+function M:UnmarkSelfTuoguan()
+ if self._com_tuoguan then
+ self._com_tuoguan:Dispose()
+ self._com_tuoguan = nil
+ end
+end
+
+-- 托管时关闭一些提示窗口，如起手胡、吃碰提示、海底,由扩展实现
+function M:closeTipOnTuoguan()
end
function M:PlayChatSound(sex, chat_index)
@@ -301,7 +391,7 @@ end
function M:Destroy()
TimerManager.Clear()
- -- self:UnmarkSelfTuoguan()
+ self:UnmarkSelfTuoguan()
self:DestroyPlayerInfo()
DSTweenManager.ClearTween()
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua
index c9fdd63c..314bfd59 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua
@@ -190,6 +190,8 @@ function M:fillResult0(room, peopleNum, result)
print("===============================FZType.Peng", room.jing, fzCardInfo[j].card)
if room.jing == fzCardInfo[j].card then
card:GetController('jing').selectedIndex = 1
+ else
+ card:GetController('jing').selectedIndex = 0
end
end
elseif fzCardInfo[j].type == FZType.Chi then
@@ -202,6 +204,8 @@ function M:fillResult0(room, peopleNum, result)
if room.jing == fzCardInfo[j].opcard[l] then
card:GetController('jing').selectedIndex = 1
+ else
+ card:GetController('jing').selectedIndex = 0
end
end
elseif fzCardInfo[j].type == FZType.Gang or fzCardInfo[j].type == FZType.Gang_An or fzCardInfo[j].type == FZType.Gang_Peng then
@@ -216,6 +220,8 @@ function M:fillResult0(room, peopleNum, result)
if room.jing == fzCardInfo[j].card then
card:GetController('jing').selectedIndex = 1
+ else
+ card:GetController('jing').selectedIndex = 0
end
end
end
@@ -231,6 +237,8 @@ function M:fillResult0(room, peopleNum, result)
obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), infoList.hand_card[index + 1])
if room.jing == infoList.hand_card[index + 1] then
obj:GetController('jing').selectedIndex = 1
+ else
+ obj:GetController('jing').selectedIndex = 0
end
end
handCardList.numItems = handInfoNum
@@ -260,6 +268,8 @@ function M:fillResult0(room, peopleNum, result)
huCardBtn.icon = string.format("ui://Main_Majiang/b202_%d", infoList.win_card)
if room.jing == infoList.win_card then
huCardBtn:GetController('jing').selectedIndex = 1
+ else
+ huCardBtn:GetController('jing').selectedIndex = 0
end
huCardBtn.visible = true
@@ -360,6 +370,8 @@ function M:RemindCardRender(data, obj)
obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data)
if room.jing == data then
obj:GetController('jing').selectedIndex = 1
+ else
+ obj:GetController('jing').selectedIndex = 0
end
end
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua
index 0062877d..aeaf2792 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua
@@ -21,6 +21,9 @@ function M:FillData()
self._config:GetChild("n93").text = string.format("奖%s马", Mathf.Round(jiangmaSlider.value) * 2)
end)
+ local com_editSetting = self._config:GetChild("com_editSetting")
+
+ com_editSetting:GetController("cGps").selectedIndex = 2
-- if oldGameVersion == 2 then
-- self._config:GetController("xipai").selectedIndex = 0
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
index 5512d5cf..ecaa7eab 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
@@ -238,7 +238,9 @@ function M:EventInit()
end)
_gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
local arg = { ... }
- -- self._left_time = 15
+ if not self._left_time or self._left_time <= 15 then
+ self._left_time = 15
+ end
local seat = arg[1]
self:UpdateCardBox(self:GetPos(seat))
-- if seat == self._room.self_player.seat then
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXPlayerInfoView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXPlayerInfoView.lua
index ac74d71b..3a8b3a84 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXPlayerInfoView.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXPlayerInfoView.lua
@@ -3,17 +3,17 @@ local PlayerInfoView2 = require("Game.View.PlayerInfoView2")
local M = {}
-function M.new(view, mainView)
+function M.new(view, mainView,flag_witness)
setmetatable(M, { __index = PlayerInfoView2 })
local self = setmetatable({}, { __index = M })
self._view = view
self._main_view = mainView
- self:init()
+ self:init(flag_witness)
return self
end
-function M:init()
- PlayerInfoView2.init(self)
+function M:init(flag_witness)
+ PlayerInfoView2.init(self,flag_witness)
end
function M:ShowInteraction(type, str)
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua
index 0b34e031..3ae81a7e 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua
@@ -156,72 +156,13 @@ end
function M:EventInit()
-- UIPackage.AddPackage("extend/majiang/hongzhong/ui/Extend_MJ_HongZhong")
- MainView.EventInit(self)
+ getmetatable(M).__index.EventInit(self)
local _room = self._room
local _view = self._view
local _gcm_outcard_url = UIPackage.GetItemURL("Main_Majiang", "Gcm_OutCard")
local _player_info = self._player_info
local _gamectr = self._gamectr
- _gamectr:AddEventListener(GameEvent.PlayerEnter, function(...)
- self:PlayMJSound("user_enter.mp3")
- local arg = { ... }
- local p = arg[1]
- local info1 = self._player_info[self:GetPos(p.seat)]
- info1:FillData(p)
- info1._view.visible = true
-
- local info2 = self._player_card_info[self:GetPos(p.seat)]
- info2:SetPlayer(p)
- info2:FillData()
- end)
-
- _gamectr:AddEventListener(GameEvent.PlayerLeave, function(...)
- local arg = { ... }
- local p = arg[1]
- local info1 = self._player_info[self:GetPos(p.seat)]
- info1._view.visible = false
- self:PlayMJSound("user_leave.mp3")
- end)
-
- _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...)
- self:PlayMJSound("user_enter.mp3")
- local arg = { ... }
- local witnessPlayerList = arg[1]
- self._room.witness_player_list = witnessPlayerList
-
- local _room = DataManager.CurrenRoom
- local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players')
- print("linemng tcp", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems)
- if viewList_witness.numItems == #_room.witness_player_list then
- viewList_witness:RefreshVirtualList()
- else
- viewList_witness.numItems = #_room.witness_player_list
- end
- end)
-
- _gamectr:AddEventListener(GameEvent.WitnessPlayerLeave, function(...)
- ---- print("刷新托管数据=====")
- local arg = { ... }
- local player = arg[1]
- local witnessPlayerList = self._room.witness_player_list
- for i, _player in ipairs(witnessPlayerList) do
- if _player.aid == player then
- table.remove(witnessPlayerList, i)
- break
- end
- end
-
- local _room = DataManager.CurrenRoom
- local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players')
- print("linemng", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems)
- if viewList_witness.numItems == #_room.witness_player_list then
- viewList_witness:RefreshVirtualList()
- else
- viewList_witness.numItems = #_room.witness_player_list
- end
- end)
-
_gamectr:AddEventListener(TX_GameEvent.SendLaiZi, function(...)
local arg = { ... }
print("lingmeng witness SendLaiZi")
@@ -237,67 +178,10 @@ function M:EventInit()
print("lingmeng witness EventBuGang")
end)
- _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
- print("lingmeng witness SendCards")
- -- self:ShowJing()
- if self._clearingView then
- self._clearingView:Destroy()
- self._clearingView = nil
- end
- self:UpdateRound()
- self:RemoveCursor()
- self._state.selectedIndex = 4
- local list = _room.player_list
- for i = 1, #list do
- local p = list[i]
- local info = self._player_info[self:GetPos(p.seat)]
- info:FillData(p)
- info:MarkBank(p.seat == _room.banker_seat)
- info:Ready(false)
- local card_info = self._player_card_info[self:GetPos(p.seat)]
- card_info:Clear()
- card_info:UpdateHandCardWitness()
- end
- end)
- _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
- print("lingmeng witness EventTurn")
- local arg = { ... }
- -- self._left_time = 15
- local seat = arg[1]
- self:UpdateCardBox(self:GetPos(seat))
- local playerInfo = self._player_info[self:GetPos(seat)]
- local info = self._player_card_info[self:GetPos(seat)]
- print("lingmeng hand_left_count", info._player.hand_left_count)
- info._player.hand_left_count = info._player.hand_left_count + 1
- info:UpdateHandCardWitness(true)
- end)
-
_gamectr:AddEventListener(TX_GameEvent.OutHint, function(...)
print("lingmeng witness OutHint")
end)
- local _gcm_outcard_url = "ui://Main_Majiang/Gcm_OutCard"
- _gamectr:AddEventListener(TX_GameEvent.OutCard, function(...)
- print("lingmeng witness OutCard")
- self._left_time = 0
- local arg = { ... }
- local p = arg[1]
- local card = arg[2]
- local seat = p.seat
- local info = self._player_card_info[self:GetPos(seat)]
-
- self:RemoveCursor()
-
- info:UpdateHandCardWitness(false)
-
- info:UpdateOutCardList(nil, nil, self._cursor)
- self:PlayMJSound("chupai.mp3")
- self:PlaySound("FuZhou_MJ", p.self_user.sex, tostring(card))
- if seat == _room.self_player.seat then
- _room.curren_outcard_seat = -1
- end
- print("ling 2zhihou2")
- end)
_gamectr:AddEventListener(TX_GameEvent.GetCard, function(...)
print("lingmeng witness GetCard")
end)
@@ -416,6 +300,7 @@ function M:EventInit()
end)
_gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
+ self:PlayMJSound("end_music.mp3")
local _room = self._room
self._left_time = 0
self:UpdateCardBox(0)
@@ -439,6 +324,7 @@ function M:EventInit()
-- self:RemoveCursor()
if self._clearingView == nil then
self._clearingView = EXClearingView.new(self._root_view)
+ self._clearingView._view:GetChild('btn_setting').onClick:Set(handler(self,self.ClickSetting))
coroutine.start(function()
coroutine.wait(0.5)
self._clearingView:Show()
@@ -449,6 +335,31 @@ function M:EventInit()
if _room.curren_round ~= _room.room_config.round then
-- if #niao == 0 then self._view:GetChild("n13").visible = false end
self._clearingView:InitData(0, _room, result, nil, function(...)
+ for i = 1, #data do
+ local p = _room:GetPlayerBySeat(data[i].seat)
+ 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].total_score
+ end
+ info:UpdateScore()
+ info._view:GetChild("zhanji").visible = true
+ local num = data[i].total_score
+ if num >= 0 then
+ info._view:GetController("text_color").selectedIndex = 0
+ info._view:GetChild("text_jifen").text = "+" .. num
+ else
+ info._view:GetController("text_color").selectedIndex = 1
+ info._view:GetChild("text_jifen").text = num
+ end
+
+ info._view:GetChild("mask_piao").title = ""
+ info._view:GetController("piao_niao").selectedIndex = 0
+ p.fz_list = {}
+ end
DataManager.CurrenRoom.self_player.card_list = {}
self._clearingView = nil
end)
@@ -457,7 +368,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
print("lingmeng witness ZPResult2")
- -- self:UnmarkSelfTuoguan()
+ self:UnmarkSelfTuoguan()
self._left_time = 0
self:UpdateCardBox(0)
self._ctr_cardbox.selectedIndex = 0
@@ -487,6 +398,18 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...)
print("lingmeng witness EventResidueCard")
end)
+
+ --替换mianview的事件
+ _gamectr:AddEventListener(
+ GameEvent.PlayerState,
+ function(...)
+ printlog("lingmeng OnEventOnlineState")
+ local arg = { ... }
+ local p = arg[1]
+ local info = self._player_info[self:GetPos(p.seat)]
+ info._ctr_offline.selectedIndex = p.line_state == 0 and 1 or 0
+ end
+ )
end
function M:InitPlayerInfoView()
@@ -494,7 +417,7 @@ function M:InitPlayerInfoView()
local _player_info = self._player_info
for i = 1, self._room.room_config.people_num do
local tem = self._view:GetChild(string.format("player_info%d_2", i))
- _player_info[i] = PlayerInfoView.new(tem, self)
+ _player_info[i] = PlayerInfoView.new(tem, self,true)
tem.visible = false
end
end
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/ExtendConfig.lua b/lua_probject/extend_project/extend/majiang/fuzhou/ExtendConfig.lua
index 5a652030..61e51516 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/ExtendConfig.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/ExtendConfig.lua
@@ -99,22 +99,21 @@ function M:FillRoomData(s2croom)
local tem = _info_list[i]
local playerid = tem["playerid"]
local p = room:GetPlayerById(playerid)
- local outcard_list = tem["outcard_list"]
- p.outcard_list = outcard_list
p.total_score = tem["score"]
- p.hand_left_count = tem["card_count"]
p.piao_niao = tem["piao_niao"] or 0
- local opcard = tem["opcard"]
- for k = 1, #opcard do
- local op = opcard[k]
- local fz = {}
- fz.type = op["type"]
- fz.card = op["card"]
- fz.from_seat = op["from_seat"]
- p.fz_list[#p.fz_list + 1] = fz
- end
- if not playing and room.curren_round > 0 then
- -- self.GetGameController():PlayerReady()
+ if playing then
+ local outcard_list = tem["outcard_list"]
+ p.hand_left_count = tem["card_count"]
+ p.outcard_list = outcard_list
+ local opcard = tem["opcard"]
+ for k = 1, #opcard do
+ local op = opcard[k]
+ local fz = {}
+ fz.type = op["type"]
+ fz.card = op["card"]
+ fz.from_seat = op["from_seat"]
+ p.fz_list[#p.fz_list + 1] = fz
+ end
end
end
end
diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua
index 3af4029a..ed3bc704 100644
--- a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua
@@ -190,6 +190,8 @@ function M:fillResult0(room, peopleNum, result)
print("===============================FZType.Peng", room.jing, fzCardInfo[j].card)
if room.jing == fzCardInfo[j].card then
card:GetController('jing').selectedIndex = 1
+ else
+ card:GetController('jing').selectedIndex = 0
end
end
elseif fzCardInfo[j].type == FZType.Chi then
@@ -202,6 +204,8 @@ function M:fillResult0(room, peopleNum, result)
if room.jing == fzCardInfo[j].opcard[l] then
card:GetController('jing').selectedIndex = 1
+ else
+ card:GetController('jing').selectedIndex = 0
end
end
elseif fzCardInfo[j].type == FZType.Gang or fzCardInfo[j].type == FZType.Gang_An or fzCardInfo[j].type == FZType.Gang_Peng then
@@ -216,6 +220,8 @@ function M:fillResult0(room, peopleNum, result)
if room.jing == fzCardInfo[j].card then
card:GetController('jing').selectedIndex = 1
+ else
+ card:GetController('jing').selectedIndex = 0
end
end
end
@@ -231,6 +237,8 @@ function M:fillResult0(room, peopleNum, result)
obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), infoList.hand_card[index + 1])
if room.jing == infoList.hand_card[index + 1] then
obj:GetController('jing').selectedIndex = 1
+ else
+ obj:GetController('jing').selectedIndex = 0
end
end
handCardList.numItems = handInfoNum
@@ -259,6 +267,8 @@ function M:fillResult0(room, peopleNum, result)
huCardBtn.icon = string.format("ui://Main_Majiang/b202_%d", infoList.win_card)
if room.jing == infoList.win_card then
huCardBtn:GetController('jing').selectedIndex = 1
+ else
+ huCardBtn:GetController('jing').selectedIndex = 0
end
huCardBtn.visible = true
@@ -359,6 +369,8 @@ function M:RemindCardRender(data, obj)
obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data)
if room.jing == data then
obj:GetController('jing').selectedIndex = 1
+ else
+ obj:GetController('jing').selectedIndex = 0
end
end
diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua
index aef7f81c..ebca9907 100644
--- a/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua
+++ b/lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua
@@ -21,6 +21,9 @@ function M:FillData()
self._config:GetChild("n93").text = string.format("奖%s马", Mathf.Round(jiangmaSlider.value) * 2)
end)
+ local com_editSetting = self._config:GetChild("com_editSetting")
+
+ com_editSetting:GetController("cGps").selectedIndex = 2
-- if oldGameVersion == 2 then
-- self._config:GetController("xipai").selectedIndex = 0
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
index fed28f1a..c08b9e2f 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
@@ -189,6 +189,8 @@ function M:fillResult0(room, peopleNum, result)
print("===============================FZType.Peng", room.jing, fzCardInfo[j].card)
if room.jing == fzCardInfo[j].card then
card:GetController('jing').selectedIndex = 1
+ else
+ card:GetController('jing').selectedIndex = 0
end
end
elseif fzCardInfo[j].type == FZType.Chi then
@@ -201,6 +203,8 @@ function M:fillResult0(room, peopleNum, result)
if room.jing == fzCardInfo[j].opcard[l] then
card:GetController('jing').selectedIndex = 1
+ else
+ card:GetController('jing').selectedIndex = 0
end
end
elseif fzCardInfo[j].type == FZType.Gang or fzCardInfo[j].type == FZType.Gang_An or fzCardInfo[j].type == FZType.Gang_Peng then
@@ -215,6 +219,8 @@ function M:fillResult0(room, peopleNum, result)
if room.jing == fzCardInfo[j].card then
card:GetController('jing').selectedIndex = 1
+ else
+ card:GetController('jing').selectedIndex = 0
end
end
end
@@ -230,6 +236,8 @@ function M:fillResult0(room, peopleNum, result)
obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), infoList.hand_card[index + 1])
if room.jing == infoList.hand_card[index + 1] then
obj:GetController('jing').selectedIndex = 1
+ else
+ obj:GetController('jing').selectedIndex = 0
end
end
handCardList.numItems = handInfoNum
@@ -259,6 +267,8 @@ function M:fillResult0(room, peopleNum, result)
huCardBtn.icon = string.format("ui://Main_Majiang/b202_%d", infoList.win_card)
if room.jing == infoList.win_card then
huCardBtn:GetController('jing').selectedIndex = 1
+ else
+ huCardBtn:GetController('jing').selectedIndex = 0
end
huCardBtn.visible = true
@@ -358,6 +368,8 @@ function M:RemindCardRender(data, obj)
obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data)
if room.jing == data then
obj:GetController('jing').selectedIndex = 1
+ else
+ obj:GetController('jing').selectedIndex = 0
end
end
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua
index 03a132f2..ecf19337 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua
@@ -16,6 +16,12 @@ function M:FillData()
self._roundChoice = 3 -- 回合选项数
self._config = UIPackage.CreateObjectFromURL("ui://Info_MJ_LiChuan/Label_Detail_83")
+
+ local com_editSetting = self._config:GetChild("com_editSetting")
+
+ com_editSetting:GetController("cGps").selectedIndex = 2
+ self._config:GetController("jingbibo").selectedIndex = 1
+
-- if oldGameVersion == 2 then
-- self._config:GetController("xipai").selectedIndex = 0
@@ -171,7 +177,7 @@ function M:LoadConfigToDetail(data, hpdata)
returnString = string.format("%s人数%s人", returnString, configData.maxPlayers)
returnString = string.format("%s,%s,%s,%s", returnString,
- configData.zimo == 0 and "只能自摸" or "自摸可点炮",
+ configData.zimo == 0 and "可点炮,可自摸" or "只能自摸",
configData.tuoguan == 0 and string.format("%d秒后自动托管", configData.tuoguan_active_time) or "不能托管",
configData.jingbibo == 1 and "有精必博" or "有精可胡")
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
index b47719d3..9cb80434 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
@@ -326,6 +326,7 @@ function M:EventInit()
-- self:RemoveCursor()
if self._clearingView == nil then
self._clearingView = EXClearingView.new(self._root_view)
+ self._clearingView._view:GetChild('btn_setting').onClick:Set(handler(self,self.ClickSetting))
coroutine.start(function()
coroutine.wait(0.5)
self._clearingView:Show()
@@ -370,7 +371,7 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
print("lingmeng witness ZPResult2")
- -- self:UnmarkSelfTuoguan()
+ self:UnmarkSelfTuoguan()
self._left_time = 0
self:UpdateCardBox(0)
self._ctr_cardbox.selectedIndex = 0
@@ -401,6 +402,18 @@ function M:EventInit()
_gamectr:AddEventListener(TX_GameEvent.EventResidueCard, function(...)
print("lingmeng witness EventResidueCard")
end)
+
+ --替换mianview的事件
+ _gamectr:AddEventListener(
+ GameEvent.PlayerState,
+ function(...)
+ printlog("lingmeng OnEventOnlineState")
+ local arg = { ... }
+ local p = arg[1]
+ local info = self._player_info[self:GetPos(p.seat)]
+ info._ctr_offline.selectedIndex = p.line_state == 0 and 1 or 0
+ end
+ )
end
function M:InitPlayerInfoView()
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua b/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua
index d6e4b640..fc18c369 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/ExtendConfig.lua
@@ -106,22 +106,21 @@ function M:FillRoomData(s2croom)
local tem = _info_list[i]
local playerid = tem["playerid"]
local p = room:GetPlayerById(playerid)
- local outcard_list = tem["outcard_list"]
- p.outcard_list = outcard_list
p.total_score = tem["score"]
- p.hand_left_count = tem["card_count"]
p.piao_niao = tem["piao_niao"] or 0
- local opcard = tem["opcard"]
- for k = 1, #opcard do
- local op = opcard[k]
- local fz = {}
- fz.type = op["type"]
- fz.card = op["card"]
- fz.from_seat = op["from_seat"]
- p.fz_list[#p.fz_list + 1] = fz
- end
- if not playing and room.curren_round > 0 then
- -- self.GetGameController():PlayerReady()
+ if playing then
+ local outcard_list = tem["outcard_list"]
+ p.hand_left_count = tem["card_count"]
+ p.outcard_list = outcard_list
+ local opcard = tem["opcard"]
+ for k = 1, #opcard do
+ local op = opcard[k]
+ local fz = {}
+ fz.type = op["type"]
+ fz.card = op["card"]
+ fz.from_seat = op["from_seat"]
+ p.fz_list[#p.fz_list + 1] = fz
+ end
end
end
end
diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua
index 81792463..a9a44f4c 100644
--- a/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua
+++ b/lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua
@@ -20,6 +20,10 @@ function M:FillData()
jiangmaSlider.onChanged:Set(function()
self._config:GetChild("n93").text = string.format("奖%s马", Mathf.Round(jiangmaSlider.value) * 2)
end)
+
+ local com_editSetting = self._config:GetChild("com_editSetting")
+
+ com_editSetting:GetController("cGps").selectedIndex = 2
-- if oldGameVersion == 2 then
-- self._config:GetController("xipai").selectedIndex = 0
@@ -102,6 +106,9 @@ function M:GetPlayList()
return _play_list
end
+function M:SetDefault()
+end
+
function M:SelectedConfigData()
local _config = self._config
local round = _config:GetController("round").selectedIndex + 1
@@ -199,12 +206,12 @@ function M:LoadConfigToDetail(data, hpdata)
returnString = string.format("%s,%s马%s%s%s%s%s%s,%s", returnString,
configData.jiangma and string.format("奖%d", configData.jiangma * 2) or "不奖",
- configData.shaozhuang and ",有烧庄" or "",
- configData.zuoma and ",庄家坐马" or "",
- configData.zimo and ",只能自摸" or ",自摸可点炮",
+ configData.shaozhuang == 1 and ",有烧庄" or "",
+ configData.zuoma == 0 and ",庄家坐马" or "",
+ configData.zimo == 0 and ",可点炮,可自摸" or ",只能自摸",
configData.tuoguan and string.format(",%d秒后自动托管", configData.tuoguan_active_time) or ",不能托管",
- configData.jiahu and ",可以假胡" or "", configData.fengding and ",封顶20炮" or "",
- configData.zhuanwan and "大转弯" or "小转弯")
+ configData.jiahu == 0 and ",可以假胡" or "", configData.fengding and ",封顶20炮" or "",
+ configData.zhuanwan == 0 and "大转弯" or "小转弯")
if configData.GPSDetection then
returnString = string.format("%s%s", returnString,
diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua
index f5cc16d7..33c33df6 100644
--- a/lua_probject/main_project/main/majiang/MJMainView.lua
+++ b/lua_probject/main_project/main/majiang/MJMainView.lua
@@ -215,10 +215,12 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
self:InitXiPai()
self:InitXiPai1()
- self.btn_setting.onClick:Set(function()
- local view = MJSettingView.new(self)
- view:Show()
- end)
+ self.btn_setting.onClick:Set(handler(self,self.ClickSetting))
+end
+
+function M:ClickSetting()
+ local view = MJSettingView.new(self)
+ view:Show()
end
function M:InitXiPai()
@@ -721,6 +723,7 @@ function M:OnResult1(...)
-- end
-- self:RemoveCursor()
self._clearingView = self.EXClearingViewClass.new(self._root_view)
+ self._clearingView._view:GetChild('btn_setting').onClick:Set(handler(self,self.ClickSetting))
coroutine.start(function()
coroutine.wait(0.5)
self._clearingView:Show()
diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
index ba64034f..aa53771e 100644
--- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
+++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
@@ -135,6 +135,8 @@ end
function M:fillCard(obj, pos_str, card, use3d)
if DataManager.CurrenRoom.jing and card == DataManager.CurrenRoom.jing and obj:GetController('jing') then
obj:GetController('jing').selectedIndex = 1
+ else
+ obj:GetController('jing').selectedIndex = 0
end
if self._current_card_type == 2 and (use3d == nil or use3d == true) then
obj.icon = 'ui://MajiangCard3d/' .. 'b' .. pos_str .. card
@@ -149,6 +151,8 @@ function M:fillCard2(obj, pos_str, card, out)
if obj:GetController('out') then
obj:GetController('out').selectedIndex = out or 0
end
+ else
+ obj:GetController('jing').selectedIndex = 0
end
obj:GetChild("icon").url = 'ui://Main_Majiang/' .. pos_str .. card
diff --git a/lua_probject/main_project/main/majiang/MJWitnessView.lua b/lua_probject/main_project/main/majiang/MJWitnessView.lua
index 61aabe33..fcf28657 100644
--- a/lua_probject/main_project/main/majiang/MJWitnessView.lua
+++ b/lua_probject/main_project/main/majiang/MJWitnessView.lua
@@ -50,10 +50,12 @@ function M:InitView()
TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
self.btn_setting = self._view:GetChild("btn_setting")
- self.btn_setting.onClick:Set(function()
- local view = MJSettingView.new(self, true)
- view:Show()
- end)
+ self.btn_setting.onClick:Set(handler(self,self.ClickSetting))
+end
+
+function M:ClickSetting()
+ local view = MJSettingView.new(self, true)
+ view:Show()
end
local majiang_asset_path = "base/main_majiang/sound/"
diff --git a/wb_new_ui/assets/Info_MJ_FuZhou/Label_Detail_83.xml b/wb_new_ui/assets/Info_MJ_FuZhou/Label_Detail_83.xml
index db0b20ac..b952f68c 100644
--- a/wb_new_ui/assets/Info_MJ_FuZhou/Label_Detail_83.xml
+++ b/wb_new_ui/assets/Info_MJ_FuZhou/Label_Detail_83.xml
@@ -42,7 +42,7 @@
-
+
@@ -110,7 +110,7 @@
-
+
diff --git a/wb_new_ui/assets/Info_MJ_JinXi/Label_Detail_83.xml b/wb_new_ui/assets/Info_MJ_JinXi/Label_Detail_83.xml
index 8fafc2ca..846f5f34 100644
--- a/wb_new_ui/assets/Info_MJ_JinXi/Label_Detail_83.xml
+++ b/wb_new_ui/assets/Info_MJ_JinXi/Label_Detail_83.xml
@@ -40,7 +40,7 @@
-
+
@@ -70,16 +70,16 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Info_MJ_LiChuan/Label_Detail_83.xml b/wb_new_ui/assets/Info_MJ_LiChuan/Label_Detail_83.xml
index 5d4dd5e2..5915c4fe 100644
--- a/wb_new_ui/assets/Info_MJ_LiChuan/Label_Detail_83.xml
+++ b/wb_new_ui/assets/Info_MJ_LiChuan/Label_Detail_83.xml
@@ -21,7 +21,7 @@
-
+
@@ -38,7 +38,7 @@
-
+
@@ -82,16 +82,16 @@
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Info_MJ_NanCheng/Label_Detail_83.xml b/wb_new_ui/assets/Info_MJ_NanCheng/Label_Detail_83.xml
index 2ba8c34d..7a5ed44a 100644
--- a/wb_new_ui/assets/Info_MJ_NanCheng/Label_Detail_83.xml
+++ b/wb_new_ui/assets/Info_MJ_NanCheng/Label_Detail_83.xml
@@ -42,7 +42,7 @@
-
+
@@ -110,7 +110,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml
index 0084a724..bc8bb45b 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml
@@ -1,7 +1,7 @@
-
+
-
+
@@ -150,5 +150,8 @@
+
+
+
\ No newline at end of file
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 4aeb3793..a14067c9 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
@@ -2,7 +2,7 @@
-
+
@@ -35,19 +35,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -168,7 +168,7 @@
-
+
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 76624819..d0e42b55 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
@@ -172,7 +172,7 @@
-
+
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
index 476e3e6941897d0e279892e731d396fcb0b55e2e..dba3ba3d112992ba88fb75ba60a33ca59e409d0b 100644
GIT binary patch
delta 13075
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
K?q_IV)c*mWnl#k_
delta 13419
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
delta 18533
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
delta 1134
zcmYjQU2Icj82+Aqg}ELD6xa`KDecWi&Sw*ilOyC2BO)u^K@m`8oJnruKLCxZpK22TDFG~lujH`ek{b3uBrjt`m*
zc+0h=4^7-d6qMU9s5VM$_=&HC^Os}V&dMF{gp>s5pMcnML2MIn3Wssz^JttF0
zbF@8=_0tDXIF2(J@eS?r}Z-XQnk4Gwo@<(t^gTU~h^sOrkM@HS)J1svo=_fZ(u
z{yP}v8ohu+Jgg66#MBwZyZlGb;4oA1oP1AR{d7E!qt=;Yc)!?FkRRYf4)hrK$O1mb
zan38`gu1(Q!oZk0&{G(%Oio@l2b!?+_kQio46=*4a^9D5)w`+cvczOa+Gs;sT1CN(EGrBCo4_Ugcj^zNqrjbU>a{Ih<}*
nakm*yn(-Sm{%FR((*b-j=UP8lKR341XOn;4n3?-Jzf%4O3AHcn
diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Info_MJ_JinXi_fui.bytes
index 540a066d005380aad5a15553003c935f5ca295a3..8557a2211e8d510c1a654ec988a902e854a0b021 100644
GIT binary patch
delta 2523
zcmZ`*3v^V~6+I_+l1XL~W&~FJxiY>dboY&O2w{
zefBx$-FxTDUjC|=_nnW6p=)q4E@G{tdLsIrTz$C2ZnT?&+<+sdjKphcJP~gZ&ufGu
zF=^PEkcIPRmzqEmF=&qRBpo)HrVy#ezYaST?^07~8ZN{~dAbg}jv9$#U%VPtt(s^C
z4ktu;CX#I#iL)po?xPYk$q2aE;^t;_TUt~LU5|5?R-UbKnOkX&rVOFPN_1OYs*UF2
zDQlG5HLsdS9S9`0nQx%^5;25ltwFq;Si?7>$B|)QKno>^bYhOb#bSJGPidib*KPQ~FIkDFsP>Rq%O8yxlg4IFf|s6F%$Y^kmM
zuwD_+UTjHiQ{SXVa4t2-hylGFzu-hn^2DE17!E2QnY|3kVz*QMSQqSLw4_4K0~y+IuIT5NwCnKCpeVKAy7
zs!{Pjv8=#rJ1R=PqV=7)fMZq0cHNW{#2ItFY7K5>g8*ydz*qpJO==?5kI1j>iOFgcD@V
zr<+8T6}`SD9g@gN;4$@T6x%RiOoZ(QB$-E}cZ>l^k>$um^~#~K6h%1IfTYQK>@8|C
zOKzOb8Q|hjypat%u_LI<Y(x>6uQ?3BM*~V0a5FH;=qjeBDSJ8o3FR
z%fdVZ>&grbGkKOw+>NC2QjXw*GDAZ%w;-WB%-5r?+^=SHE28B_hv#q`4wd_P?nrgo
z>F>x0hj|{F!hY4kH(-4@!1M7;I6wPFYWdo7oJ1{3TaLVd7vhs}vs%PAp|&EzH>26*
zu%8#tExcF+osu@R8>t+t$WyoS5`11UPc7x!Fm-H1E#oMj7<(nk^8XiQ1+PS0WwW|n
z4#jzu5neSCWi_vnCO!DX8WVLf#CwK9El87`TDpx77ELZK5LA;edrX<66
zUM#Iw`?~plcxs&L0e(;$tGDs?E7-$=ojrn0Gw}|+h&#nBOJ4e}N3c*Kck>SHt|<_b
z9XKH4Rv9nIxJ|~m+5*)nV^Bt+z?@p2+&9Tnzl=}oPyPD+AGHO%t1o-plo*p*Id&`-
e)qSKs?drwk`uqgzz`oAUdJdF@`c~J+IsXf!Y28x*
delta 2551
zcmZ`)3s{rq6+S0lAVR;$ZZa*MUG1v1owIIg>ujsD-nxyhm$^OLo@eW}0z3a7WOmQ9KhO7n`OkU3
z_q^wv|NFnsI{DL1K71|S(ASF_@e%V#8bw4`Wpv>dyU}b4a2O|z_M}?6i-_CA^9tdl
zAp_eIvT)7hQln`MdQ4FstHZ|8cp~++&%=%na;XV45!VMrd6EvBOjC&Bp1%`Tt)@~P
zP9#Km8d5Cwr0Fz6+^d-&IbO9i@)vaP3R;Pw)*9<7GSF&zn8+YJ{4wEz#eoA>
zzgk0U@wzp_U(^(;b<~Qol!#hS8?Ys%k-wxDbR%t&MQyUUJXWo@)3Q*S>QbAj4bxJi
z+^)m6(AHRc?t~3abE$2#9f7ncKcd4Pr5&;MXs}$H6PME})K2Pv#TMaRy6WAu2ODf*
z-iu?l2K8my2TOV*@7F8x7y)hRP3i!B1y|Ce{J3uYDm{UP8BOwXJc*YxqWqNJ=C9K?
zq~OwK!;P5mwhSW{WoGd=(Vp3$zC};t-ONTlsO$PReWyRmKgPg8rx8o+73#b6Jsh;J
z=4bRs&(il1bTp|S&~xZ;MEQrh;vdl=q&UOeiHNho{9`&Saa*JswYZ+?##v{8k7%pS
z&r_EKX&29A+|15`GdmNJESGwLeu5QQQ9i1pUZkH&w=dm+s!%V{G1O;A`DH!c&*&9g
z&JOc&WV)uCPDpoOrIT3dnjQC=(
zeZ8WPc(0;2=!`5lol}?eODPmt=vQQ=vv9i|CJl9-&ZE{n2_xM_IOO*7TX@GEFbiMh
zs#$%+q>z%EVG^zjM8AeFw>a)1y)A^zx&K3WB-f?hp*L|McM`t~rzgOtG1-&Pm$1xZ
zSC?hCT*xg!kH>_UJelSz^qz1g%P?Y}rx=gBGT_WhkGo3OguEiJu0qrrZ>yygx=yKd
zL*SA^i-{$LQ8b#y%JWoeG4}OJCO7GQypR`4_$|xsWBI}3bs6b*^n0Y_Z&cm%0ruxN
z+x{SAA8JH)#WaY_ltCZiX?CC|-)hh9w>jw(=?+=?ddMmx1)hQeb8f#ghi+kcfrtNu
zeFZN5Gdc^haHt?){x9KQbwVzjht|S$%WER;AM~jfQ!bW#9oSbAm&kNV5~L*hCr%Z5
zEpG_yU-WN*Y>{E^hb0*3Gq{VqCe7VLy_i;1VxT^>7J1ELk~}3_!%FP-xP&y34Y(*^
zB_1QkfxTfB&nArVMtG2X0y2%9z=`Pe*69#4CxM5ARWc98m?06i#2{8qLFbSdBvp1N
z7l&1v#!?(%TMUve+q1K{&Lp{U24{jxf`ek&upPSsx?Fa!6N^hioQ0=KVwP-n;fz>v
z(9>^mb1rGNk2ZoWpI>^;-F^Hd53bjlyDtfrNcR-i`Q5xco_at8sbV6
z2D~;c&nkLCc%|I*n07mfgF#0s<;dSYZKw37U#;uaS~Hw$#J2_QWo0}9w
z`$f>3(uU?(DyJ&))FOTWA6Lv#i}^uJ92QXz
z@e({a>~@ss|BJGemm$8gUM-h1a!zH0R}4g1$*Uwvw~Ve>l