diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua.rej b/lua_probject/base_project/Game/Controller/NewGroupController.lua.rej deleted file mode 100644 index 05b7c8c8..00000000 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua (rejected hunks) -@@ -147,6 +147,8 @@ - data.ban_chat2 = ban_chat2 - data.option = option - data.show_num = showNum -+ print("FG_UpdateGroupInfo") -+ pt(data) - _client:send(Protocol.WEB_FG_UPDATE_GROUP_INFO, data, function(res) - callback(res) - end) diff --git a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua index f01e04fd..9af59ee2 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua @@ -88,7 +88,7 @@ function FamilyAuditNumber:ClickBtn(isAllow, uid, tag) for _, joinInfo in pairs(group.joinsData) do if joinInfo.id == uid then - group.joinsData[_] = nil + table.remove(group.joinsData, _) end end diff --git a/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua b/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua index 93dfc4fb..fb6bc709 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua @@ -24,6 +24,7 @@ local function list_players_Renderer(index, obj, players, self) tex_name.text = player.nick tex_id.text = player.accId tex_score.text = player.score + obj:GetController('cCouler').selectedIndex = player.score >= 0 and 0 or 1 ImageLoad.Load(player.portrait, loader_icon) if player.winer then @@ -47,8 +48,8 @@ local function ChatItemRenderer(index, obj, self) local tex_name = obj:GetChild("tex_name") local tex_roomIdRound = obj:GetChild("tex_roomIdRound") - tex_time.text = os.date("游戏结算:%m月%d号 %X", record.create_time) --data.create_time - tex_name.text = play.game_name --record.game_info.name + tex_time.text = os.date("游戏结算:%m月%d号 %X", record.create_time) --data.create_time + tex_name.text = play.game_name --record.game_info.name local roundTex = record.round .. "/" .. record.maxRound tex_roomIdRound.text = record.room_id .. "\n" .. roundTex @@ -126,7 +127,6 @@ end -- 新战绩推到时刷新一条 function FamilyChatRoom:OnNewChatRefalsh(arg) - if self.group == nil then return end diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua index da6481f8..744a152b 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua @@ -330,7 +330,7 @@ function M:_evtOnFamilyReflash(...) for _, data in pairs(group.joinsData) do if data.id == uid then - group.joinsData[_] = nil + table.remove(group.joinsData, _) end end diff --git a/lua_probject/base_project/Game/View/WitnessView.lua b/lua_probject/base_project/Game/View/WitnessView.lua index a0f1dc4e..75826cad 100644 --- a/lua_probject/base_project/Game/View/WitnessView.lua +++ b/lua_probject/base_project/Game/View/WitnessView.lua @@ -59,6 +59,9 @@ function WitnessView:DoNoticeAnimation() if self.noticeIndex > #DataManager.GameNotice then self.noticeIndex = 1 end + + --强制让牌类型为1,只有一种牌 + self._room.card_type = 1 end return WitnessView diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua index cf759caf..fed28f1a 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua @@ -338,13 +338,13 @@ function M:fillResult1(room, peopleNum, total_result) resultInfoComp:GetController("win").selectedIndex = totalInfoList.total_score >= 0 and 1 or 0 if totalInfoList.seat == bigWin.seat then resultInfoComp:GetController("bigWin").selectedIndex = 1 - else - resultInfoComp:GetController("bigWin").selectedIndex = 0 + -- else + -- resultInfoComp:GetController("bigWin").selectedIndex = 0 end if totalInfoList.seat == bestPao.seat then resultInfoComp:GetController("fangPao").selectedIndex = 1 - else - resultInfoComp:GetController("fangPao").selectedIndex = 0 + -- else + -- resultInfoComp:GetController("fangPao").selectedIndex = 0 end end end diff --git a/wb_new_ui/assets/Family/ChatRoom/Component/item_player.xml b/wb_new_ui/assets/Family/ChatRoom/Component/item_player.xml index ba6e8407..df791cff 100644 --- a/wb_new_ui/assets/Family/ChatRoom/Component/item_player.xml +++ b/wb_new_ui/assets/Family/ChatRoom/Component/item_player.xml @@ -3,13 +3,18 @@ - + + + + - - - + + + + + diff --git a/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml b/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml index a041951b..f0fb5603 100644 --- a/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml +++ b/wb_new_ui/assets/Family/ChatRoom/Component/item_record.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/wb_new_ui/assets/Family/ChatRoom/Component/ting_corner_icon.png b/wb_new_ui/assets/Family/ChatRoom/Component/ting_corner_icon.png new file mode 100644 index 00000000..c174f9b5 Binary files /dev/null and b/wb_new_ui/assets/Family/ChatRoom/Component/ting_corner_icon.png differ diff --git a/wb_new_ui/assets/Family/ChatRoom/Component/效果图.png b/wb_new_ui/assets/Family/ChatRoom/Component/效果图.png new file mode 100644 index 00000000..2cd38826 Binary files /dev/null and b/wb_new_ui/assets/Family/ChatRoom/Component/效果图.png differ diff --git a/wb_new_ui/assets/Family/ChatRoom/com_chatRoom.xml b/wb_new_ui/assets/Family/ChatRoom/com_chatRoom.xml index f52eb93c..1f93ef7a 100644 --- a/wb_new_ui/assets/Family/ChatRoom/com_chatRoom.xml +++ b/wb_new_ui/assets/Family/ChatRoom/com_chatRoom.xml @@ -1,16 +1,16 @@ - + - + - + - + diff --git a/wb_new_ui/assets/Family/Main/Component/btn_joinGame.xml b/wb_new_ui/assets/Family/Main/Component/btn_joinGame.xml index abdc7b51..0c6ffae1 100644 --- a/wb_new_ui/assets/Family/Main/Component/btn_joinGame.xml +++ b/wb_new_ui/assets/Family/Main/Component/btn_joinGame.xml @@ -1,7 +1,7 @@ - + diff --git a/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml b/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml index c1c1a567..b22a3e02 100644 --- a/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml +++ b/wb_new_ui/assets/Family/Main/Component/c_roomChild.xml @@ -1,6 +1,6 @@ - + @@ -10,7 +10,7 @@ - + @@ -43,5 +43,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml index 33e8d09f..94d601fc 100644 --- a/wb_new_ui/assets/Family/package.xml +++ b/wb_new_ui/assets/Family/package.xml @@ -404,6 +404,8 @@ + + \ No newline at end of file diff --git a/wb_new_ui/assets/Info_Poker_RunFastNew/Label_Detail_Play.xml b/wb_new_ui/assets/Info_Poker_RunFastNew/Label_Detail_Play.xml index 4dd25571..c8c7270b 100644 --- a/wb_new_ui/assets/Info_Poker_RunFastNew/Label_Detail_Play.xml +++ b/wb_new_ui/assets/Info_Poker_RunFastNew/Label_Detail_Play.xml @@ -137,5 +137,6 @@ + \ No newline at end of file diff --git a/wb_new_ui/assets/Lobby/component/Main/Component/down/btn_join.xml b/wb_new_ui/assets/Lobby/component/Main/Component/down/btn_join.xml index d239002a..2903cab9 100644 --- a/wb_new_ui/assets/Lobby/component/Main/Component/down/btn_join.xml +++ b/wb_new_ui/assets/Lobby/component/Main/Component/down/btn_join.xml @@ -4,5 +4,5 @@ -