From 21a84b11655f0c65aa97a33fce5dd0f0f26e7daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Wed, 4 Jun 2025 22:42:49 +0800 Subject: [PATCH] =?UTF-8?q?06.04=2022.42=E9=87=8D=E8=BF=9E=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=A3=98=E5=88=86=E6=9C=AA=E5=BC=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MngView/GroupPartnerRewardsView.lua | 39 ++++++++++++++++++ .../extend/poker/runfast/EXPlayerInfoView.lua | 28 +++++++++---- .../poker/runfast/RunFast_GameController.lua | 12 ++++++ .../poker/runfast/RunFast_GameEvent.lua | 1 + .../extend/poker/runfast/RunFast_MainView.lua | 10 +++++ .../extend/poker/runfast/RunFast_Protocol.lua | 3 +- .../poker/runfast/RunFast_ResultView.lua | 2 +- .../component/RunFast_Main_2.xml | 10 ++--- .../component/head/PlayerHead_1.xml | 4 ++ .../component/head/PlayerHead_2.xml | 8 +++- .../component/head/di00.png | Bin 0 -> 5006 bytes .../component/head/mask_piao.xml | 13 ++++++ .../Extend_Poker_RunFastNew/package.xml | 5 +++ .../assets/NewGroup/Win_PartnerRewards.xml | 13 +++--- .../mgr/component/reward/Group 533.png | Bin 0 -> 17544 bytes .../mgr/component/reward/btn_piliang.xml | 10 +++++ wb_new_ui/assets/NewGroup/package.xml | 2 + 17 files changed, 137 insertions(+), 23 deletions(-) create mode 100644 wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/di00.png create mode 100644 wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/mask_piao.xml create mode 100644 wb_new_ui/assets/NewGroup/mgr/component/reward/Group 533.png create mode 100644 wb_new_ui/assets/NewGroup/mgr/component/reward/btn_piliang.xml diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua index 5111894a..1cfec3df 100644 --- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua +++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua @@ -61,6 +61,45 @@ function M:GetRewardsData() end self.lst_rewards.numItems = #self.rewards_data self.fandianControl.selectedIndex = self.showxipai + + self._view:GetChild('btn_piliang').onClick:Set(function() + local gfiv = GroupNumberInputView.new(self._root_view, function(num) + local tem = num * 1000 + local msg_win = MsgWindow.new(nil, string.format("是否设定所有玩法奖励为%s?", num), + MsgWindow.MsgMode.OkAndCancel, nil, false) + + msg_win.onOk:Add(function(...) + local single = msg_win.btnCheck.selected and 1 or 0 + local fgCtr = ControllerManager.GetController(NewGroupController) + ViewUtil.ShowModalWait() + local successNum = 0 + for i = 1, #rewards do + fgCtr:FG_SetRewards(self.group_id, rewards[i].pid, self.partner_lev, self.partner_id, true, + rewards[i].max_value - tem, single, + function(res) + ViewUtil.CloseModalWait() + if res.ReturnCode ~= 0 then + -- ViewUtil.ErrorTip(res.ReturnCode, "设置奖励失败") + else + -- successNum = successNum + 1 + -- ViewUtil.ShowBannerOnScreenCenter("设置奖励成功") + -- for i = 1, #self.rewards_data do + -- if self.rewards_data[i].rewardValueType == data.rewardValueType then + -- self.rewards_data[i].cur_value = data.cur_value + -- end + -- end + -- self.lst_rewards.numItems = #self.rewards_data + end + end) + if i == #rewards then + self:GetRewardsData() + end + end + end) + msg_win:Show() + end, 3) + gfiv:Show() + end) end end) end diff --git a/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua index 8289df0f..fcf8e889 100644 --- a/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/EXPlayerInfoView.lua @@ -3,18 +3,18 @@ local PlayerInfoView = require("Game.View.PlayerInfoView") local M = {} function M.new(view, mainView) - setmetatable(M, {__index = PlayerInfoView}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = PlayerInfoView }) + local self = setmetatable({}, { __index = M }) self._view = view self._main_view = mainView self:init() + + self.ctr_piao = view:GetController('piao') + self.view_piao = view:GetChild('mask_piao') return self end - function M:FillData(player) - - PlayerInfoView.FillData(self, player) if player.cur_hp ~= nil then self:UpdateScore(d2ad(player.cur_hp)) @@ -25,12 +25,14 @@ function M:FillData(player) end self:UpdateScore(player.total_score * rt) end - - + + if player.piao ~= nil and player.piao >= 0 then + self.view_piao.title = player.piao == 0 and "不打鸟" or string.format("打鸟%d", player.piao) + self.ctr_piao.selectedIndex = 1 + end end function M:UpdatePiao(piao) - if piao == nil or piao == -1 then self._view:GetChild("piao").text = "" elseif piao == 0 then @@ -48,5 +50,15 @@ function M:UpdatePiao(piao) end end +function M:ShowPiao(num) + num = num or 0 + if num > 0 then + self.view_piao.title = string.format("打鸟%d", num) + self.ctr_piao.selectedIndex = 1 + else + self.view_piao.title = string.format("不打鸟") + self.ctr_piao.selectedIndex = 1 + end +end return M 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 29e54007..990f08cb 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameController.lua @@ -53,6 +53,7 @@ function M:RegisterEvt() self._eventmap[RunFast_Protocol.GAME_EVT_CARDINHAND] = self.OnPlaySuccCheckHandCard self._eventmap[RunFast_Protocol.GAME_EVT_DANIAO_TIP] = self.OnDaNiao + self._eventmap[RunFast_Protocol.GAME_EVT_DANIAO_SHOW] = self.OnDaNiaoShow end -- function M:Oener(evt_data) @@ -261,6 +262,17 @@ function M:OnDaNiao(evt_data) ) end +function M:OnDaNiaoShow(evt_data) + local seat = evt_data["seat"] + local niao = evt_data["niao"] + local isDa = evt_data["daNiao"] + self._cacheEvent:Enqueue( + function() + DispatchEvent(self._dispatcher, RunFast_GameEvent.OnDaNiaoShow, seat, niao, isDa) + end + ) +end + function M:OnPassSucc(evt_data) print("lingmeng OnPassSucc", os.time()) local seat = evt_data["seat"] diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua index c678e8aa..d326f38f 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_GameEvent.lua @@ -20,5 +20,6 @@ local RunFast_GameEvent = { EventXiPai = "EventXiPai", OnPassSuccCheckCard = "OnPassSuccCheckCard", OnDaNiao = "OnDaNiao", + OnDaNiaoShow = "OnDaNiaoShow", } return RunFast_GameEvent diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua index a724d9da..5220a670 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua @@ -1062,6 +1062,16 @@ function M:EventInit() -- local piao = arg[2] -- local head_info = self._player_info[self:GetPos(1)] self._ctr_action.selectedIndex = 3 + -- self._ctr_state.selectedIndex = 1 + end) + + _gamectr:AddEventListener(RunFast_GameEvent.OnDaNiaoShow, function(...) + local arg = { ... } + local seat = arg[1] + local piao = arg[2] + local isDa = arg[3] + local head_info = self._player_info[self:GetPos(seat)] + head_info:ShowPiao(isDa == 0 and 0 or piao) end) end diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua index b5a937b8..d89dd9ea 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_Protocol.lua @@ -41,7 +41,8 @@ local RunFast_Protocol = { --打鸟 GAME_EVT_DANIAO_TIP = "832", - GAME_DANIAO = "831" + GAME_DANIAO = "831", + GAME_EVT_DANIAO_SHOW = "833" } return RunFast_Protocol 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 aeb1aef1..79bc0249 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua @@ -428,7 +428,7 @@ function M:InitBigResult(room, fontsize) item:GetController('pn').selectedIndex = 1 item:GetChild('txt_positive').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('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 else diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml index 582ddfa5..fe199d46 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml @@ -3,7 +3,7 @@ - + @@ -50,9 +50,9 @@ - + - + @@ -132,9 +132,9 @@ - + - + diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_1.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_1.xml index b5c0f26b..7f8a5881 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_1.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_1.xml @@ -9,6 +9,7 @@ + @@ -57,5 +58,8 @@ + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml index 39a0775b..e46998fd 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml @@ -10,6 +10,7 @@ + @@ -48,7 +49,7 @@ - + @@ -60,6 +61,9 @@ - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/di00.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/di00.png new file mode 100644 index 0000000000000000000000000000000000000000..a1631fed6722a736749871f86d65396e4e483811 GIT binary patch literal 5006 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
    Z4J~8w$hF3B8>7bx| zs{HZ=>8GsI2l`f)`MMtPVtOcwVB~j{(FoTt-W0}Xs@evoxY5%Du8c&5WsNzjiubB6 zay8yqX<;Of@7Z$f5k=84h3}Zk&o{_NXsD1xY6oSg#SL9+SV2&u7-7&*7xZ~j6O~X( zLWd`_bNd;BlJ!IAGIf%gmOC#Mp=T@XD(c5p<17N84mhZF8+AJGM4EC$z$u;ZJXWg+ z81z_rpmJ%_!In;hPBf&7SH4gwl_Xm0RI9YDl(w8b> zR?+Do<%#B!xluq5jm18_naujcB5i8#RRThbK+`6qw}2PsA*E8Lj4MugB0KR49V=d# z$3&zdUr(i(IECiP?8+~#VkCJ!wWCmcxIgBRgbVDnn6ikqa&52>FSh8eTv!LH;U20I zlQH9q2V?I#_Rf;wf<8dXFd>m>y^8gd(7C@l!+BK3Fw^_Rc)UCYT^}=(q2#48=$FP2 zbMdc7_w3t&?a?(oGI;}`?3xs5kGzy#BC<2YY_W#!{9HwxD7Czkw*=}Uvd`-Mx4orwS8g0prQ z8~^Bli2o4*)ljaQ7aLBj`)d~G3vj9+!bqbwP5Q76=ddOZD+43g + + + + + + + + + + +