回退跑得快版本前同步

lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua

@@ -86,6 +86,23 @@ function FamilyNumberRecord.New(root, page)
         self._data_leftTime = os.time(timeTable) - index * 86400
         self._data_rightTime = os.time(timeTable) - index * 86400 + 86399
         self:OnClickSortType()
+        fgCtr:FG_GetConsumeStat(group_id, self._data_leftTime, self._data_rightTime, function(res)
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode, "获取总信息失败")
+            else
+                local res_data = res.Data
+                self._view:GetChild('text_residueDiamond').text = res_data.diamo
+                text_allRound.text = res_data.round
+                text_winNum.text = res_data.win_count
+                text_useDiamond.text = res_data.diamo_cost / 100
+                self.MJScore = tonumber(res.Data.mj_score)
+                self.PKScore = tonumber(res.Data.pk_score)
+                self.text_score_majiang.text = 0 - self.MJScore
+                self.text_score_poker.text = 0 - self.PKScore
+                self.ctr_limitDay_isReverting = true
+                ctr_limitDay.selectedIndex = res_data.dayType - 1
+            end
+        end)
     end)
 
     ctr_sort.onChanged:Set(function(context)

lua_probject/base_project/Game/View/FamilyView.lua

@@ -597,8 +597,6 @@ function M:OnEnterGroupCallBack()
 end
 
 function M:UpdateFamilyRoom(fgCtr, id)
-    ViewUtil.ShowModalWait(self._root_view, "正在加载房间列表中......")
-
     local list_room = self._view:GetChild('list_room')
     list_room:SetVirtual()
     local playList = self._group.playList
@@ -747,7 +745,6 @@ function M:UpdateFamilyRoom(fgCtr, id)
     if self._view_PlayEditView then
         self._view_PlayEditView:Refalsh(self._group.id)
     end
-    ViewUtil.CloseModalWait()
 end
 
 --房间渲染

lua_probject/base_project/Game/View/LobbyView.lua

@@ -155,10 +155,10 @@ function M:InitView(url)
 
     local btn_customerService = self._view:GetChild("btn_customerService")
     btn_customerService.onClick:Add(function()
-        ViewUtil.ShowModalWait(self._root_view, "正在跳转微信中......")
+        ViewUtil.ShowModalWait2(self._root_view, 0.01)
         coroutine.start(function()
             coroutine.wait(3)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             ViewUtil.ShowBannerOnScreenCenter("微信跳转失败")
         end)
     end)

lua_probject/base_project/Game/View/PlayerInfoView2.lua

@@ -372,6 +372,7 @@ function M:AddMarkToHead(com, key)
     self._view:AddChild(com)
     com.touchable = false
     com.xy = self:GetHeadCenter()
+    com.y = 0
 end
 
 -- 动态移除组件

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

@@ -305,7 +305,7 @@ function M:OnEventFzAction(evt_data)
         end
 
         p.hand_left_count = p.hand_left_count - remove_num
-        if from_seat ~= p.seat then
+        if from_seat ~= p.seat and ftype ~= FZType.Gang_Peng then
             -- if (fz.Type == FZType.Chi) then card = actice_card end
             local fp = _room:GetPlayerBySeat(from_seat)
             table.remove(fp.outcard_list, #fp.outcard_list)

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

@@ -193,10 +193,9 @@ function M:LoadConfigToDetailOnlyPlay(data, hpdata)
 
     local returnString = ""
     if hpData then
-        returnString = string.format("%s倍,", hpData.times / 1000)
+        returnString = string.format("%s倍", hpData.times / 1000)
     end
 
-    returnString = string.format("%s人数%s人", returnString, configData.maxPlayers)
     if configData.zimo then
         returnString = string.format("%s,%s", returnString, configData.zimo == 0 and "可点炮,可自摸" or "必须自摸")
     end
@@ -244,8 +243,38 @@ function M:LoadConfigToDetail(data, hpdata)
     end
 
     local returnString = ""
+    if hpData then
+        returnString = string.format("%s倍,", hpData.times / 1000)
+    end
 
-    returnString = returnString .. self:LoadConfigToDetailOnlyPlay(data, hpdata)
+    returnString = string.format("%s人数%s人", returnString, configData.maxPlayers)
+    if configData.zimo then
+        returnString = string.format("%s,%s", returnString, configData.zimo == 0 and "可点炮,可自摸" or "必须自摸")
+    end
+    if configData.shaozhuang then
+        returnString = string.format("%s%s", returnString, configData.shaozhuang == 0 and ",不烧庄" or ",烧庄")
+    end
+    if configData.fengding then
+        local matString = "%s%s"
+        if configData.fengding == 0 then
+            returnString = string.format(matString, returnString, ",封顶20炮")
+        else
+            returnString = string.format(matString, returnString, ",不封顶")
+        end
+    end
+    if configData.TianDiHu then
+        returnString = string.format("%s%s", returnString, configData.TianDiHu == 0 and ",天地胡玩法" or ",没有天地胡")
+    end
+    if configData.jiangma then
+        returnString = string.format("%s,%s马", returnString,
+            configData.jiangma == 0 and "不奖" or string.format("奖%s", configData.jiangma * 2))
+    end
+    if configData.zikechengshun then
+        returnString = string.format("%s%s", returnString, configData.zikechengshun == 0 and ",字可成顺" or ",字不可成顺")
+    end
+    if configData.zhuangfenfanbei then
+        returnString = string.format("%s%s", returnString, configData.zikechengshun == 0 and ",庄家积分翻倍" or ",庄家积分不翻倍")
+    end
 
     returnString = returnString .. IGameInfo.LoadConfigToDetail(self, configData, hpData)
 

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

@@ -219,6 +219,7 @@ function M:EventInit()
         self:RemoveCursor()
         self._state.selectedIndex = 1
         self:ShowJing()
+        -- self._laiziMove:Play()
         local list = _room.player_list
         for i = 1, #list do
             local p = list[i]

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

@@ -306,7 +306,7 @@ function M:OnEventFzAction(evt_data)
         end
 
         p.hand_left_count = p.hand_left_count - remove_num
-        if from_seat ~= p.seat then
+        if from_seat ~= p.seat and ftype ~= FZType.Gang_Peng then
             -- if (fz.Type == FZType.Chi) then card = actice_card end
             local fp = _room:GetPlayerBySeat(from_seat)
             table.remove(fp.outcard_list, #fp.outcard_list)

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

@@ -189,10 +189,9 @@ function M:LoadConfigToDetailOnlyPlay(data, hpdata)
 
     local returnString = ""
     if hpData then
-        returnString = string.format("%s倍,", hpData.times / 1000)
+        returnString = string.format("%s倍", hpData.times / 1000)
     end
 
-    returnString = string.format("%s人数%s人", returnString, configData.maxPlayers)
     if configData.zimo then
         returnString = string.format("%s,%s", returnString, configData.zimo == 0 and "可点炮,可自摸" or "必须自摸")
     end
@@ -239,8 +238,37 @@ function M:LoadConfigToDetail(data, hpdata)
     end
 
     local returnString = ""
+    if hpData then
+        returnString = string.format("%s倍,", hpData.times / 1000)
+    end
 
-    returnString = returnString .. self:LoadConfigToDetailOnlyPlay(data, hpdata)
+    returnString = string.format("%s人数%s人", returnString, configData.maxPlayers)
+    if configData.zimo then
+        returnString = string.format("%s,%s", returnString, configData.zimo == 0 and "可点炮,可自摸" or "必须自摸")
+    end
+    if configData.fengding then
+        local matString = "%s,%s"
+        if configData.fengding == 0 then
+            returnString = string.format(matString, returnString, "封顶20炮")
+        elseif configData.fengding == 1 then
+            returnString = string.format(matString, returnString, "封顶10炮")
+        else
+            returnString = string.format(matString, returnString, "不封顶")
+        end
+    end
+    if configData.jiangma then
+        returnString = string.format("%s,%s马", returnString,
+            configData.jiangma == 0 and "不奖" or string.format("奖%s", configData.jiangma * 2))
+    end
+    if configData.gangjiangma then
+        returnString = string.format("%s%s", returnString, configData.gangjiangma == 0 and ",杠算奖马" or ",杠不算奖马")
+    end
+    if configData.sanjingjiangma then
+        returnString = string.format("%s%s", returnString, configData.sanjingjiangma == 0 and ",三精算奖马" or ",三精不算奖马")
+    end
+    if configData.zikechengshun then
+        returnString = string.format("%s%s", returnString, configData.zikechengshun == 0 and ",字可成顺" or ",字不可成顺")
+    end
 
     returnString = returnString .. IGameInfo.LoadConfigToDetail(self, configData, hpData)
 

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

@@ -219,6 +219,7 @@ function M:EventInit()
         self:RemoveCursor()
         self._state.selectedIndex = 1
         self:ShowJing()
+        self._laiziMove:Play()
         local list = _room.player_list
         for i = 1, #list do
             local p = list[i]

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

@@ -174,11 +174,9 @@ function M:LoadConfigToDetailOnlyPlay(data, hpdata)
 
     local returnString = ""
     if hpData then
-        returnString = string.format("%s倍,", hpData.times / 1000)
+        returnString = string.format("%s倍", hpData.times / 1000)
     end
 
-    returnString = string.format("%s人数%s人", returnString, configData.maxPlayers)
-
     if configData.zimo then
         returnString = string.format("%s,%s", returnString, configData.zimo == 0 and "可点炮,可自摸" or "必须自摸")
     end
@@ -205,8 +203,18 @@ function M:LoadConfigToDetail(data, hpdata)
     end
 
     local returnString = ""
+    if hpData then
+        returnString = string.format("%s倍,", hpData.times / 1000)
+    end
 
-    returnString = returnString .. self:LoadConfigToDetailOnlyPlay(data, hpdata)
+    returnString = string.format("%s人数%s人", returnString, configData.maxPlayers)
+
+    if configData.zimo then
+        returnString = string.format("%s,%s", returnString, configData.zimo == 0 and "可点炮,可自摸" or "必须自摸")
+    end
+    if configData.jingbibo then
+        returnString = string.format("%s,%s", returnString, configData.jingbibo == 1 and "有精必博" or "有精可胡")
+    end
 
     returnString = returnString .. IGameInfo.LoadConfigToDetail(self, configData, hpData)
 

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

@@ -219,6 +219,7 @@ function M:EventInit()
         self._state.selectedIndex = 1
         self:ShowJing()
         local list = _room.player_list
+        self._laiziMove:Play()
         for i = 1, #list do
             local p = list[i]
             local info = self._player_info[self:GetPos(p.seat)]

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

@@ -306,7 +306,7 @@ function M:OnEventFzAction(evt_data)
         end
 
         p.hand_left_count = p.hand_left_count - remove_num
-        if from_seat ~= p.seat then
+        if from_seat ~= p.seat and ftype ~= FZType.Gang_Peng then
             -- if (fz.Type == FZType.Chi) then card = actice_card end
             local fp = _room:GetPlayerBySeat(from_seat)
             table.remove(fp.outcard_list, #fp.outcard_list)

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

@@ -202,11 +202,9 @@ function M:LoadConfigToDetailOnlyPlay(data, hpdata)
 
     local returnString = ""
     if hpData then
-        returnString = string.format("%s倍,", hpData.times / 1000)
+        returnString = string.format("%s倍", hpData.times / 1000)
     end
 
-    returnString = string.format("%s人数%s人", returnString, configData.maxPlayers)
-
     if configData.zimo then
         returnString = string.format("%s,%s", returnString, configData.zimo == 0 and "可点炮,可自摸" or "必须自摸")
     end
@@ -252,8 +250,39 @@ function M:LoadConfigToDetail(data, hpdata)
         end
     end
     local returnString = ""
+    if hpData then
+        returnString = string.format("%s倍,", hpData.times / 1000)
+    end
 
-    returnString = returnString .. self:LoadConfigToDetailOnlyPlay(data, hpdata)
+    returnString = string.format("%s人数%s人", returnString, configData.maxPlayers)
+
+    if configData.zimo then
+        returnString = string.format("%s,%s", returnString, configData.zimo == 0 and "可点炮,可自摸" or "必须自摸")
+    end
+    if configData.shaozhuang then
+        returnString = string.format("%s,%s", returnString, configData.shaozhuang == 0 and "不烧庄" or "烧庄")
+    end
+    if configData.fengding then
+        local matString = "%s,%s"
+        if configData.fengding == 0 then
+            returnString = string.format(matString, returnString, "封顶20炮")
+        else
+            returnString = string.format(matString, returnString, "不封顶")
+        end
+    end
+    if configData.jiangma then
+        returnString = string.format("%s,%s马", returnString,
+            configData.jiangma == 0 and "不奖" or string.format("奖%s", configData.jiangma * 2))
+    end
+    if configData.zuoma then
+        returnString = string.format("%s,%s", returnString, configData.zuoma == 0 and "庄家坐马" or "庄家不坐马")
+    end
+    if configData.tuoguan then
+        returnString = string.format("%s,%s", returnString, configData.zhuanwan == 0 and "大转弯" or "小转弯")
+    end
+    if configData.jiahu then
+        returnString = string.format("%s,%s", returnString, configData.jiahu == 0 and "算假胡" or "不算假胡")
+    end
 
     returnString = returnString .. IGameInfo.LoadConfigToDetail(self, configData, hpData)
 

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

@@ -217,6 +217,7 @@ function M:EventInit()
         self:RemoveCursor()
         self._state.selectedIndex = 1
         self:ShowJing()
+        -- self._laiziMove:Play()
         local list = _room.player_list
         for i = 1, #list do
             local p = list[i]

lua_probject/main_project/main/majiang/MJMainView.lua

@@ -224,6 +224,8 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
     local gamePlay = mode:LoadConfigToDetailOnlyPlay(json.encode(_room.room_config.config),
         json.encode(_room.room_config.config.hpData))
     self._view:GetChild('wanfa_text').text = gamePlay
+
+    self._laiziMove = self._view:GetTransition('laiziMove')
 end
 
 function M:ClickSetting()

lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua

@@ -538,11 +538,12 @@ function M:ShowHuCard(card, flag_isme)
     self._ctr_getCard.selectedIndex = 1
 
     if flag_isme then
+        self:fillCard2(btn_card, self._viewText_cardInfo['Out_Card'], card, 1)
+
         self._view_getCard:GetChildAt(0):GetController('showhang').selectedIndex = 1
         self._view_getCard:GetChildAt(0):GetController('special_jing').selectedIndex = self._view_getCard:GetChildAt(0)
             :GetController('jing').selectedIndex
         self._view_getCard:GetChildAt(0):GetController('jing').selectedIndex = 0
-        self:fillCard2(btn_card, self._viewText_cardInfo['Out_Card'], card, 1)
     else
         self:fillCard2(btn_card, self._viewText_cardInfo['Hand_Card'], card, 1)
     end

lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView.lua

@@ -331,7 +331,7 @@ function M:ClearChoose()
     if self._click_index and self._click_index ~= -1 then
         self:ChangeMarkOutCards("")
     end
-    if self._flag_seletedGet and self._flag_seletedGet ~= -1 then
+    if self._flag_seletedGet and self._flag_seletedGet ~= -1 and self._view_getCard and self._view_getCard.numItems > 0 then
         self:ChangeMarkOutCards("")
     end
     self._click_index = -1

lua_probject/main_project/main/majiang/MJWitnessView.lua

@@ -57,6 +57,8 @@ function M:InitView()
     local gamePlay = mode:LoadConfigToDetailOnlyPlay(json.encode(room.room_config.config),
         json.encode(room.room_config.config.hpData))
     self._view:GetChild('wanfa_text').text = gamePlay
+
+    self._laiziMove = self._view:GetTransition('laiziMove')
 end
 
 function M:ClickSetting()
@@ -99,6 +101,7 @@ function M:EventInit()
 
     _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...)
         self:ShowJing()
+        self._laiziMove:Play()
         if self._clearingView then
             self._clearingView:Destroy()
             self._clearingView = nil
@@ -111,6 +114,8 @@ function M:EventInit()
                 local card_info = self._player_card_info[self:GetPos(p.seat)]
                 card_info:Clear()
                 card_info:UpdateHandCardWitness()
+                --发牌的时候清理一遍
+                p.outcard_list = {}
             end
         else
             local list = _room.player_list
@@ -123,6 +128,8 @@ function M:EventInit()
                 local card_info = self._player_card_info[self:GetPos(p.seat)]
                 card_info:Clear()
                 card_info:UpdateHandCardWitness()
+                --发牌的时候清理一遍
+                p.outcard_list = {}
             end
         end
         self:UpdateRound()

wb_new_ui/assets/Common/GlobalModalWaiting_jiangxi.xml

@@ -2,8 +2,8 @@
 <component size="1751,1001" extention="Button">
   <displayList>
     <graph id="n1_lwcl" name="n1" xy="0,0" size="1751,1001" visible="false" type="rect" lineSize="0" fillColor="#0d000000"/>
-    <component id="n8_xx1c" name="n8" src="xx1c7jct" fileName="component/loading2.xml" xy="757,376" size="236,248" group="n7_f86r" aspect="true"/>
-    <group id="n7_f86r" name="n7" xy="757,376" size="236,248" advanced="true">
+    <component id="n8_xx1c" name="n8" src="xx1c7jct" fileName="component/loading2.xml" xy="804,429" group="n7_f86r" aspect="true"/>
+    <group id="n7_f86r" name="n7" xy="804,429" size="142,142" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
   </displayList>

wb_new_ui/assets/Common/component/loading2.xml

@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="99,104">
+<component size="142,142">
   <displayList>
-    <image id="n6_jd84" name="n6" src="f86rhxl" fileName="font/images/加载圈(1).png" xy="17,23" pivot="0.5,0.5">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <image id="n5_jd84" name="n5" src="f86rhxk" fileName="font/images/光.png" xy="0,0" pivot="0.5,0.5" blend="add">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    <image id="n7_n9qr" name="n7" src="n9qr7jcu" fileName="font/images/Ellipse 60.png" xy="0,0"/>
+    <image id="n9_n9qr" name="n9" src="n9qr7jcw" fileName="font/images/Ellipse 61(1).png" xy="0,0" pivot="0.5,0.5" size="142,142" rotation="90" fillMethod="radial360" fillAmount="23"/>
   </displayList>
   <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
-    <item time="0" type="Alpha" target="n5_jd84" tween="true" startValue="0" endValue="0.94" duration="35"/>
-    <item time="0" type="Alpha" target="n6_jd84" tween="true" startValue="1" endValue="1" duration="18"/>
-    <item time="0" type="Rotation" target="n5_jd84" tween="true" startValue="0" endValue="720" duration="78"/>
-    <item time="0" type="Rotation" target="n6_jd84" tween="true" startValue="0" endValue="720" duration="78"/>
-    <item time="35" type="Alpha" target="n5_jd84" tween="true" startValue="0.94" endValue="0" duration="43"/>
-    <item time="54" type="Alpha" target="n6_jd84" tween="true" startValue="1" endValue="1" duration="24"/>
+    <item time="0" type="Rotation" target="n9_n9qr" tween="true" startValue="90" endValue="180" duration="6" ease="Linear"/>
+    <item time="6" type="Rotation" target="n9_n9qr" tween="true" startValue="180" endValue="270" duration="6" ease="Linear"/>
+    <item time="12" type="Rotation" target="n9_n9qr" tween="true" startValue="270" endValue="360" duration="6" ease="Linear"/>
+    <item time="18" type="Rotation" target="n9_n9qr" tween="true" startValue="360" endValue="450" duration="5" ease="Linear"/>
+    <item time="24" type="Rotation" target="n9_n9qr" value="90"/>
   </transition>
 </component>

wb_new_ui/assets/Common/package.xml

@@ -2128,6 +2128,9 @@
     <image id="xx1c7jcr" name="Rectangle 446.png" path="/component/tuoguan/"/>
     <component id="xx1c7jcs" name="GlobalModalWaiting_jiangxi.xml" path="/" exported="true"/>
     <component id="xx1c7jct" name="loading2.xml" path="/component/"/>
+    <image id="n9qr7jcu" name="Ellipse 60.png" path="/font/images/"/>
+    <image id="n9qr7jcv" name="Ellipse 61.png" path="/font/images/"/>
+    <image id="n9qr7jcw" name="Ellipse 61(1).png" path="/font/images/"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048">
     <atlas name="默认" index="0"/>

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" pivot="0.5,0.5" designImage="ui://v0j9abjyj6yy1fr" designImageAlpha="35">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="2"/>
   <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"/>
@@ -49,14 +49,14 @@
       <gearXY controller="action" pages="2,0,1" values="8808,794|-16242,794|5853,170"/>
       <Button icon="ui://v0j9abjygq7m48"/>
     </component>
-    <component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2737,480" group="n36_k3io" visible="false">
+    <component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2736,480" group="n36_k3io" visible="false">
       <Button icon="ui://v0j9abjygq7m49"/>
     </component>
-    <component id="n104_mncc" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2327,487" group="n36_k3io" scale="0.9,1">
+    <component id="n104_mncc" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2326,487" group="n36_k3io" scale="0.9,1">
       <gearDisplay controller="action" pages="1"/>
       <Button icon="ui://v0j9abjygq7m4i"/>
     </component>
-    <group id="n36_k3io" name="n36" xy="-2737,480" size="11812,414" visible="false" advanced="true">
+    <group id="n36_k3io" name="n36" xy="-2736,480" size="11811,414" visible="false" advanced="true">
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>
     <component id="n69_l2u4" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
@@ -100,9 +100,6 @@
       <gearDisplay controller="action" pages="0"/>
       <relation target="n125_pkx5" sidePair="top-bottom"/>
     </component>
-    <component id="n132_swus" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="405,25" size="115,121" visible="false" touchable="false">
-      <relation target="n155_gi99" sidePair="left-left"/>
-    </component>
     <text id="n176_eqmd" name="remaining_card" xy="748,516" size="383,73" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#f5f5dd" align="right" vAlign="middle" letterSpacing="5" autoSize="none" text="余98张">
       <gearDisplay controller="state" pages="1,3"/>
     </text>
@@ -117,6 +114,9 @@
     <group id="n179_eqmd" name="center_text" xy="281,516" size="1963,266" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
+    <component id="n132_swus" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="405,25" size="115,121" visible="false" touchable="false">
+      <relation target="n155_gi99" sidePair="left-left"/>
+    </component>
     <component id="n159_ckvb" name="Comp_ConterBox" src="gjnb107" fileName="Main_new/Main/Comp_ConterBox.xml" xy="1102,406" size="335,270" group="n169_gmbn">
       <gearDisplay controller="state" pages="1,3,4"/>
       <relation target="" sidePair="center-center"/>
@@ -156,7 +156,7 @@
       <gearDisplay controller="state" pages="0,2"/>
       <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="2701,486" size="153,132">
+    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="2007,876" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="0,1,3,4" values="2701,486|1866,33|1867,35|1868,34" default="2007,876"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>
@@ -277,4 +277,10 @@
     <group id="n59_v38k" name="huifang" xy="0,854" size="2532,165" group="n209_lvks"/>
     <group id="n209_lvks" name="playback" xy="0,35" size="2532,984"/>
   </displayList>
+  <transition name="laiziMove" frameRate="60">
+    <item time="0" type="Visible" target="n132_swus" value="false"/>
+    <item time="1" type="Scale" target="n132_swus" tween="true" startValue="0.5,0.5" endValue="1,1" duration="29" ease="Linear"/>
+    <item time="1" type="Visible" target="n132_swus" value="true"/>
+    <item time="1" type="XY" target="n132_swus" tween="true" startValue="1209,524" endValue="405,25" duration="29" ease="Linear"/>
+  </transition>
 </component>

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="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"/>
@@ -40,14 +40,14 @@
       <gearXY controller="action" pages="2,0,1" values="8810,794|-16246,794|5853,170"/>
       <Button icon="ui://v0j9abjygq7m48"/>
     </component>
-    <component id="n228_ogwn" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2742,480" group="n230_ogwn" visible="false">
+    <component id="n228_ogwn" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2741,480" group="n230_ogwn" visible="false">
       <Button icon="ui://v0j9abjygq7m49"/>
     </component>
-    <component id="n229_ogwn" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2332,487" group="n230_ogwn" scale="0.9,1">
+    <component id="n229_ogwn" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2331,487" group="n230_ogwn" scale="0.9,1">
       <gearDisplay controller="action" pages="1"/>
       <Button icon="ui://v0j9abjygq7m4i"/>
     </component>
-    <group id="n230_ogwn" name="n230" xy="-2742,480" size="11819,414" visible="false" advanced="true">
+    <group id="n230_ogwn" name="n230" xy="-2741,480" size="11818,414" visible="false" advanced="true">
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>
     <component id="n231_ogwn" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
@@ -141,7 +141,7 @@
     </component>
     <text id="n252_ogwn" name="text_roomId" xy="15,67" size="264,54" group="n253_ogwn" font="ui://27vd145bh35o7ika" fontSize="40" color="#ffffff" letterSpacing="4" text="房间:588568"/>
     <group id="n253_ogwn" name="top_left" xy="15,15" size="276,164"/>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,891" size="153,132">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="89,789" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0" values="1189,891" default="89,789"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
@@ -149,7 +149,7 @@
     <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,788" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
     </component>
-    <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1888,519" size="153,132">
+    <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2004,77" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0,1,2,3" values="1888,519|2004,77|2311,292|2314,294" default="1194,274"/>
       <relation target="" sidePair="middle-middle"/>
@@ -297,4 +297,10 @@
       <relation target="" sidePair="width-width,height-height"/>
     </component>
   </displayList>
+  <transition name="laiziMove" frameRate="60">
+    <item time="0" type="Visible" target="n248_ogwn" value="false"/>
+    <item time="1" type="Scale" target="n248_ogwn" tween="true" startValue="0.5,0.5" endValue="1,1" duration="29" ease="Linear"/>
+    <item time="1" type="Visible" target="n248_ogwn" value="true"/>
+    <item time="1" type="XY" target="n248_ogwn" tween="true" startValue="1208,524" endValue="405,25" duration="29" ease="Linear"/>
+  </transition>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml

@@ -310,4 +310,10 @@
       <relation target="" sidePair="width-width,height-height"/>
     </component>
   </displayList>
+  <transition name="laiziMove" frameRate="60">
+    <item time="0" type="Visible" target="n320_ogwn" value="false"/>
+    <item time="1" type="Scale" target="n320_ogwn" tween="true" startValue="0.5,0.5" endValue="1,1" duration="29" ease="Linear"/>
+    <item time="1" type="Visible" target="n320_ogwn" value="true"/>
+    <item time="1" type="XY" target="n320_ogwn" tween="true" startValue="1208,524" endValue="405,25" duration="29" ease="Linear"/>
+  </transition>
 </component>

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 874f3eb75ea63414daf4e3b3be3c88e4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleVariant: 

wb_unity_pro/Assets/StreamingAssets/init1_1.json

@@ -8,34 +8,34 @@
     "bundle": "extend/poker/runfast"
   },
   {
-    "ver": "1.0.47",
+    "ver": "1.0.49",
     "name": "南城麻将",
     "check": true,
-    "version": "1.0.47",
+    "version": "1.0.49",
     "game_id": "86",
     "bundle": "extend/majiang/nancheng"
   },
   {
-    "ver": "1.0.50",
+    "ver": "1.0.52",
     "name": "黎川麻将",
     "check": true,
-    "version": "1.0.50",
+    "version": "1.0.52",
     "game_id": "87",
     "bundle": "extend/majiang/lichuan"
   },
   {
-    "ver": "1.0.34",
+    "ver": "1.0.36",
     "name": "金溪麻将",
     "check": true,
-    "version": "1.0.34",
+    "version": "1.0.36",
     "game_id": "88",
     "bundle": "extend/majiang/jinxi"
   },
   {
-    "ver": "1.0.33",
+    "ver": "1.0.35",
     "name": "抚州麻将",
     "check": true,
-    "version": "1.0.33",
+    "version": "1.0.35",
     "game_id": "89",
     "bundle": "extend/majiang/fuzhou"
   }

wb_unity_pro/Assets/StreamingAssets/init2_1.json

@@ -1,109 +1,109 @@
 [
   {
     "lua_path": "/tolua_project,/base_project,/main_project",
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.8"
+    "version": "1.0.11"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "name": "common",
     "check": true,
     "bundle": "base/common",
-    "version": "1.0.8"
+    "version": "1.0.11"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "name": "login",
     "check": true,
     "bundle": "base/login",
-    "version": "1.0.8"
+    "version": "1.0.11"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "name": "lobby",
     "check": true,
     "bundle": "base/lobby",
-    "version": "1.0.8"
+    "version": "1.0.11"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
-    "version": "1.0.8"
+    "version": "1.0.11"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.8"
+    "version": "1.0.11"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.8"
+    "version": "1.0.11"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "name": "rank",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.11",
     "bundle": "base/rank"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "name": "main_majiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.11",
     "bundle": "base/main_majiang"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.11",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.11",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.8"
+    "version": "1.0.11"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "is_res": true,
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.8"
+    "version": "1.0.11"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.11",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.11",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.11",
     "bundle": "base/main_zipaimajiang"
   }
 ]