diff --git a/lua_probject/base_project/Game/View/ResultView.lua b/lua_probject/base_project/Game/View/ResultView.lua index 25fedba7..9ffecc0b 100644 --- a/lua_probject/base_project/Game/View/ResultView.lua +++ b/lua_probject/base_project/Game/View/ResultView.lua @@ -270,8 +270,6 @@ function M:InitBigResult(room, fontsize) local isWin = false for i = 1, #self._resultInfo.player_list do local player_info = self._resultInfo.player_list[i] - printlog("player_info:") - pt(player_info) local total_score = room:GetTotalScore(player_info.score) local hp_nonnegative = room:checkHpNonnegative() player_info.total_score = 0 @@ -304,7 +302,7 @@ function M:InitBigResult(room, fontsize) local item = player_list:AddItemFromPool() item:GetChild('txt_name').text = player_info.nick - + item:GetChild('txt_userid').text = player_info.userId local head = item:GetChild('head'):GetChild('n4') ImageLoad.Load(player_info.head_url, head) diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua index d185083f..1a7acf23 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -837,7 +837,6 @@ end function M:GetHandCardOffset(count) local start = -50 ---54 - local offset = 0 if count > 10 then offset = start - count + 18 @@ -849,6 +848,15 @@ end function M:GetHandCardPos(index, card_count) local x, y = 0, -18 + + printlog("DataManager.CurrenRoom.cardsize:"..DataManager.CurrenRoom.cardsize) + if DataManager.CurrenRoom.cardsize == 0 then + y = -70 + elseif DataManager.CurrenRoom.cardsize == 1 then + y = -50 + elseif DataManager.CurrenRoom.cardsize == 2 then + y = -30 + end local offset = self:GetHandCardOffset(card_count) local middle_x = self.cards_view.width / 2 local start_x = middle_x - (card_count / 2 * (self.card_width + offset)) + (offset / 2) diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXRoomConfig.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXRoomConfig.lua index 238eeebb..fcf1a3fe 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXRoomConfig.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXRoomConfig.lua @@ -43,7 +43,7 @@ end function M:GetDes(sp) sp = sp or " " - local str = self.round and self.round .. "局" .. sp or "" + local str = "百息结算局" .. sp str = str .. RoomConfig.GetDes(self, sp) if self.maxPlayers == 2 then if self.qupai then @@ -52,7 +52,7 @@ function M:GetDes(sp) end end - str = str .. "娄底放炮罚 十五息起胡 明偎 天地胡 30胡翻倍 红黑胡" + str = str .. "娄底放炮罚 十五息起胡 明偎 天地胡 20胡100息 30胡翻倍 红黑胡" str = str .. sp return str end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua index 50882da6..7c60dc88 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/FanPaoFa_ResultView.lua @@ -904,6 +904,7 @@ function M:FillItemData2(room, data, list) local user = room:GetPlayerBySeat(data[i].seat).self_user local p = room:GetPlayerBySeat(data[i].seat) player_list[i].id = user.account_id + player_list[i].userId = user.account_id local total_score = data[i].total_score player_list[i].hp_info = data[i].hp_info player_list[i].score = total_score @@ -963,14 +964,18 @@ function M:FillItemData2(room, data, list) player_list[i].param[5].key = '打鸟总分:' player_list[i].param[5].value = tostring(dncount) + player_list[i].param[6] = {} + player_list[i].param[6].key = '[u][color=#0000FF]总胡息:[/color][/u]' + player_list[i].param[6].value = '[u][color=#0000FF]'..tostring(data[i].total_huxi)..'[/color][/u]' + end local round = room.room_config.round self:GenerateRoomResultInfo(round, room.room_config:GetGameName(), room.room_id, room.create_time, player_list) - self:SetGSListlineGap(5) + self:SetGSListlineGap(1) -- room.room_config.isNonnegative = 0 - self:InitBigResult(room, 26) + self:InitBigResult(room, 30) diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml index 83de0d89..1d7235ec 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml @@ -70,7 +70,7 @@