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 90dc37c8..04d6d11f 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberHpListView.lua @@ -518,6 +518,23 @@ function M:FillItem(obj, member, refresh, index) self.lst_member_find.numItems = #tempNumberList end ) + obj:GetController('all').selectedIndex = 0 + obj:GetChild("all_btn").onClick:Set( + function() + ViewUtil.ShowModalWait(self._root_view) + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GetTotalHp(self.group_id, member.uid, function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode == 0 then + local hp = d2ad(res.Data.hp) + obj:GetChild("tex_all").text = hp + obj:GetController('all').selectedIndex = 1 + else + ViewUtil.ErrorTip(res.ReturnCode, "目标没有总线值") + end + end) + end + ) end function M:OnRenderItem(index, obj) diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua index f8f9defa..29e54007 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua @@ -133,6 +133,7 @@ function M:OnEventXiPaiAnim(evt_data) end function M:SendCard(cards, currentCard) + print("lingmengSendCard", os.time()) local _data = {} _data["card"] = cards _data["all_card"] = currentCard @@ -261,6 +262,7 @@ function M:OnDaNiao(evt_data) end function M:OnPassSucc(evt_data) + print("lingmeng OnPassSucc", os.time()) local seat = evt_data["seat"] self._cacheEvent:Enqueue( function() @@ -269,6 +271,7 @@ function M:OnPassSucc(evt_data) DispatchEvent(self._dispatcher, RunFast_GameEvent.OnPassSucc, p) end ) + print("lingmeng OnPassSucc2", os.time()) end function M:OnPutError(evt_data) diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua index 665584ee..aeb1aef1 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua @@ -164,6 +164,7 @@ function M:InitData_One(data, winseat, over, roomid, remaincards) local hp_nonnegative = room:checkHpNonnegative() local roundScore = player.winCardScore + roundScore = roundScore or 0 if hp_nonnegative then local jifen = "" if roundScore > 0 then @@ -429,14 +430,14 @@ function M:InitBigResult(room, fontsize) item2:GetChild('txt_navigate').text = string.format("总战绩:+%s", player_info.total_score) item2:GetChild('txt_daniao').text = string.format("打鸟 +%s", player_info.daniao) item2:GetChild('text_zongjifen').text = player_info.total_score < player_info.daniao and 0 or - player_info.total_score - player_info.daniao + player_info.total_score - player_info.daniao else item:GetController('pn').selectedIndex = 0 item:GetChild('txt_navigate').text = tostring(player_info.total_score) item2:GetChild('txt_navigate').text = string.format("总战绩:%s", player_info.total_score) item2:GetChild('txt_daniao').text = string.format("打鸟 %s", player_info.daniao) item2:GetChild('text_zongjifen').text = player_info.total_score > player_info.daniao and 0 or - player_info.total_score - player_info.daniao + player_info.total_score - player_info.daniao end end diff --git a/wb_new_ui/.objs/metas/9n9stu2e/prgz88.info b/wb_new_ui/.objs/metas/9n9stu2e/prgz88.info index 794f6bdd..b88b4af7 100644 --- a/wb_new_ui/.objs/metas/9n9stu2e/prgz88.info +++ b/wb_new_ui/.objs/metas/9n9stu2e/prgz88.info @@ -1,22 +1,19 @@ { "objectStatus": { + "n57_pgkj": { + "hidden": true + }, + "n61_agiz": { + "hidden": true + }, "n60_8yp0": { "hidden": true }, "n56_dg1i": { "hidden": true }, - "n63_i3h6": { - "collapsed": true - }, "n53_g618": { "hidden": true - }, - "n57_pgkj": { - "hidden": true - }, - "n61_agiz": { - "hidden": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info b/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info index ab040c86..5e6aa941 100644 --- a/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info +++ b/wb_new_ui/.objs/metas/m7iejg46/ilon7ibc.info @@ -2,6 +2,9 @@ "objectStatus": { "n44_rpaz": { "collapsed": true + }, + "n51_t1hq": { + "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/card_info/Player_card_info_1.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/card_info/Player_card_info_1.xml index a4c9c82e..dd06791c 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/card_info/Player_card_info_1.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/card_info/Player_card_info_1.xml @@ -1,7 +1,7 @@ - - + + @@ -12,17 +12,17 @@ - +