hengyang
/
hengyang_client
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

胡牌的哪个牌倒牌、结算按钮

master
1076390229 2025-07-29 01:17:29 +08:00
parent 0223cb5064
commit 7bcb004ebb
17 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lua_probject/base_project/Game/Controller/GroupMgrController.lua
View File

@ -260,7 +260,9 @@ function M:OnEvtUpdateRoom(evt_data)
for _, room in pairs(cmds) do for _, room in pairs(cmds) do
for _, palyingUser in pairs(room.plist or {}) do for _, palyingUser in pairs(room.plist or {}) do
local _player = group.memberMap[palyingUser.aid] local _player = group.memberMap[palyingUser.aid]
_player.playing = "startPlaying" if _player then
_player.playing = "startPlaying"
end
end end
end end
@ -545,7 +547,10 @@ function M:OnMemberOnline(evt_data)
for _, uid in pairs(evt_data.onlineUserId) do for _, uid in pairs(evt_data.onlineUserId) do
local player = group.memberMap[uid] local player = group.memberMap[uid]
player.online = 1
if player then
player.online = 1
end
end end
DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data) DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data)

3
lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua
View File

@ -184,6 +184,9 @@ function FamilyChatRoom:Show()
local getData = self.group.records == nil local getData = self.group.records == nil
mgr_ctr:FG_ENTER_CHATROOM(self.root._group.id, getData, function(res) mgr_ctr:FG_ENTER_CHATROOM(self.root._group.id, getData, function(res)
if res.returnCode == 0 then
ViewUtil.ShowModalWait(self._root_view, "正在加载聊天室......")
end
end) end)
local cChatRoom = self.root._view:GetController("cIsChatRoom") local cChatRoom = self.root._view:GetController("cIsChatRoom")

1
lua_probject/base_project/Game/View/Family/FamilyEventView.lua
View File

@ -218,6 +218,7 @@ function M:_evtChatRoomData(...)
return return
end end
view.com_FamilyChatRoom:Refalsh() view.com_FamilyChatRoom:Refalsh()
ViewUtil.CloseModalWait()
end end
function M:_evtOnNewRecord(...) function M:_evtOnNewRecord(...)

2
lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua
View File

@ -313,8 +313,8 @@ function M:EventInit()
local info = self._player_card_info[index] local info = self._player_card_info[index]
self:RemoveCursor() self:RemoveCursor()
--info:UpdateHandCard(false, false) --info:UpdateHandCard(false, false)
info:ShowHuCard(win_card) info:ShowHuCard(win_card)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
obj_win_card:GetController("bg").selectedIndex = 1 obj_win_card:GetController("bg").selectedIndex = 1

2
lua_probject/extend_project/extend/majiang/jinxi/EXClearingView.lua
View File

@ -49,7 +49,7 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
if result then if result then
result.cardList = json.decode(result.cardList) result.cardList = json.decode(result.cardList)
table.sort(result.cardList) --table.sort(result.cardList)
end end
self.list_lastCard = self._view:GetChild('list_lastCard') self.list_lastCard = self._view:GetChild('list_lastCard')

3
lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua
View File

@ -309,7 +309,8 @@ function M:EventInit()
local index = self:GetPos(win_seat) local index = self:GetPos(win_seat)
local info = self._player_card_info[index] local info = self._player_card_info[index]
self:RemoveCursor() self:RemoveCursor()
info:UpdateHandCard(true, false) --info:UpdateHandCard(true, false)
info:ShowHuCard(win_card)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card

2
lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
View File

@ -49,7 +49,7 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
if result then if result then
result.cardList = json.decode(result.cardList) result.cardList = json.decode(result.cardList)
table.sort(result.cardList) --table.sort(result.cardList)
end end
self.list_lastCard = self._view:GetChild('list_lastCard') self.list_lastCard = self._view:GetChild('list_lastCard')

3
lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
View File

@ -310,7 +310,8 @@ function M:EventInit()
local index = self:GetPos(win_seat) local index = self:GetPos(win_seat)
local info = self._player_card_info[index] local info = self._player_card_info[index]
self:RemoveCursor() self:RemoveCursor()
info:UpdateHandCard(false, false) --info:UpdateHandCard(false, false)
info:ShowHuCard(win_card)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card

2
lua_probject/extend_project/extend/majiang/nancheng/EXClearingView.lua
View File

@ -49,7 +49,7 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
if result then if result then
result.cardList = json.decode(result.cardList) result.cardList = json.decode(result.cardList)
table.sort(result.cardList) --table.sort(result.cardList)
end end
self.list_lastCard = self._view:GetChild('list_lastCard') self.list_lastCard = self._view:GetChild('list_lastCard')

3
lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua
View File

@ -311,7 +311,8 @@ function M:EventInit()
local index = self:GetPos(win_seat) local index = self:GetPos(win_seat)
local info = self._player_card_info[index] local info = self._player_card_info[index]
self:RemoveCursor() self:RemoveCursor()
info:UpdateHandCard(false, false) --info:UpdateHandCard(false, false)
info:ShowHuCard(win_card)
local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi") local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card

2
wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_nextRound.xml
View File

@ -2,7 +2,7 @@
<component size="404,112" extention="Button"> <component size="404,112" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/> <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList> <displayList>
<image id="n3_qt01" name="n3" src="qt01yq" fileName="Main_new_2/StartAndReady/Image/Group 193.png" xy="-4,-6"/> <image id="n3_qt01" name="n3" src="l4fo1bp" fileName="Main_new/Main/Image/btn_continu_game.png" xy="0,0" size="404,112"/>
</displayList> </displayList>
<Button/> <Button/>
</component> </component>

2
wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_showClearMain.xml
View File

@ -2,7 +2,7 @@
<component size="404,112" extention="Button"> <component size="404,112" extention="Button">
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/> <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
<displayList> <displayList>
<image id="n3_qt01" name="n3" src="qt01yr" fileName="Main_new_2/StartAndReady/Image/Group 239.png" xy="0,0"/> <image id="n3_qt01" name="n3" src="l4fo1bo" fileName="Main_new/Main/Image/btn_show_result.png" xy="0,0" size="404,112"/>
</displayList> </displayList>
<Button/> <Button/>
</component> </component>

2
wb_new_ui/assets/Main_Majiang/package.xml
View File

@ -1458,6 +1458,8 @@
<image id="fj6f1bl" name="离线.png" path="/images/"/> <image id="fj6f1bl" name="离线.png" path="/images/"/>
<image id="fj6f1bm" name="xzmj_result_35 1.png" path="/images/"/> <image id="fj6f1bm" name="xzmj_result_35 1.png" path="/images/"/>
<image id="fj6f1bn" name="微信图片_20250726215551_78.png" path="/images/"/> <image id="fj6f1bn" name="微信图片_20250726215551_78.png" path="/images/"/>
<image id="l4fo1bo" name="btn_show_result.png" path="/Main_new/Main/Image/"/>
<image id="l4fo1bp" name="btn_continu_game.png" path="/Main_new/Main/Image/"/>
</resources> </resources>
<publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/> <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
</packageDescription> </packageDescription>

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 MiB

After

Width:  |  Height:  |  Size: 2.4 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 MiB

After

Width:  |  Height:  |  Size: 4.4 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 MiB

After

Width:  |  Height:  |  Size: 3.5 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
View File

Binary file not shown.