热更画面更改

lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua

@@ -425,13 +425,11 @@ function M:EventInit()
                     -- info:ResetCards(card)
                     if seat == self._room.self_player.seat then
                         if seat == self._room.self_player.seat then
-                            local buttonData = info.outcard_button
+                            info.outcard_button.btn_card.touchable = true
-                            local context = {}
+                            info.outcard_button.btn_card.sortingOrder = 0
-                            context.sender = buttonData.btn_card
+                            info.outcard_button.btn_card:GetChild("icon").icon = self:getCardItem(
-                            context.sender.data = buttonData
+                                "ui://Main_RunBeard/201_", card)
-                            context.sender.y = -300
+                            info:UpdateHandCardsPos()
-                            context.sender.touchable = true
-                            info:__OnDragEnd(context)
                             info:UpdateIsOnClick(true)
                         end
                     end

wb_new_ui/.objs/metas/0khx14ar/e0py2.info

@@ -1,5 +1,8 @@
 {
   "objectStatus": {
+    "n2": {
+      "hidden": true
+    },
     "n28_thxk": {
       "hidden": true
     },
@@ -8,6 +11,9 @@
     },
     "n18_nld2": {
       "hidden": true
+    },
+    "n20_nld2": {
+      "hidden": true
     }
   },
   "adaptiveTest": true,

wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info

@@ -1,5 +1,8 @@
 {
   "objectStatus": {
+    "n48_cphv": {
+      "collapsed": true
+    },
     "n45_j34t": {
       "collapsed": true
     }

wb_new_ui/assets/Hotupdate/Version.xml

@@ -3,7 +3,7 @@
   <controller name="state" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n7_rtsl" name="n7" src="lwclq" fileName="denglu_bg_01.png" xy="-142,0">
-      <relation target="" sidePair="width-width%,height-height%,center-center"/>
+      <relation target="" sidePair="width-width,height-height,center-center"/>
     </image>
     <image id="n24_xn94" name="n24" src="xn9417" fileName="hall_girl_bg@2x.png" xy="355,106" visible="false">
       <relation target="" sidePair="center-center"/>
@@ -11,14 +11,16 @@
     <graph id="n18_nld2" name="n18" xy="-215,655" size="1772,100" visible="false" alpha="0.5" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </graph>
-    <text id="n2" name="tex_info" xy="214,600" size="906,54" group="n8_rtsl" font="Microsoft YaHei" fontSize="40" color="#ffffff" align="center" autoSize="shrink" bold="true" text="正在更新资源包。"/>
+    <text id="n2" name="tex_info" xy="214,600" size="906,54" group="n8_rtsl" visible="false" font="Microsoft YaHei" fontSize="40" color="#ffffff" align="center" autoSize="shrink" bold="true" text="正在更新资源包。"/>
-    <component id="n20_nld2" name="pb_progress" src="pcy012" fileName="commpoent/Slider1.xml" xy="629,487" size="95,95" group="n8_rtsl" aspect="true">
+    <component id="n20_nld2" name="pb_progress" src="pcy012" fileName="commpoent/Slider1.xml" xy="629,487" size="95,95" group="n8_rtsl" aspect="true" visible="false">
       <Slider value="100" max="100"/>
     </component>
-    <text id="n28_thxk" name="tex_value" xy="618,371" size="104,61" group="n8_rtsl" visible="false" font="Microsoft YaHei" fontSize="46" color="#ffffff" align="center" bold="true" text="80%">
+    <text id="n28_thxk" name="tex_value" xy="618,371" size="103,62" group="n8_rtsl" visible="false" font="Microsoft YaHei" fontSize="46" color="#ffffff" align="center" bold="true" text="80%">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <image id="n29_thxk" name="n29" src="thxk7i4y" fileName="images/Group 534.png" xy="365,96" group="n8_rtsl"/>
+    <image id="n29_thxk" name="n29" src="thxk7i4y" fileName="images/Group 534.png" xy="365,96" size="603,425" group="n8_rtsl">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
     <group id="n8_rtsl" name="n8" xy="214,96" size="906,558" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="bottom-bottom,center-center"/>
@@ -32,5 +34,15 @@
       <gearDisplay controller="state" pages="1"/>
       <relation target="" sidePair="bottom-bottom"/>
     </group>
+    <component id="n30_yvb2" name="GlobalModalWaiting" src="yvb27i4z" fileName="commpoent/GlobalModalWaiting.xml" xy="-208,-125">
+      <gearDisplay controller="state" pages="0"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
   </displayList>
+  <transition name="t0" autoPlay="true">
+    <item time="0" type="Scale" target="n29_thxk" tween="true" startValue="1,1" endValue="1.05,1.04" duration="12" ease="Linear"/>
+    <item time="12" type="Scale" target="n29_thxk" tween="true" startValue="1.05,1.04" endValue="1,1" duration="12" ease="Linear"/>
+    <item time="24" type="Scale" target="n29_thxk" tween="true" startValue="1,1" endValue="0.96,0.96" duration="12" ease="Linear"/>
+    <item time="36" type="Scale" target="n29_thxk" tween="true" startValue="0.96,0.96" endValue="1,1" duration="12" ease="Linear"/>
+  </transition>
 </component>

wb_new_ui/assets/Hotupdate/commpoent/GlobalModalWaiting.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-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="n4_9p4j" name="gcm_qiu" src="cjli6" fileName="UIPanel.xml" pkg="27vd145b" xy="872,465" size="1,1"/>
+    <image id="n6_f86r" name="n6" src="yvb27i50" fileName="commpoent/font/images/加载底(1).png" xy="396,442" size="897,117" group="n7_f86r"/>
+    <text id="n3_lwcl" name="title" xy="695,483" size="214,42" group="n7_f86r" fontSize="30" color="#ffffff" align="center" vAlign="middle" text="正在进入游戏中"/>
+    <component id="n5_j1s2" name="n5" src="yvb27i51" fileName="commpoent/component/loading.xml" xy="602,450" group="n7_f86r"/>
+    <group id="n7_f86r" name="n7" xy="396,442" size="897,117" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Hotupdate/commpoent/component/loading.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="99,104">
+  <displayList>
+    <image id="n2_jd84" name="n2" src="yvb27i52" fileName="images/图标.png" xy="20,25"/>
+    <image id="n6_jd84" name="n6" src="yvb27i53" fileName="images/加载圈(1).png" xy="17,23" pivot="0.5,0.5"/>
+    <image id="n5_jd84" name="n5" src="yvb27i54" fileName="images/光.png" xy="0,0" pivot="0.5,0.5" blend="add"/>
+  </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"/>
+  </transition>
+</component>

wb_new_ui/assets/Hotupdate/package.xml

@@ -24,6 +24,12 @@
     <image id="thxk7i4w" name="Ellipse 91.png" path="/images/"/>
     <image id="thxk7i4x" name="Union.png" path="/images/"/>
     <image id="thxk7i4y" name="Group 534.png" path="/images/"/>
+    <component id="yvb27i4z" name="GlobalModalWaiting.xml" path="/commpoent/" exported="true"/>
+    <image id="yvb27i50" name="加载底(1).png" path="/commpoent/font/images/"/>
+    <component id="yvb27i51" name="loading.xml" path="/commpoent/component/"/>
+    <image id="yvb27i52" name="图标.png" path="/commpoent/font/images/"/>
+    <image id="yvb27i53" name="加载圈(1).png" path="/commpoent/font/images/"/>
+    <image id="yvb27i54" name="光.png" path="/commpoent/font/images/"/>
   </resources>
   <publish name="Hotupdate" path="..\wb_unity_pro\Assets\Resources\base\embed\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Login/Main.xml

@@ -41,6 +41,5 @@
     <item time="12" type="Scale" target="n80_thxk" tween="true" startValue="1.05,1.04" endValue="1,1" duration="12" ease="Linear"/>
     <item time="24" type="Scale" target="n80_thxk" tween="true" startValue="1,1" endValue="0.96,0.96" duration="12" ease="Linear"/>
     <item time="36" type="Scale" target="n80_thxk" tween="true" startValue="0.96,0.96" endValue="1,1" duration="12" ease="Linear"/>
-    <item time="48" type="Scale" target="n80_thxk" value="1,1"/>
   </transition>
 </component>

wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml

@@ -6,12 +6,12 @@
   <controller name="jushu" pages="0,,1," selected="0"/>
   <controller name="bg_state" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <text id="n176_fgao" name="di_text" xy="473,11" size="450,51" font="Microsoft YaHei" fontSize="32" color="#330000" align="center" vAlign="middle" autoSize="none" strokeColor="#296137" text="123456789">
+    <text id="n176_fgao" name="di_text" xy="473,8" size="450,51" font="Microsoft YaHei" fontSize="32" color="#330000" align="center" vAlign="middle" autoSize="none" strokeColor="#296137" text="123456789">
       <gearDisplay controller="state" pages="0,1,2"/>
       <gearColor controller="bg_state" pages="0,1" values="#330000,#296137|#655c6a,#322e34" default="#367c7d,#235557"/>
       <relation target="" sidePair="center-center"/>
     </text>
-    <image id="n177_cbxl" name="n177" src="60xf1g2" fileName="component/Main/images/zipai3.png" xy="616,84">
+    <image id="n177_cbxl" name="n177" src="60xf1g2" fileName="component/Main/images/zipai3.png" xy="616,93">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="center-center"/>
     </image>
@@ -71,11 +71,11 @@
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="left-left"/>
     </component>
-    <component id="n31_h1uu" name="roominfo_panel" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="854,-30" size="461,97" group="n150_8th3" touchable="false">
+    <component id="n31_h1uu" name="roominfo_panel" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="449,2" size="461,97" group="n150_8th3" touchable="false">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <component id="n46_u4l2" name="btn_rule1" src="f55qvn" fileName="component/Main/component/Folder/component/phone_info/Btn_log.xml" xy="562,-92" size="157,4" group="n150_8th3" visible="false"/>
-    <group id="n150_8th3" name="n150" xy="0,-92" size="1315,163" advanced="true">
+    <group id="n150_8th3" name="n150" xy="0,-92" size="920,191" advanced="true">
       <relation target="" sidePair="left-left"/>
     </group>
     <image id="n152_8th3" name="n152" src="f55qvu" fileName="component/Main/images/di00.png" xy="377,-91" size="580,86" visible="false">
@@ -115,7 +115,7 @@
     <component id="n179_kxwj" name="btn_distance" src="kxwjhyc" fileName="component/gps/btn_distance_new.xml" pkg="27vd145b" xy="1248,262" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
     </component>
-    <text id="n27" name="remaining_card" xy="617,92" size="165,45" fontSize="32" color="#ffffff" align="center" autoSize="none" text="剩余20张">
+    <text id="n27" name="remaining_card" xy="617,101" size="165,45" fontSize="32" color="#ffffff" align="center" autoSize="none" text="剩余20张">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="center-center"/>
     </text>

wb_new_ui/assets/Main_RunBeard/component/Main/RoomInfoPanel1.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="320,80" initName="roominfo_panel">
   <displayList>
-    <text id="n1_h1uu" name="n1" xy="154,48" size="61,35" group="n5_qpk6" fontSize="25" color="#ffffff" bold="true" text="房号:"/>
+    <text id="n1_h1uu" name="n1" xy="144,48" size="79,44" group="n5_qpk6" fontSize="32" color="#ffffff" bold="true" text="房号:"/>
-    <text id="n2_h1uu" name="tex_roomid" xy="219,48" size="102,35" group="n5_qpk6" fontSize="25" color="#ffffff" bold="true" text="2345672"/>
+    <text id="n2_h1uu" name="tex_roomid" xy="219,48" size="130,44" group="n5_qpk6" fontSize="32" color="#ffffff" bold="true" text="2345672"/>
     <text id="n3_h1uu" name="tex_gametype" xy="175,4" size="149,40" group="n5_qpk6" visible="false" fontSize="25" color="#ffffff" autoSize="none" bold="true" text="湘乡告胡子                 "/>
     <text id="n4_h1uu" name="tex_roomconfig" xy="118,47" size="10,9" group="n5_qpk6" visible="false" fontSize="1" color="#ffffff" autoSize="none" text="                                 "/>
     <text id="n6_fc32" name="tex_times" xy="2,49" pivot="0,0.5" size="151,32" group="n5_qpk6" visible="false" fontSize="25" color="#ffffff" autoSize="none" text=""/>
-    <group id="n5_qpk6" name="n5" xy="2,4" size="322,79"/>
+    <group id="n5_qpk6" name="n5" xy="2,4" size="347,88"/>
   </displayList>
 </component>