diff --git a/lua_probject/base_project/Game/Controller/GameController.lua b/lua_probject/base_project/Game/Controller/GameController.lua
index c26b2774..1c122a95 100644
--- a/lua_probject/base_project/Game/Controller/GameController.lua
+++ b/lua_probject/base_project/Game/Controller/GameController.lua
@@ -282,7 +282,7 @@ end
-- 玩家进
function M:OnEventPlayerEnter(evt_data)
- ---- print("进入房间++++++++++++++++++++++++++++++++++++++")
+ print("进入房间++++++++++++++++++++++++++++++++++++++")
self._cacheEvent:Enqueue(
function()
local p = self._room:NewPlayer()
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
index b9dcd627..aaf6e18b 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
@@ -31,12 +31,13 @@ end
-- end
-- end
-function M:InitData(over, room, result, total_result, callback)
+function M:InitData(over, room, result, total_result, callback, isWitness, witnessCallbak)
-- print("===============================InitData===========================", over, room, result, total_result)
-- pt(room)
-- pt(result)
-- Pt(total_result)
self._callback = callback
+ self._witnessCallbak = witnessCallbak
local showClearMainBtn = self._view:GetChild("btn_showClearMain")
local nextRoundBtn = self._view:GetChild("btn_nextRound")
local nextRoundBtn2 = self._view:GetChild("Btn_NextRound2")
@@ -55,9 +56,16 @@ function M:InitData(over, room, result, total_result, callback)
end)
nextRoundBtn.onClick:Set(function()
- local _gamectr = ControllerManager.GetController(GameController)
- _gamectr:PlayerReady()
- self:DestroyWithCallback()
+ if isWitness and isWitness == 1 then
+ if self._witnessCallbak then
+ self._witnessCallbak()
+ end
+ self:DestroyWithCallback()
+ else
+ local _gamectr = ControllerManager.GetController(GameController)
+ _gamectr:PlayerReady()
+ self:DestroyWithCallback()
+ end
end)
@@ -71,9 +79,16 @@ function M:InitData(over, room, result, total_result, callback)
_overCtr.selectedIndex = 0
self:fillResult0(room, peopleNum, result)
nextRoundBtn2.onClick:Set(function()
- local _gamectr = ControllerManager.GetController(GameController)
- _gamectr:PlayerReady()
- self:DestroyWithCallback()
+ if isWitness and isWitness == 1 then
+ if self._witnessCallbak then
+ self._witnessCallbak()
+ end
+ self:DestroyWithCallback()
+ else
+ local _gamectr = ControllerManager.GetController(GameController)
+ _gamectr:PlayerReady()
+ self:DestroyWithCallback()
+ end
end)
elseif over == 1 then
showBtnTypeCtr.selectedIndex = 1
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
index 6590e90e..a1a4705d 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
@@ -476,28 +476,30 @@ function M:EventInit()
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].hp_info.cur_hp
- end
- -- info:UpdateScore()
- info._view:GetChild("zhanji").visible = true
- local num = data[i].hp_info.total_hp
- if num >= 0 then
- info._view:GetController("text_color").selectedIndex = 0
- info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
- else
- info._view:GetController("text_color").selectedIndex = 1
- info._view:GetChild("text_jifen").text = d2ad(num)
- end
+ 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_hp
+ if num >= 0 then
+ info._view:GetController("text_color").selectedIndex = 0
+ info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
+ else
+ info._view:GetController("text_color").selectedIndex = 1
+ info._view:GetChild("text_jifen").text = d2ad(num)
+ end
- info._view:GetChild("mask_piao").title = ""
- info._view:GetController("piao_niao").selectedIndex = 0
- p.fz_list = {}
+ info._view:GetChild("mask_piao").title = ""
+ info._view:GetController("piao_niao").selectedIndex = 0
+ p.fz_list = {}
+ end
end
DataManager.CurrenRoom.self_player.card_list = {}
self._state.selectedIndex = 2
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
index 5063f4ae..a49e491b 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
@@ -256,33 +256,35 @@ function M:EventInit()
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].hp_info.cur_hp
- end
- -- info:UpdateScore()
- info._view:GetChild("zhanji").visible = true
- local num = data[i].hp_info.total_hp
- if num >= 0 then
- info._view:GetController("text_color").selectedIndex = 0
- info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
- else
- info._view:GetController("text_color").selectedIndex = 1
- info._view:GetChild("text_jifen").text = d2ad(num)
- end
+ 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_hp
+ if num >= 0 then
+ info._view:GetController("text_color").selectedIndex = 0
+ info._view:GetChild("text_jifen").text = "+" .. d2ad(num)
+ else
+ info._view:GetController("text_color").selectedIndex = 1
+ info._view:GetChild("text_jifen").text = d2ad(num)
+ end
- info._view:GetChild("mask_piao").title = ""
- info._view:GetController("piao_niao").selectedIndex = 0
- p.fz_list = {}
+ info._view:GetChild("mask_piao").title = ""
+ info._view:GetController("piao_niao").selectedIndex = 0
+ p.fz_list = {}
+ end
end
DataManager.CurrenRoom.self_player.card_list = {}
- self._state.selectedIndex = 2
+ self._ctr_state.selectedIndex = 2
self._clearingView = nil
- end)
+ end, 1)
end
print("lingmeng witness ZPResult3")
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 1fd270d4..66414eae 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
@@ -229,5 +229,9 @@
+
+
+
+
\ No newline at end of file
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 3f99440a..8799d043 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