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 @@