剩余牌数文字

lua_probject/base_project/Game/View/MainView.lua

@@ -1447,6 +1447,7 @@ end
 
 function M:Show()
     BaseView.Show(self)
+    --[[
     if self._state.selectedIndex == 0 and self._show_distance then
         if self._room.self_player.seat == 0 then
             return
@@ -1460,6 +1461,7 @@ function M:Show()
         -- self.distance_view:Show()
         -- self.btn_distance:GetController("state").selectedIndex = 1
     end
+    ]]
 end
 
 function M:Destroy()

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

@@ -143,7 +143,7 @@ function M:IsShowGangZi(btn, isShow)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 
@@ -278,7 +278,7 @@ function M:EventInit()
         local seat = arg[1]
         local card = arg[2]
         -- self._tex_leftTime.text = arg[3]
-        self._tex_LeftCard.text = string.format("剩余%d张牌", arg[3])
+        self._tex_LeftCard.text = string.format("余%d张", arg[3])
         -- self:UpdateRoomInfo()
         local info = self._player_card_info[self:GetPos(seat)]
         info:UpdateHandCard(true)
@@ -938,7 +938,7 @@ function M:ReloadRoom(bskip)
 
     if bskip == nil or bskip == false then
         self:UpdateCardBox(self:GetPos(room.curren_outcard_seat))
-        self._tex_LeftCard.text = string.format("剩余%d张牌", room.left_count)
+        self._tex_LeftCard.text = string.format("余%d张", room.left_count)
         self:UpdateRound()
     end
 end

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

@@ -272,7 +272,7 @@ function M:CopyLastStep(index)
 end
 
 function M:UpdateLeftCard(num)
-	self._tex_LeftCard.text = "剩余 " .. num .. " 张牌"
+	self._tex_LeftCard.text = "余" .. num .. "张"
 end
 
 function M:UpdateCardBox(seat)
@@ -287,7 +287,7 @@ function M:UpdateCardBox(seat)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

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

@@ -387,7 +387,7 @@ function M:OnFangziAction(...)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua

@@ -143,7 +143,7 @@ function M:IsShowGangZi(btn, isShow)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 
@@ -277,7 +277,7 @@ function M:EventInit()
         local seat = arg[1]
         local card = arg[2]
         -- self._tex_leftTime.text = arg[3]
-        self._tex_LeftCard.text = string.format("剩余%d张牌", arg[3])
+        self._tex_LeftCard.text = string.format("余%d张", arg[3])
         -- self:UpdateRoomInfo()
         local info = self._player_card_info[self:GetPos(seat)]
         info:UpdateHandCard(true)
@@ -930,7 +930,7 @@ function M:ReloadRoom(bskip)
 
     if bskip == nil or bskip == false then
         self:UpdateCardBox(self:GetPos(room.curren_outcard_seat))
-        self._tex_LeftCard.text = string.format("剩余%d张牌", room.left_count)
+        self._tex_LeftCard.text = string.format("余%d张", room.left_count)
         self:UpdateRound()
     end
 end

lua_probject/extend_project/extend/majiang/jinxi/EXPlayBackView.lua

@@ -272,7 +272,7 @@ function M:CopyLastStep(index)
 end
 
 function M:UpdateLeftCard(num)
-	self._tex_LeftCard.text = "剩余 " .. num .. " 张牌"
+	self._tex_LeftCard.text = "余" .. num .. "张"
 end
 
 function M:UpdateCardBox(seat)
@@ -287,7 +287,7 @@ function M:UpdateCardBox(seat)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua

@@ -392,7 +392,7 @@ function M:OnFangziAction(...)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua

@@ -142,7 +142,7 @@ function M:IsShowGangZi(btn, isShow)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 
@@ -277,7 +277,7 @@ function M:EventInit()
         local seat = arg[1]
         local card = arg[2]
         -- self._tex_leftTime.text = arg[3]
-        self._tex_LeftCard.text = string.format("剩余%d张牌", arg[3])
+        self._tex_LeftCard.text = string.format("余%d张", arg[3])
         -- self:UpdateRoomInfo()
         local info = self._player_card_info[self:GetPos(seat)]
         info:UpdateHandCard(true)
@@ -933,7 +933,7 @@ function M:ReloadRoom(bskip)
 
     if bskip == nil or bskip == false then
         self:UpdateCardBox(self:GetPos(room.curren_outcard_seat))
-        self._tex_LeftCard.text = string.format("剩余%d张牌", room.left_count)
+        self._tex_LeftCard.text = string.format("余%d张", room.left_count)
         self:UpdateRound()
     end
 end

lua_probject/extend_project/extend/majiang/lichuan/EXPlayBackView.lua

@@ -272,7 +272,7 @@ function M:CopyLastStep(index)
 end
 
 function M:UpdateLeftCard(num)
-    self._tex_LeftCard.text = "剩余 " .. num .. " 张牌"
+    self._tex_LeftCard.text = "余" .. num .. "张"
 end
 
 function M:UpdateCardBox(seat)
@@ -287,7 +287,7 @@ function M:UpdateCardBox(seat)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua

@@ -417,7 +417,7 @@ function M:OnFangziAction(...)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua

@@ -141,7 +141,7 @@ function M:IsShowGangZi(btn, isShow)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 
@@ -275,7 +275,7 @@ function M:EventInit()
         local seat = arg[1]
         local card = arg[2]
         -- self._tex_leftTime.text = arg[3]
-        self._tex_LeftCard.text = string.format("剩余%d张牌", arg[3])
+        self._tex_LeftCard.text = string.format("余%d张", arg[3])
         -- self:UpdateRoomInfo()
         local info = self._player_card_info[self:GetPos(seat)]
         info:UpdateHandCard(true)
@@ -931,7 +931,7 @@ function M:ReloadRoom(bskip)
 
     if bskip == nil or bskip == false then
         self:UpdateCardBox(self:GetPos(room.curren_outcard_seat))
-        self._tex_LeftCard.text = string.format("剩余%d张牌", room.left_count)
+        self._tex_LeftCard.text = string.format("余%d张", room.left_count)
         self:UpdateRound()
     end
 end

lua_probject/extend_project/extend/majiang/nancheng/EXPlayBackView.lua

@@ -272,7 +272,7 @@ function M:CopyLastStep(index)
 end
 
 function M:UpdateLeftCard(num)
-	self._tex_LeftCard.text = "剩余 " .. num .. " 张牌"
+	self._tex_LeftCard.text = "余" .. num .. "张"
 end
 
 function M:UpdateCardBox(seat)
@@ -287,7 +287,7 @@ function M:UpdateCardBox(seat)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua

@@ -392,7 +392,7 @@ function M:OnFangziAction(...)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
   <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"/>
@@ -10,7 +10,7 @@
   <controller name="witness" pages="0,,1," selected="0"/>
   <controller name="voice" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n193_o4nh" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1219,384" size="435,73"/>
+    <component id="n193_o4nh" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1209,328" size="435,73"/>
     <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1281,-296" pivot="0.5,0.5">
       <gearDisplay controller="state" pages="1,3"/>
       <gearXY controller="3d" pages="0,1" values="1281,-296|603,254"/>
@@ -125,23 +125,23 @@
     <group id="n179_eqmd" name="center_text" xy="418,489" size="1696,172" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,921" size="153,120">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,808" size="153,120">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0,1,2" values="1189,921|100,808|1183,921" default="1183,921"/>
       <gearSize controller="state" pages="0,1" values="153,120,1,1|153,120,1,1" default="144,144,1,1"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="739,916" size="153,132">
+    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="56,796" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="1,3,4" values="56,796|73,784|71,774" default="739,916"/>
       <relation target="n118_pkx5" sidePair="right-left,top-top"/>
     </component>
-    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,223" size="153,132">
+    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1834,63" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0,1,2" values="1189,223|1834,63|1188,274" default="1188,909"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1886,538" size="153,132">
+    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1819,37" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="0,1,3,4" values="1886,538|1819,37|1740,46|1752,62" default="1192,928"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1489,6 +1489,10 @@
     <component id="f8c31ej" name="com_hePaiEffect.xml" path="/image/"/>
     <movieclip id="f8c31a" name="xingxing.jta" path="/"/>
     <image id="f8c31ek" name="img_card_arrow.png" path="/images/"/>
+    <component id="q0vz1el" name="com_gameInfoWindow.xml" path="/Main_new/GameInfoWindow/" exported="true"/>
+    <image id="q0vz1em" name="bg 5.png" path="/Main_new/Image/"/>
+    <image id="q0vz1en" name="CommonRes_3 5.png" path="/Main_new/Image/"/>
+    <component id="q0vz1ep" name="btn_quit.xml" path="/Main_new/GameInfoWindow/Component/"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>