同步前提交

lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua

@@ -57,13 +57,6 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
     end)
 
     local bgWindow = self._view:GetChild('bgWindow')
-    if win_seat == room.self_player.seat then
-        bgWindow.text = "胜利"
-        bgWindow:GetController('bianhui').selectedIndex = 0
-    else
-        bgWindow.text = "失败"
-        bgWindow:GetController('bianhui').selectedIndex = 1
-    end
 
     -- self._view:GetController('win').selectedIndex = win_seat == room.self_player.seat and 1 or 0
     local rt = 1
@@ -135,6 +128,14 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
             obj:GetChild("score").text = jifen .. tili
         end
 
+        if info.seat == room.self_player.seat and roundScore>=0 then
+            bgWindow.text = "胜利"
+            bgWindow:GetController('bianhui').selectedIndex = 0
+        else
+            bgWindow.text = "失败"
+            bgWindow:GetController('bianhui').selectedIndex = 1
+        end
+
         local list_residue = obj:GetChild('list_residue')
         list_residue:RemoveChildrenToPool()
         for i, v in ipairs(info.handCards) do

wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info

@@ -15,9 +15,6 @@
     "n100_dnw9": {
       "collapsed": true
     },
-    "n82_l2u4": {
-      "collapsed": true
-    },
     "n107_go7q": {
       "hidden": true
     },

wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImage="ui://v0j9abjygq7m95">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
+  <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,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -11,45 +11,45 @@
     <text id="n116_u50h" name="text_playName" xy="1113,413" pivot="0.5,0" size="305,124" font="ui://27vd145bu50h7j1a" fontSize="120" autoClearText="true" text="1红中">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n72_l2u4" name="n21" xy="1260,543" size="40,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" bold="true" text="第">
+    <text id="n72_l2u4" name="n21" xy="1287,543" size="40,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" bold="true" text="第">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n76_l2u4" sidePair="left-right"/>
     </text>
-    <text id="n73_l2u4" name="n22" xy="1335,543" size="14,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" bold="true" text="/">
+    <text id="n73_l2u4" name="n22" xy="1362,543" size="14,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" bold="true" text="/">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n78_l2u4" sidePair="left-right"/>
     </text>
-    <text id="n74_l2u4" name="n23" xy="1388,543" size="40,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" bold="true" text="局">
+    <text id="n74_l2u4" name="n23" xy="1415,543" size="40,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" bold="true" text="局">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n79_l2u4" sidePair="left-right"/>
     </text>
-    <text id="n75_l2u4" name="n11" xy="1050,543" size="76,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" bold="true" text="剩余">
+    <text id="n75_l2u4" name="n11" xy="1077,543" size="76,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" bold="true" text="剩余">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n77_l2u4" sidePair="right-left"/>
     </text>
-    <text id="n76_l2u4" name="n12" xy="1175,543" size="76,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" bold="true" text="张牌">
+    <text id="n76_l2u4" name="n12" xy="1202,543" size="76,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" bold="true" text="张牌">
       <gearDisplay controller="state" pages="1,3"/>
     </text>
-    <text id="n77_l2u4" name="remaining_card" xy="1125,543" size="48,49" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990099" align="center" vAlign="middle" bold="true" text="77">
+    <text id="n77_l2u4" name="remaining_card" xy="1152,543" size="48,49" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990099" align="center" vAlign="middle" bold="true" text="77">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n76_l2u4" sidePair="right-left"/>
     </text>
-    <text id="n78_l2u4" name="tex_round1" xy="1304,543" size="26,49" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990066" align="center" vAlign="middle" bold="true" autoClearText="true" text="2">
+    <text id="n78_l2u4" name="tex_round1" xy="1331,543" size="26,49" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990066" align="center" vAlign="middle" bold="true" autoClearText="true" text="2">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n72_l2u4" sidePair="left-right"/>
     </text>
-    <text id="n79_l2u4" name="tex_round2" xy="1355,543" size="26,49" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990066" align="center" vAlign="middle" bold="true" autoClearText="true" text="8">
+    <text id="n79_l2u4" name="tex_round2" xy="1382,543" size="26,49" group="n80_l2u4" font="Microsoft YaHei" fontSize="36" color="#990066" align="center" vAlign="middle" bold="true" autoClearText="true" text="8">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n73_l2u4" sidePair="left-right"/>
     </text>
-    <group id="n80_l2u4" name="n80" xy="1050,543" size="378,49" group="n82_l2u4" advanced="true">
-      <relation target="n81_l2u4" sidePair="left-left,top-top"/>
+    <group id="n80_l2u4" name="n80" xy="1077,543" size="378,49" group="n82_l2u4" advanced="true">
+      <relation target="n81_l2u4" sidePair="center-center,top-top"/>
     </group>
-    <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1192,611" pivot="0.5,0.5" group="n82_l2u4" aspect="true" scale="1.3,1.3">
+    <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1202,611" pivot="0.5,0.5" group="n82_l2u4" aspect="true" scale="1.3,1.3">
       <gearDisplay controller="state" pages="1,3"/>
-      <gearXY controller="3d" pages="0,1" values="1192,611|603,254"/>
+      <gearXY controller="3d" pages="0,1" values="1202,611|603,254"/>
     </component>
-    <group id="n82_l2u4" name="n60" xy="1050,543" size="378,194" advanced="true">
+    <group id="n82_l2u4" name="n60" xy="1077,543" size="378,194" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n84_l2u4" name="btn_wxyqhy" src="gq7m1q" fileName="Main_style_2/component/room/btn_invite(1).xml" xy="1120,505" group="n85_l2u4">

wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_6.png.meta

@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: cac727a930346594a94c4b4dcb01454d
-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/main_zipai/1b67e95de3db97b52dfe810c7d35f1b7
-  assetBundleVariant: