diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua index 6d5ee40c..99a7ed2f 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua @@ -175,6 +175,7 @@ function M:FillView() self.tongji:initData() self.tongji:Show() end) + self._view:GetChild('btn_tongji').visible = group.lev < 3 or group.partnerLev > 0 self:GetMemberData(0) end diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua index 4865ea8c..9be8fd88 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerBackView.lua @@ -17,8 +17,7 @@ local RunFast_Record_Event = { Evt_Pass = 'pass', Evt_NewRound = 'newindex', Evt_result = 'result', - Evt_Result = 'Result', - Evt_Opt = 'prompt' + Evt_Result = 'Result' } local default_bg = 1 @@ -82,8 +81,6 @@ function M:InitView(url) else self._view:GetChild('roominfo_panel1'):GetChild('tex_beishu').text = '' end - self._ctr_inClear = self._view:GetController('Inclear') - self._cardCheck = RunFast_CardCheck:InitFlag() self._gamectr._cardCheck = self._cardCheck @@ -94,7 +91,7 @@ function M:InitView(url) self._cmdmap[RunFast_Record_Event.Evt_Pass] = self.CmdPass self._cmdmap[RunFast_Record_Event.Evt_NewRound] = self.CmdNewRound self._cmdmap[RunFast_Record_Event.Evt_result] = self.Cmdresult - self._cmdmap[RunFast_Record_Event.Evt_Opt] = self.CmdOpt + self._cmdmap[RunFast_Record_Event.Evt_Result] = self.CmdResult end function M:NewPlayerPokerInfoView(view, index) @@ -108,11 +105,10 @@ function M:FillRoomData(data) -- print("hidezhanji 1111") self._currentStep = 1 + DataManager.CurrenRoom.pai = 0 local room = DataManager.CurrenRoom - self._room = DataManager.CurrenRoom local _player_card_info = self._player_card_info local roominfo_panel = self._view:GetChild('roominfo_panel1') - self._room.pai = 0 roominfo_panel:GetChild('tex_roomid').text = data.info.roomid roominfo_panel:GetChild('tex_gametype').text = room.room_config:GetGameName() @@ -129,6 +125,7 @@ function M:FillRoomData(data) if room.hpOnOff == 1 or room:checkHpNonnegative() then head_info._view:GetChild('zhanji').visible = true + head_info._view:GetChild('text_jifen').text = d2ad(p.total_hp) end end head_info:FillData(p) @@ -140,36 +137,10 @@ function M:FillRoomData(data) head_info:UpdatePiao(p.piao) end - self:UpdateRound(self._room.curren_round) + self:UpdateRound() self:GenerateAllStepData(data) self:ShowStep(1) - self:Play() -end - -function M:ChangePlayState(state) - self._play = state - self:ChangeTextSpeed() - local btn_play = self._view:GetChild("panel_record"):GetChild("btn_play") - if self._play then - btn_play:GetController("state").selectedIndex = 1 - else - btn_play:GetController("state").selectedIndex = 0 - end - --开始时,隐藏显示结算界面 - if state then - if self.destory_win ~= nil then - coroutine.stop(self.destory_win) - end - - self.destory_win = nil - if self.result_view then - self.result_view._root_view:RemoveFromParent() - self.result_view:Destroy() - self._ctr_inClear.selectedIndex = 0 - end - self.result_view = nil - end end function M:ShowStep(index) @@ -185,19 +156,13 @@ function M:ShowStep(index) p.out_card_list = step.player_card_data[i].out_card_list p.hand_left_count = #p.hand_list - if step.cmd == RunFast_Record_Event.Evt_Opt and step.seat == p.seat then - info._view:GetController('out_card_option2').selectedIndex = 1 - else - info._view:GetController('out_card_option2').selectedIndex = 0 - end - if p.seat ~= self._room.self_player.seat then info:UpdateHandPoker(p.hand_list, false, true) else info:InitPoker(p.hand_list, false) end - info:SetOutCardInfo(nil, false) end + if step.cmd == RunFast_Record_Event.Evt_OutCard then local seat = step.current_out_seat local p = self._room:GetPlayerBySeat(seat) @@ -230,91 +195,16 @@ function M:ShowStep(index) end end if step.cmd == RunFast_Record_Event.Evt_result then - local data = step.data - local over = 0 - local info = data.win.info - local win_seat = data.win.winseat - local remaincards = {} - -- local energyTab = arg[5] - local otherpoker_list = self._view:GetChild("otherpoker_list") - local card_info = self._player_card_info[self:GetPos(self._room.self_player.seat)] - if self.dismissWin ~= nil then - self.dismissWin:Destroy() - end - self.dismissWin = nil - if self.MypokerList ~= nil then - -- body - card_info:Clear() - card_info:InitPoker(self.MypokerList, false) - self.MypokerList = nil - end - if otherpoker_list ~= nil then - -- body - otherpoker_list:RemoveChildrenToPool() - otherpoker_list.visible = true - end + local result = step.result + for i = 1, #result do + local card_info = self._player_card_info[self:GetPos(result[i].seat)] - if self.destory_win ~= nil then - coroutine.stop(self.destory_win) - end - - self.destory_win = nil - self.destory_win = coroutine.start(function() - if win_seat == self._room.self_player.seat then - ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/end_music.mp3") - else - ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/lose_music.mp3") + if result[i].entrust ~= nil and result[i].entrust == true then + local head_info = self._player_info[self:GetPos(result[i].seat)] + head_info:MarkTuoguan() end - coroutine.stop(self._leftClock_continue) - for i = 1, #self._player_card_info do - local card_info = self._player_card_info[i] - card_info._ctr_time_clock.selectedIndex = 0 - self._left_time = 0 - end - - for i = 1, #info do - local player = info[i] - local p = self._room:GetPlayerBySeat(player.seat) - local head_info = self._player_info[self:GetPos(player.seat)] - - end - - coroutine.wait(2) - - self.result_view = RunFast_ResultView.new(self, info, self._room.room_id, over, win_seat, 0, - remaincards) - self.result_view:SetDestroryCallback(function() - for i = 1, #self._player_card_info do - local card_info = self._player_card_info[i] - card_info.ctr_outpoker.selectedIndex = 0 - if card_info._ctr_resultOut then - card_info._ctr_resultOut.selectedIndex = 0 - end - end - end) - self.result_view:Show() - self.result_view._root_view:RemoveFromParent() - self._view:AddChildAt(self.result_view._root_view, - self._view:GetChildIndex(self._view:GetChild('mask_tips')) - 1) - if self.WinItem_view ~= nil then - self.WinItem_view:Dispose() - self.WinItem_view = nil - end - if self.rank_view ~= nil then - self.rank_view:Dispose() - self.rank_view = nil - end - - if self._room.self_player.entrust == true then - local btn_confirm = self.result_view._view:GetChild("btn_confirm") - btn_confirm.onClick:Call() - end - ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/end_music.mp3") - end) - if over == 1 then - -- body - self:UnmarkSelfTuoguan() - ControllerManager.ChangeController(LoddyController) + -- head_info:UpdateScore(result[i].score) + card_info:PlayScore(result[i].score, false, step.win_seat == result[i].seat) end end if step.cmd == RunFast_Record_Event.Evt_Result then @@ -324,9 +214,9 @@ function M:ShowStep(index) local num = self._view:GetChildIndex(self._view:GetChild("panel_record")) self._view:AddChildAt(self.result_view._view, num) else - -- if self.result_view then - -- self.result_view:Dispose() - -- end + if self.result_view then + self.result_view:Dispose() + end end end @@ -387,7 +277,8 @@ end function M:Cmdresult(cmd, index) local data = self:CopyLastStep(index) data.cmd = cmd.cmd - data.data = cmd.data + data.result = cmd.data.result + data.win_seat = cmd.seat end function M:CmdResult(cmd, index) @@ -400,12 +291,6 @@ function M:CmdResult(cmd, index) end end -function M:CmdOpt(cmd, index) - local data = self:CopyLastStep(index) - data.cmd = cmd.cmd - data.seat = cmd.seat -end - function M:CopyLastStep(index) local step = {} local last_step = self._step[index] @@ -433,17 +318,9 @@ function M:ClearNextSeatOutCard(currenOutCardSeat) card_info:SetOutCardInfo(nil, false) end -function M:UpdateRound(round) - local total_round = self._room.room_config.Times - -- self._text_round.text = string.format("%d / %d 局", round, total_round) - if not self._text_currenRound then - self._text_currenRound = self._view:GetChild('Text_CurrenRound') - end - if not self._text_maxRound then - self._text_maxRound = self._view:GetChild('Text_MaxMaxRound') - end - self._text_currenRound.text = round - self._text_maxRound.text = string.format("/%s局", total_round) +function M:UpdateRound() + local round = self._room.curren_round + self._tex_round.text = string.format('第 %d 局', round) end function M:NextRecordPlay() @@ -456,10 +333,10 @@ function M:NextRecordPlay() self._speed = 1 self._playFoward = true self:ChangeTextSpeed() - -- if self.result_view then - -- self.result_view:Dispose() - -- self.result_view = nil - -- end + if self.result_view then + self.result_view:Dispose() + self.result_view = nil + end end function M:LastRecordPlay() @@ -471,10 +348,70 @@ function M:LastRecordPlay() self._speed = 1 self._playFoward = true self:ChangeTextSpeed() - -- if self.result_view then - -- self.result_view:Dispose() - -- self.result_view = nil - -- end + if self.result_view then + self.result_view:Dispose() + self.result_view = nil + end +end + +function M:Play() + self:ChangeAlpha() + self:ChangePlayState(not self._play) + if not self._play then + return + end + if (self._currentStep == #self.cmdList and self._playFoward) or (self._currentStep == 0 and not self._playFoward) then + self._currentStep = 0 + self._speed = 1 + self._playFoward = true + self:ChangeTextSpeed() + end +end + +function M:ChangeTextSpeed() + local str1 = self._play and self._speed or '' + self._view:GetChild('panel_record'):GetChild('tex_speed').text = str1 + local str2 = + not self._play and (self._playFoward and '播放暂停' or '回退暂停') or + self._playFoward and (self._speed == 1 and '播放' or '快进') or + (self._speed == 1 and '回退' or '快退') + self._view:GetChild('panel_record'):GetChild('tex_2').text = str2 + local str3 = self._play and '倍速度' or '' + self._view:GetChild('panel_record'):GetChild('tex_1').text = str3 +end + +function M:CmdLeftArrows() + self:ChangeAlpha() + self:ChangePlayState(true) + if not self._playFoward then + if self._speed < 16 then + self._speed = self._speed * 2 + else + self._speed = 1 + end + self:ChangeTextSpeed() + else + self._speed = 1 + self._playFoward = false + self:ChangeTextSpeed() + end +end + +function M:CmdRightArrows() + self:ChangeAlpha() + self:ChangePlayState(true) + if self._playFoward then + if self._speed < 16 then + self._speed = self._speed * 2 + else + self._speed = 1 + end + self:ChangeTextSpeed() + else + self._speed = 1 + self._playFoward = true + self:ChangeTextSpeed() + end end function M:_Effect(type1, player) diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png index e078dbbb..85f03107 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes index f8239774..8d46756e 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png index 83b76b2d..7a8cce42 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png index 15f2dbf8..e921c960 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png index bc07b6f1..4416f295 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png index 0fd687a2..cef6e1ef 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes index 2721be6a..bd66e581 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png index 264250a7..743eac91 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png index 97e3cd5a..c1042649 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png index 998d2e45..96794687 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png index 24dfac85..17776330 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png index c1441f57..4077b487 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png index 64132595..21dde2c5 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png index cab171e9..8df0760c 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png index 7e76fd6b..70b3e020 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes index 0b6704df..4e9249b3 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes differ diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info b/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info index a8d6d570..9e26dfee 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffncb.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n47_kx91": { - "hidden": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info index a7e00e81..73dae4d0 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info @@ -12,16 +12,9 @@ "n131_ckvb": { "hidden": true }, - "n164_ukp7": { - "locked": true, - "collapsed": true - }, "n166_ukp7": { "hidden": true }, - "n163_ukp7": { - "collapsed": true - }, "n93_eclw": { "collapsed": true } diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnnx.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnnx.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnnx.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info index 562e1348..0be45267 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info @@ -3,14 +3,14 @@ "n85_l2u4": { "collapsed": true }, - "n108_go7q": { - "hidden": true - }, "n107_go7q": { "hidden": true }, - "n82_l2u4": { - "collapsed": true + "n108_go7q": { + "hidden": true + }, + "n59_v38k": { + "locked": true } } } \ No newline at end of file diff --git a/wb_new_ui/assets/Common/images/bg_game_战绩.png b/wb_new_ui/assets/Common/images/bg_game_战绩.png new file mode 100644 index 00000000..1272b4e4 Binary files /dev/null and b/wb_new_ui/assets/Common/images/bg_game_战绩.png differ diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml index 8078d991..343f3877 100644 --- a/wb_new_ui/assets/Common/package.xml +++ b/wb_new_ui/assets/Common/package.xml @@ -1354,6 +1354,7 @@ + diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_2.xml index 486495e0..2edcc032 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_2.xml @@ -60,7 +60,16 @@ - + +