同步

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

@@ -99,15 +99,17 @@ function M:RecordItemDetailRender(round, allDate, rdata, obj)
     for i = 1, #rdata do
         local obj2 = list:AddItemFromPool()
         obj2:GetChild('title').text = rdata[i].score
-        if allDate.applyDismisUserId and allDate.applyDismisUserId ~= "" then
-            if round == tonumber(allDate.round) then
+        if round == tonumber(allDate.round) and allDate.applyDismisUserId and allDate.applyDismisUserId ~= "null" then
             obj2:GetController('jiesan').selectedIndex = rdata[i].nick == allDate.applyDismisUserId and 1 or 2
-            end
+        else
+            obj2:GetController('jiesan').selectedIndex = 0
         end
     end
     if round == tonumber(allDate.round) then
-        obj:GetController('jiesan_mng').selectedIndex = (not allDate.applyDismisUserId or allDate.applyDismisUserId == "") and
+        obj:GetController('jiesan_mng').selectedIndex = (not allDate.applyDismisUserId or allDate.applyDismisUserId == "null") and
             1 or 0
+    else
+        obj:GetController('jiesan_mng').selectedIndex = 0
     end
 
     local btn_play = obj:GetChild("n10")

wb_new_ui/assets/Family/Record/Component/Item_record.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2328,150">
+  <controller name="jiesan_mng" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n0_slrk" name="n0" src="slrk7d34" fileName="Record/Image/Rectangle 182.png" xy="-11,-12" size="2349,170"/>
     <image id="n2_slrk" name="n2" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="162,12"/>
@@ -14,5 +15,9 @@
     </list>
     <component id="n9_slrk" name="n9" src="slrk7d39" fileName="Record/Component/btn_share.xml" xy="1896,39"/>
     <component id="n10_slrk" name="n10" src="slrk7d3a" fileName="Record/Component/btn_replay.xml" xy="2115,39"/>
+    <image id="n11_lvks" name="n11" src="lvks7d6b" fileName="Record/Image/guanliyuanjiesan.png" xy="0,0">
+      <gearDisplay controller="jiesan_mng" pages="1"/>
+      <relation target="" sidePair="middle-middle,left-left"/>
+    </image>
   </displayList>
 </component>

wb_new_ui/assets/Family/Record/Component/Item_score.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="800,150">
+  <controller name="jiesan" pages="0,,1,,2," selected="0"/>
   <displayList>
     <image id="n0_slrk" name="n0" src="slrk7d35" fileName="Record/Image/Rectangle 187.png" xy="0,12">
       <relation target="" sidePair="left-left"/>
@@ -7,5 +8,13 @@
     <text id="n1_slrk" name="title" xy="321,47" size="158,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#444444" align="center" vAlign="middle" autoSize="none" text="-9999">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
+    <image id="n2_lvks" name="n2" src="lvks7d6d" fileName="Record/Image/同意.png" xy="290,21">
+      <gearDisplay controller="jiesan" pages="2"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
+    <image id="n3_lvks" name="n3" src="lvks7d6c" fileName="Record/Image/解散.png" xy="289,21">
+      <gearDisplay controller="jiesan" pages="1"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
   </displayList>
 </component>

wb_new_ui/assets/Family/package.xml

@@ -399,6 +399,9 @@
     <image id="amfo7d68" name="Group 700.png" path="/Main/Image/" qualityOption="source" disableTrim="true"/>
     <image id="amfo7d69" name="Group 701.png" path="/Main/Image/" qualityOption="source" disableTrim="true"/>
     <image id="wbhh7d6a" name="juxing.png" path="/Main/Image/" exported="true" qualityOption="source" atlas="alone" duplicatePadding="true" disableTrim="true"/>
+    <image id="lvks7d6b" name="guanliyuanjiesan.png" path="/Record/Image/"/>
+    <image id="lvks7d6c" name="解散.png" path="/Record/Image/"/>
+    <image id="lvks7d6d" name="同意.png" path="/Record/Image/"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: d9f45c8ec791b144baf8a9663f8389b1
+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/family/b23cba4d4e164d6d5cb3cff916b9e0a4
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_wbhh7d6a.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_xqxr1er.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas_ksm6hoq.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/newgroup/d046279ddc055f308f8ad01da4806e9a
   assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas_f8c31a.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: extend/majiang/fuzhou/2da6f335ff400cb853dadc4ba58a8c70
   assetBundleVariant: 

wb_unity_pro/Assets/StreamingAssets/init1_1.json

@@ -24,34 +24,34 @@
     "bundle": "extend/poker2/suoha"
   },
   {
-    "ver": "1.0.32",
+    "ver": "1.0.33",
     "name": "南城麻将",
     "check": true,
-    "version": "1.0.32",
+    "version": "1.0.33",
     "game_id": "86",
     "bundle": "extend/majiang/nancheng"
   },
   {
-    "ver": "1.0.34",
+    "ver": "1.0.35",
     "name": "黎川麻将",
     "check": true,
-    "version": "1.0.34",
+    "version": "1.0.35",
     "game_id": "87",
     "bundle": "extend/majiang/lichuan"
   },
   {
-    "ver": "1.0.19",
+    "ver": "1.0.20",
     "name": "金溪麻将",
     "check": true,
-    "version": "1.0.19",
+    "version": "1.0.20",
     "game_id": "88",
     "bundle": "extend/majiang/jinxi"
   },
   {
-    "ver": "1.0.18",
+    "ver": "1.0.19",
     "name": "抚州麻将",
     "check": true,
-    "version": "1.0.18",
+    "version": "1.0.19",
     "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.6",
+    "ver": "1.0.11",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.6"
+    "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.9",
+    "ver": "1.0.11",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
-    "version": "1.0.9"
+    "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"
   }
 ]

wb_unity_pro/ProjectSettings/GraphicsSettings.asset

@@ -39,6 +39,7 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}