06.04 22.42重连显示飘分未弄

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

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})
+    setmetatable(M, { __index = PlayerInfoView })
-    local self = setmetatable({}, {__index = M})
+    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))
@@ -26,11 +26,13 @@ function M:FillData(player)
         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

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"]

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

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
 

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

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

wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml

@@ -3,7 +3,7 @@
   <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="1"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始,3,打鸟" selected="0"/>
-  <controller name="time" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="time" pages="0,,1,,2,,3," selected="2"/>
   <controller name="card_eff" pages="0,,1," selected="0"/>
   <controller name="zidongtishi" pages="0,,1," selected="0"/>
   <controller name="showBtn" pages="0,,1," selected="1"/>
@@ -50,9 +50,9 @@
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n18" sidePair="right-left,middle-middle"/>
     </component>
-    <component id="n67_qfrg" name="time" src="prgzer" fileName="component/Clock.xml" xy="625,198" size="82,88" scale="0.8,0.8" touchable="false">
+    <component id="n67_qfrg" name="time" src="prgzer" fileName="component/Clock.xml" xy="1133,63" size="82,88" scale="0.8,0.8" touchable="false">
       <gearDisplay controller="time" pages="1,2,3"/>
-      <gearXY controller="time" pages="1,2" values="171,315|1107,76" default="625,198"/>
+      <gearXY controller="time" pages="1,2" values="171,315|1133,63" default="625,198"/>
       <relation target="" sidePair="left-left%,top-top%"/>
     </component>
     <component id="n34_k3io" name="btn_ready" src="thxkciu" fileName="component/Result/btn_ready.xml" xy="678,366" size="270,96" group="n36_k3io">
@@ -132,9 +132,9 @@
       <item url="ui://9n9stu2eprgzdn"/>
       <item url="ui://9n9stu2eprgzdn"/>
     </list>
-    <text id="n74_bzpj" name="round" xy="944,42" size="101,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="none" text=" 1/10局">
+    <text id="n74_bzpj" name="round" xy="547,34" size="168,39" font="Microsoft YaHei" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="none" text=" 1/10局">
       <gearDisplay controller="state" pages="1,3"/>
-      <relation target="" sidePair="left-right%"/>
+      <relation target="" sidePair="left-left%,top-top%"/>
     </text>
     <graph id="n102_t2e2" name="n109" xy="-184,-46" size="1670,834" visible="false" type="rect" lineSize="0" fillColor="#80000000"/>
     <component id="n101_t2e2" name="tuoguanzhong" src="prgzew" fileName="component/tuoguanzhong.xml" xy="304,564" visible="false"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_1.xml

@@ -9,6 +9,7 @@
   <controller name="Oener" pages="0,,1," selected="0"/>
   <controller name="tuoguan" pages="0,,1," selected="0"/>
   <controller name="text_color" pages="0,,1," selected="0"/>
+  <controller name="piao" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n28_e54q" name="n28" src="lwcl2m" fileName="font/images/head/index_bg_01.png" pkg="27vd145b" xy="26,-5" size="100,98" group="n33_e7qn" aspect="true" visible="false"/>
     <component id="n34_u4l2" name="zhuang" src="prgzac" fileName="component/head/touxiang.xml" xy="-2,-33" group="n33_e7qn" visible="false">
@@ -57,5 +58,8 @@
     <text id="n46_kx91" name="n46" xy="23,166" size="48,32" group="n47_kx91" fontSize="22" color="#512e06" vAlign="middle" text="战绩"/>
     <group id="n47_kx91" name="zhanji" xy="17,164" size="132,35" visible="false" advanced="true"/>
     <text id="n48_nkur" name="tuoguanTips" xy="8,-54" size="237,48" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S"/>
+    <component id="n49_imp5" name="mask_piao" src="imp5cjr" fileName="component/head/mask_piao.xml" xy="9,62">
+      <gearDisplay controller="piao" pages="1"/>
+    </component>
   </displayList>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/PlayerHead_2.xml

@@ -10,6 +10,7 @@
   <controller name="shengyu" pages="0,,1," selected="0"/>
   <controller name="tuoguan" pages="0,,1," selected="0"/>
   <controller name="text_color" pages="0,,1," selected="0"/>
+  <controller name="piao" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n34_e7qn" name="n34" src="lwcl2m" fileName="font/images/head/index_bg_01.png" pkg="27vd145b" xy="22,0" size="100,98" group="n39_e7qn" aspect="true" visible="false"/>
     <component id="n38_e7qn" name="zhuang" src="prgzac" fileName="component/head/touxiang.xml" xy="-20,-28" group="n39_e7qn" aspect="true" visible="false">
@@ -48,7 +49,7 @@
     <component id="n44_fove" name="n44" src="prgzag" fileName="component/newcard/3/310.xml" xy="-57,32" scale="0.4,0.4">
       <gearDisplay controller="Oener" pages="1"/>
     </component>
-    <component id="n46_j7ij" name="shengyu" src="prgzan" fileName="component/head/shengyu.xml" xy="-129,-7">
+    <component id="n46_j7ij" name="shengyu" src="prgzan" fileName="component/head/shengyu.xml" xy="13,-33">
       <gearDisplay controller="shengyu" pages="1"/>
     </component>
     <image id="n47_d2rw" name="n47" src="prgzal" fileName="component/head/tuoguan.png" xy="-30,-44">
@@ -60,6 +61,9 @@
     </text>
     <text id="n53_kx91" name="n53" xy="17,166" size="48,32" group="n54_kx91" fontSize="22" color="#512e06" vAlign="middle" text="战绩"/>
     <group id="n54_kx91" name="zhanji" xy="11,164" size="131,35" visible="false" advanced="true"/>
-    <text id="n55_nkur" name="tuoguanTips" xy="-111,-44" size="237,48" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S"/>
+    <text id="n55_nkur" name="tuoguanTips" xy="-97,-72" size="237,48" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间90S"/>
+    <component id="n56_imp5" name="mask_piao" src="imp5cjr" fileName="component/head/mask_piao.xml" xy="2,63">
+      <gearDisplay controller="piao" pages="1"/>
+    </component>
   </displayList>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/head/mask_piao.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="142,35" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n1" name="n1" src="imp5cjs" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n2" name="title" xy="0,2" size="142,35" fontSize="18" color="#ffd554" align="center" vAlign="middle" autoSize="none" singleLine="true" text="飘鸟 1">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml

@@ -458,6 +458,11 @@
     <image id="imp5cjg" name="Group 7216.png" path="/component/Result/"/>
     <image id="imp5cji" name="Group 737.png" path="/component/Result/"/>
     <image id="imp5cjj" name="Line 26.png" path="/component/Result/"/>
+    <component id="imp5cjk" name="Btn_SelfCard.xml" path="/component/card_info/"/>
+    <component id="imp5cjm" name="di(1).xml" path="/component/card_info/newcard/"/>
+    <component id="imp5cjq" name="Comp_OutCard.xml" path="/component/card_info/"/>
+    <component id="imp5cjr" name="mask_piao.xml" path="/component/head/" exported="true"/>
+    <image id="imp5cjs" name="di00.png" path="/component/head/"/>
   </resources>
   <publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/NewGroup/Win_PartnerRewards.xml

@@ -17,15 +17,16 @@
     <image id="n83_s98c" name="n83" src="csp47i44" fileName="component/nav/sd.png" xy="38,91" size="1125,56" group="n79_ozaz">
       <relation target="" sidePair="width-width"/>
     </image>
-    <text id="n75_ozaz" name="n75" xy="102,102" size="98,34" group="n78_ozaz" font="Microsoft YaHei" fontSize="24" color="#aa3300" vAlign="middle" text="游戏名称"/>
+    <text id="n75_ozaz" name="n75" xy="102,102" size="100,34" group="n78_ozaz" font="Microsoft YaHei" fontSize="24" color="#aa3300" vAlign="middle" text="游戏名称"/>
-    <text id="n76_ozaz" name="n76" xy="525,102" size="145,34" group="n78_ozaz" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" text="我的赠送表情"/>
+    <text id="n76_ozaz" name="n76" xy="525,102" size="148,34" group="n78_ozaz" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" text="我的赠送表情"/>
-    <text id="n77_ozaz" name="n77" xy="932,102" size="169,34" group="n78_ozaz" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" text="下级的赠送表情"/>
+    <text id="n77_ozaz" name="n77" xy="932,102" size="172,34" group="n78_ozaz" font="Microsoft YaHei" fontSize="24" color="#aa3300" align="center" vAlign="middle" text="下级的赠送表情"/>
-    <text id="n84_zgn4" name="n84" xy="288,102" size="98,34" group="n78_ozaz" visible="false" font="Microsoft YaHei" fontSize="24" color="#367256" align="center" vAlign="middle" text="洗牌返点">
+    <text id="n84_zgn4" name="n84" xy="288,102" size="100,34" group="n78_ozaz" visible="false" font="Microsoft YaHei" fontSize="24" color="#367256" align="center" vAlign="middle" text="洗牌返点">
       <gearDisplay controller="fandian" pages="1"/>
     </text>
-    <text id="n86_cpin" name="n86" xy="577,107" size="98,34" group="n78_ozaz" visible="false" font="Microsoft YaHei" fontSize="24" color="#367256" align="center" vAlign="middle" text="按抽返点"/>
+    <text id="n86_cpin" name="n86" xy="577,107" size="100,34" group="n78_ozaz" visible="false" font="Microsoft YaHei" fontSize="24" color="#367256" align="center" vAlign="middle" text="按抽返点"/>
     <group id="n78_ozaz" name="n78" xy="102,102" size="999,39" group="n79_ozaz"/>
-    <group id="n79_ozaz" name="index0" xy="38,91" size="1125,486" advanced="true"/>
+    <component id="n87_imp5" name="btn_piliang" src="imp57ihy" fileName="mgr/component/reward/btn_piliang.xml" xy="916,3" size="192,77" group="n79_ozaz"/>
+    <group id="n79_ozaz" name="index0" xy="38,3" size="1125,574" advanced="true"/>
     <component id="n7_r96t" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1114,-26" controller="style,0"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/mgr/component/reward/btn_piliang.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="198,88" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n3_imp5" name="n3" src="imp57ihx" fileName="mgr/component/reward/Group 533.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/NewGroup/package.xml

@@ -1084,6 +1084,8 @@
     <component id="imp57ihu" name="all_btn.xml" path="/mgr/component/numberHpAlone/"/>
     <image id="imp57ihv" name="Frame 141.png" path="/mgr/component/numberHpAlone/"/>
     <image id="imp57ihw" name="Group 748.png" path="/images/info/"/>
+    <image id="imp57ihx" name="Group 533.png" path="/mgr/component/reward/"/>
+    <component id="imp57ihy" name="btn_piliang.xml" path="/mgr/component/reward/"/>
   </resources>
   <publish name="NewGroup" path="..\wb_unity_pro\Assets\ART\base\newgroup\ui" packageCount="2"/>
 </packageDescription>