渲染顺序

lua_probject/base_project/Game/View/PlayerInfoView2.lua

@@ -169,7 +169,10 @@ function M:FillData(player)
     end
 end
 
-function M:UpdateScore(score)
+function M:UpdateScore(score, doAnimation)
+
+    local lastScore = tonumber(self._tex_score.text)
+
     if not score then
         score = self._player.total_score
         -- local room = DataManager.CurrenRoom
@@ -185,6 +188,10 @@ function M:UpdateScore(score)
         -- end
     end
     self._tex_score.text = tostring(score)
+
+    if doAnimation then
+        self:ScoreAnimation(lastScore - score)
+    end
 end
 
 function M:SetStartType(peopleNum, seat)

lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua

@@ -316,12 +316,13 @@ function M:OnEventHu(evt_data)
     local lose_p = self._room:GetPlayerBySeat(evt_data["from_seat"])
     local win_card = evt_data["win_card"]
     local win_list = evt_data["win_list"]
+    local scoreData = evt_data["result"].info_list
 
     self._cacheEvent:Enqueue(function()
         win_p.card_list = cards
         table.sort(win_p.card_list, self.HandCardSortAndJing)
         DispatchEvent(self._dispatcher, TX_GameEvent.ZPHuCard, evt_data["seat"], evt_data["from_seat"], win_card, cards,
-            win_list)
+            win_list, scoreData)
     end)
 end
 

lua_probject/main_project/main/majiang/MJMainView.lua

@@ -713,6 +713,7 @@ function M:OnHuCard(...)
     local win_card = arg[3]
     local cards = arg[4]
     local win_list = arg[5]
+    local scoreData = arg[6]
     local index = self:GetPos(win_seat)
     local info = self._player_card_info[index]
     local player = self._room:GetPlayerBySeat(win_seat)
@@ -800,6 +801,12 @@ function M:OnHuCard(...)
             coroutine.wait(0.7)
         end
 
+        -- 扣分动画
+        for _, player in pairs(scoreData) do
+            local infoView = self._player_info[self:GetPos(player.seat)]
+            infoView:UpdateScore(player.total_score, true)
+        end
+
         coroutine.wait(0.5)
         self._popEvent = true
         list_HuCardEffect:RemoveChildrenToPool()

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_N.xml

@@ -4,7 +4,7 @@
   <controller name="ting" pages="0,,1," selected="0"/>
   <controller name="site" pages="0,2-1,1,2-2" selected="0"/>
   <controller name="getCard" pages="0,,1," selected="0"/>
-  <controller name="cStie" exported="true" pages="0,,1,,2," selected="1">
+  <controller name="cStie" exported="true" pages="0,,1,,2," selected="0">
     <remark page="0" value="2人"/>
     <remark page="1" value="3人"/>
     <remark page="2" value="4人"/>
@@ -31,8 +31,8 @@
       <item/>
       <item/>
     </list>
-    <list id="n41_gi99" name="List_OutCard" xy="299,102" pivot="0.5,0.5" size="1239,502" skew="0,180" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" margin="40,0,0,0" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjygi9910t" autoClearItems="true">
-      <gearXY controller="cStie" pages="1,2" values="299,102|832,149" default="266,150"/>
+    <list id="n41_gi99" name="List_OutCard" xy="1314,401" pivot="0.5,0.5" anchor="true" size="2097,502" skew="0,180" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" margin="40,0,0,0" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjygi9910t" autoClearItems="true">
+      <gearXY controller="cStie" pages="0,1,2" values="1314,401|299,102|832,149"/>
       <gearSize controller="cStie" pages="1,2" values="1239,502,1,1|887,502,1,1" default="2097,502,1,1"/>
       <item/>
       <item/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImage="ui://v0j9abjyj6yy1ft" designImageAlpha="0">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="2"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -14,15 +14,15 @@
     <component id="n205_hyws" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1200,366" size="435,73">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n218_ogwn" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Player_card_info_S.xml" xy="0,0" controller="cStie,1">
-      <gearDisplay controller="state" pages="1,3,4"/>
-    </component>
     <component id="n216_ogwn" name="player_card_info2" src="j6yy1fu" fileName="Main_new/Main_new_2/Player_card_info_E.xml" xy="0,0">
       <gearDisplay controller="state" pages="1,3,4"/>
     </component>
     <component id="n217_ogwn" name="player_card_info3" src="inqx13x" fileName="Main_new/Main_new_2/Player_card_info_N.xml" xy="0,0" controller="cStie,1">
       <gearDisplay controller="state" pages="1,3,4"/>
     </component>
+    <component id="n218_ogwn" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Player_card_info_S.xml" xy="0,0" controller="cStie,1">
+      <gearDisplay controller="state" pages="1,3,4"/>
+    </component>
     <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,909" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImage="ui://v0j9abjyj6yy1fw" designImageAlpha="0">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,5,观战状态" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,5,观战状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -21,10 +21,10 @@
     <component id="n225_ogwn" name="player_card_info3" src="inqx13x" fileName="Main_new/Main_new_2/Player_card_info_N.xml" xy="0,0" controller="cStie,2">
       <gearDisplay controller="state" pages="1,3,5"/>
     </component>
-    <component id="n226_ogwn" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Player_card_info_S.xml" xy="0,0" controller="cStie,2">
+    <component id="n227_ogwn" name="player_card_info4" src="j6yy1fv" fileName="Main_new/Main_new_2/Player_card_info_W.xml" xy="0,0">
       <gearDisplay controller="state" pages="1,3,5"/>
     </component>
-    <component id="n227_ogwn" name="player_card_info4" src="j6yy1fv" fileName="Main_new/Main_new_2/Player_card_info_W.xml" xy="0,0">
+    <component id="n226_ogwn" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Player_card_info_S.xml" xy="0,0" controller="cStie,2">
       <gearDisplay controller="state" pages="1,3,5"/>
     </component>
     <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,909" size="153,132">