diff --git a/lua_probject/base_project/Game/View/ViewUtil.lua b/lua_probject/base_project/Game/View/ViewUtil.lua
index b1d50826..bcf2aa49 100644
--- a/lua_probject/base_project/Game/View/ViewUtil.lua
+++ b/lua_probject/base_project/Game/View/ViewUtil.lua
@@ -199,7 +199,7 @@ function get_majiang_prefix(game_id)
end
ct = ct_data[tostring(game_id)] or 0
end
- local prefix = ct == 0 and "" or "a"
+ local prefix = ct == 0 and "" or "b"
--printlog("get_majiang_prefix===>>>",prefix,ct)
return prefix
end
diff --git a/lua_probject/base_project/Game/View/playerDetailView.lua b/lua_probject/base_project/Game/View/playerDetailView.lua
index 62126f73..8f6295af 100644
--- a/lua_probject/base_project/Game/View/playerDetailView.lua
+++ b/lua_probject/base_project/Game/View/playerDetailView.lua
@@ -32,7 +32,6 @@ function playerDetailView:Show(player)
end
function playerDetailView:Init()
- local selfUser = DataManager.SelfUser
self.tex_name = self._view:GetChild("tex_name")
self.tex_ip = self._view:GetChild("tex_ip")
self.tex_id = self._view:GetChild("tex_id")
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua
index 7b1ba9e8..3e71f92a 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/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")
@@ -46,6 +47,17 @@ function M:InitData(over, room, result, total_result, callback)
local playerNum = self._view:GetController("playerNum")
local showBtnTypeCtr = self._view:GetController("showType")
+ if result then
+ result.cardList = json.decode(result.cardList)
+ table.sort(result.cardList)
+ end
+ self.list_lastCard = self._view:GetChild('list_lastCard')
+
+ self.list_lastCard:SetVirtual()
+ self.list_lastCard.itemRenderer = function(index, obj)
+ self:RemindCardRender(result.cardList[index + 1], obj)
+ end
+
local peopleNum = room.room_config.people_num
playerNum.selectedIndex = peopleNum - 2
@@ -55,9 +67,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 +90,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
@@ -103,6 +129,8 @@ function M:fillResult0(room, peopleNum, result)
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
room.room_config.round, gamePlay)
+ self.list_lastCard.numItems = #result.cardList
+ self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList)
for i = 1, peopleNum do
local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i))
@@ -191,7 +219,7 @@ function M:fillResult0(room, peopleNum, result)
end
end
handCardList.numItems = handInfoNum
- allCardsList.width = 172 * fzInfoNum + 60 + (handInfoNum - 1) * 56 + 36 * (fzInfoNum)
+ allCardsList.width = 234 * fzInfoNum + 78 + (handInfoNum - 1) * 74 + 36 * (fzInfoNum)
if infoList.seat == room.self_player.seat then
isMeCtr.selectedIndex = 1
@@ -244,7 +272,9 @@ end
function M:fillResult1(room, peopleNum, total_result)
local gameNameAndRoomIDText = self._view:GetChild("Text_GameNameAndRoomID")
local familyIDText = self._view:GetChild("Text_FamilyID")
- for i, v in pairs(room.self_player.self_user.games) do
+ print("lingmeng fillResult1")
+ pt(room)
+ for i, v in pairs(DataManager.SelfUser.games) do
if v.game_id == room.game_id then
gameNameAndRoomIDText.text = string.format("%s 房号:%s", v.name, room.room_id)
end
@@ -288,6 +318,15 @@ function M:fillHead(url, view)
ImageLoad.Load(url, view:GetChild("Btn_Head")._iconObject)
end
+function M:RemindCardRender(data, obj)
+ local room = DataManager.CurrenRoom
+ obj.icon = string.format("ui://Main_Majiang/b202_%d", data)
+ print("lingmeng icon", obj.icon)
+ if room.jing == data then
+ obj:GetController('jing').selectedIndex = 1
+ end
+end
+
function M.HandCardSortAndJing(a, b)
local jing = DataManager.CurrenRoom.jing
if a == jing or b == jing then
diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua
index 551791a5..13725234 100644
--- a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua
+++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua
@@ -332,6 +332,9 @@ function M:OneventResult1(evt_data)
--0:小结算 1:小大结算 2:大结算
self._room._reload_flag = false
self._room.playing = false
+ if evt_data.result then
+ evt_data.result.cardList = evt_data.cardList
+ end
if 0 == over then
local result = evt_data.result
self._cacheEvent:Enqueue(function()
diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua
index 1dc1b601..9b592eb4 100644
--- a/lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/jinxi/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")
@@ -46,6 +47,17 @@ function M:InitData(over, room, result, total_result, callback)
local playerNum = self._view:GetController("playerNum")
local showBtnTypeCtr = self._view:GetController("showType")
+ if result then
+ result.cardList = json.decode(result.cardList)
+ table.sort(result.cardList)
+ end
+ self.list_lastCard = self._view:GetChild('list_lastCard')
+
+ self.list_lastCard:SetVirtual()
+ self.list_lastCard.itemRenderer = function(index, obj)
+ self:RemindCardRender(result.cardList[index + 1], obj)
+ end
+
local peopleNum = room.room_config.people_num
playerNum.selectedIndex = peopleNum - 2
@@ -55,9 +67,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 +90,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
@@ -103,6 +129,8 @@ function M:fillResult0(room, peopleNum, result)
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
room.room_config.round, gamePlay)
+ self.list_lastCard.numItems = #result.cardList
+ self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList)
for i = 1, peopleNum do
local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i))
@@ -186,12 +214,13 @@ function M:fillResult0(room, peopleNum, result)
handCardList:SetVirtual()
handCardList.itemRenderer = function(index, obj)
obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), infoList.hand_card[index + 1])
+ print("obj.icon")
if room.jing == infoList.hand_card[index + 1] then
obj:GetController('jing').selectedIndex = 1
end
end
handCardList.numItems = handInfoNum
- allCardsList.width = 172 * fzInfoNum + 60 + (handInfoNum - 1) * 56 + 36 * (fzInfoNum)
+ allCardsList.width = 234 * fzInfoNum + 78 + (handInfoNum - 1) * 74 + 36 * (fzInfoNum)
if infoList.seat == room.self_player.seat then
isMeCtr.selectedIndex = 1
@@ -240,7 +269,9 @@ end
function M:fillResult1(room, peopleNum, total_result)
local gameNameAndRoomIDText = self._view:GetChild("Text_GameNameAndRoomID")
local familyIDText = self._view:GetChild("Text_FamilyID")
- for i, v in pairs(room.self_player.self_user.games) do
+ print("lingmeng fillResult1")
+ pt(room)
+ for i, v in pairs(DataManager.SelfUser.games) do
if v.game_id == room.game_id then
gameNameAndRoomIDText.text = string.format("%s 房号:%s", v.name, room.room_id)
end
@@ -284,6 +315,14 @@ function M:fillHead(url, view)
ImageLoad.Load(url, view:GetChild("Btn_Head")._iconObject)
end
+function M:RemindCardRender(data, obj)
+ local room = DataManager.CurrenRoom
+ obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data)
+ if room.jing == data then
+ obj:GetController('jing').selectedIndex = 1
+ end
+end
+
function M.HandCardSortAndJing(a, b)
local jing = DataManager.CurrenRoom.jing
if a == jing or b == jing then
diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua
index 1fd228f1..c49be0c7 100644
--- a/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua
+++ b/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua
@@ -332,6 +332,9 @@ function M:OneventResult1(evt_data)
--0:小结算 1:小大结算 2:大结算
self._room._reload_flag = false
self._room.playing = false
+ if evt_data.result then
+ evt_data.result.cardList = evt_data.cardList
+ end
if 0 == over then
local result = evt_data.result
self._cacheEvent:Enqueue(function()
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
index 0b43c9a7..ded6138b 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
@@ -47,6 +47,17 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
local playerNum = self._view:GetController("playerNum")
local showBtnTypeCtr = self._view:GetController("showType")
+ if result then
+ result.cardList = json.decode(result.cardList)
+ table.sort(result.cardList)
+ end
+ self.list_lastCard = self._view:GetChild('list_lastCard')
+
+ self.list_lastCard:SetVirtual()
+ self.list_lastCard.itemRenderer = function(index, obj)
+ self:RemindCardRender(result.cardList[index + 1], obj)
+ end
+
local peopleNum = room.room_config.people_num
playerNum.selectedIndex = peopleNum - 2
@@ -116,6 +127,8 @@ function M:fillResult0(room, peopleNum, result)
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
room.room_config.round, gamePlay)
+ self.list_lastCard.numItems = #result.cardList
+ self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList)
for i = 1, peopleNum do
local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i))
@@ -302,6 +315,14 @@ function M:fillHead(url, view)
ImageLoad.Load(url, view:GetChild("Btn_Head")._iconObject)
end
+function M:RemindCardRender(data, obj)
+ local room = DataManager.CurrenRoom
+ obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data)
+ if room.jing == data then
+ obj:GetController('jing').selectedIndex = 1
+ end
+end
+
function M.HandCardSortAndJing(a, b)
local jing = DataManager.CurrenRoom.jing
if a == jing or b == jing then
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua
index 985c8c40..32a47f1b 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua
@@ -328,11 +328,14 @@ end
function M:OneventResult1(evt_data)
local over = evt_data.type
- print("OneventResult1")
+ printlog("OneventResult1")
pt(evt_data)
--0:小结算 1:小大结算 2:大结算
self._room._reload_flag = false
self._room.playing = false
+ if evt_data.result then
+ evt_data.result.cardList = evt_data.cardList
+ end
if 0 == over then
local result = evt_data.result
self._cacheEvent:Enqueue(function()
diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua
index 0349b8a3..51d3a874 100644
--- a/lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/nancheng/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")
@@ -46,6 +47,17 @@ function M:InitData(over, room, result, total_result, callback)
local playerNum = self._view:GetController("playerNum")
local showBtnTypeCtr = self._view:GetController("showType")
+ if result then
+ result.cardList = json.decode(result.cardList)
+ table.sort(result.cardList)
+ end
+ self.list_lastCard = self._view:GetChild('list_lastCard')
+
+ self.list_lastCard:SetVirtual()
+ self.list_lastCard.itemRenderer = function(index, obj)
+ self:RemindCardRender(result.cardList[index + 1], obj)
+ end
+
local peopleNum = room.room_config.people_num
playerNum.selectedIndex = peopleNum - 2
@@ -55,9 +67,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)
endRound.onClick:Set(function()
@@ -69,9 +88,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
@@ -101,6 +127,8 @@ function M:fillResult0(room, peopleNum, result)
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
room.room_config.round, gamePlay)
+ self.list_lastCard.numItems = #result.cardList
+ self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList)
for i = 1, peopleNum do
local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i))
@@ -184,14 +212,13 @@ function M:fillResult0(room, peopleNum, result)
table.sort(infoList.hand_card, self.HandCardSortAndJing)
handCardList:SetVirtual()
handCardList.itemRenderer = function(index, obj)
- obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(),
- infoList.hand_card[index + 1])
+ 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
end
end
handCardList.numItems = handInfoNum
- allCardsList.width = 172 * fzInfoNum + 60 + (handInfoNum - 1) * 56 + 36 * (fzInfoNum)
+ allCardsList.width = 234 * fzInfoNum + 78 + (handInfoNum - 1) * 74 + 36 * (fzInfoNum)
if infoList.seat == room.self_player.seat then
isMeCtr.selectedIndex = 1
@@ -240,7 +267,9 @@ end
function M:fillResult1(room, peopleNum, total_result)
local gameNameAndRoomIDText = self._view:GetChild("Text_GameNameAndRoomID")
local familyIDText = self._view:GetChild("Text_FamilyID")
- for i, v in pairs(room.self_player.self_user.games) do
+ print("lingmeng fillResult1")
+ pt(room)
+ for i, v in pairs(DataManager.SelfUser.games) do
if v.game_id == room.game_id then
gameNameAndRoomIDText.text = string.format("%s 房号:%s", v.name, room.room_id)
end
@@ -284,6 +313,14 @@ function M:fillHead(url, view)
ImageLoad.Load(url, view:GetChild("Btn_Head")._iconObject)
end
+function M:RemindCardRender(data, obj)
+ local room = DataManager.CurrenRoom
+ obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data)
+ if room.jing == data then
+ obj:GetController('jing').selectedIndex = 1
+ end
+end
+
function M.HandCardSortAndJing(a, b)
local jing = DataManager.CurrenRoom.jing
if a == jing or b == jing then
diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua
index d885a18a..36c3b4e3 100644
--- a/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua
+++ b/lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua
@@ -332,6 +332,9 @@ function M:OneventResult1(evt_data)
--0:小结算 1:小大结算 2:大结算
self._room._reload_flag = false
self._room.playing = false
+ if evt_data.result then
+ evt_data.result.cardList = evt_data.cardList
+ end
if 0 == over then
local result = evt_data.result
self._cacheEvent:Enqueue(function()
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/btn_gameDismissRoom.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/btn_gameDismissRoom.xml
new file mode 100644
index 00000000..be816b97
--- /dev/null
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/btn_gameDismissRoom.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/dismiss_room.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/dismiss_room.png
new file mode 100644
index 00000000..ad301973
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/dismiss_room.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/exit_room.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/exit_room.png
new file mode 100644
index 00000000..a9a096bb
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/exit_room.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml
index 101a5f3f..25747afb 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml
@@ -1,6 +1,6 @@
-
+
@@ -122,11 +122,11 @@
-
+
-
+
@@ -136,7 +136,7 @@
-
+
@@ -151,6 +151,7 @@
+
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
index 3c42e734..8522318c 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
@@ -506,6 +506,9 @@
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_Card_Hu.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_Card_Hu.xml
index 3fa48be2..805169b6 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_Card_Hu.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_Card_Hu.xml
@@ -10,7 +10,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_RemindCard.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_RemindCard.xml
new file mode 100644
index 00000000..6a2799db
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_RemindCard.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_3.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_3.xml
index 7112a469..422efa02 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_3.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_3.xml
@@ -1,8 +1,8 @@
-
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_4.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_4.xml
index f5c5bb12..39c34dd1 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_4.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_4.xml
@@ -1,9 +1,9 @@
-
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_HandCard.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_HandCard.xml
index 525ae414..52fb2aea 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_HandCard.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_HandCard.xml
@@ -1,7 +1,7 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_PlayInfo.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_PlayInfo.xml
index b5e000cd..8eec271a 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_PlayInfo.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_PlayInfo.xml
@@ -17,14 +17,14 @@
-
+
-
+
-
+
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 06f2a73b..8e4bcc60 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
@@ -2,7 +2,7 @@
-
+
@@ -19,36 +19,36 @@
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -82,9 +82,9 @@
-
-
-
+
+
+
@@ -109,15 +109,15 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml
index 32187d50..c0170bc2 100644
--- a/wb_new_ui/assets/Main_Majiang/package.xml
+++ b/wb_new_ui/assets/Main_Majiang/package.xml
@@ -1454,6 +1454,7 @@
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta
index e05b9456..cc10da7c 100644
--- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta
+++ b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 1ecfbe703e98add438a492e9c66f3071
+guid: 7aef48e6dc5a8c6498eb76cd41e5f0e9
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/common/af187115a4824290240734622129b80b
+ assetBundleName:
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_qmc17jbz.png.meta b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_qmc17jbz.png.meta
index 62cf08f2..d4f5c7f5 100644
--- a/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_qmc17jbz.png.meta
+++ b/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_qmc17jbz.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: f099c2603d49045418fa148ddf4eab4f
+guid: d7e6544ba54171b43948e06b99591294
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/common/af187115a4824290240734622129b80b
+ assetBundleName:
assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
index d962dce5..29aa8b03 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png
index dd70ff0a..de4ea809 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png
index 6677e9c5..1ec7dce4 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png
index 8db5d44e..ae2cc02d 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png
index 8a20e592..a497bb6e 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png
index 5d8a7fa6..64e3fede 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png
index 05880ed7..ee4fe821 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png
index 7f31886f..c4d8b1f9 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.png
index b79071a1..fbc43d87 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_8.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_8.png
index d95fe328..b79071a1 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_8.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_8.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_9.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_9.png
deleted file mode 100644
index f388f08c..00000000
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_9.png and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_9.png.meta b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_9.png.meta
deleted file mode 100644
index 41bdb23a..00000000
--- a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_9.png.meta
+++ /dev/null
@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: dadc097a17cc2c1419d22885331a6b76
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- sRGBTexture: 1
- linearTexture: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapsPreserveCoverage: 0
- alphaTestReferenceValue: 0.5
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- streamingMipmaps: 0
- streamingMipmapsPriority: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -100
- wrapU: -1
- wrapV: -1
- wrapW: -1
- nPOTScale: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
- assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes
index 09cf3252..ac334455 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas10.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas10.png.meta
index 043c2575..9b5a193a 100644
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas10.png.meta
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas10.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 790f50fd61a717d4cb8a4ef4de556436
+guid: cb443755a2795ce49878e416e2c55b41
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
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 92916a2b..b161acab 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
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png
index 58c52115..c9024dd0 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png
index 9124ff99..88d7138d 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
index 2781ce8f..ee4aca9a 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes differ