同步前提交

fk101/wb_new_ui/.objs/workspace.json

@@ -1,185 +1,17 @@
 {
-<<<<<<< HEAD
+  "libview.firstColumnWidth": 413,
-  "doc.openedDocs": [
-    "ui://niy3ldiwl9mn14"
-  ],
-  "libview.iconScale": 0,
-  "doc.activeDoc": "ui://niy3ldiwl9mn14",
-  "libview.currentGroup": "",
-  "libview.expandedNodes": [
-    "27vd145b",
-    "/",
-    "27vd145b",
-    "/conMui/",
-    "niy3ldiw",
-    "/",
-    "niy3ldiw",
-    "/component/",
-=======
-  "libview.firstColumnWidth": 356,
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://egnzysm7ffp36a",
-    "ui://egnzysm7ffp35h",
-    "ui://egnzysm7ffp36i",
-    "ui://egnzysm7ffp36o",
-    "ui://egnzysm7ffp370",
-    "ui://442j0uepygxga",
-    "ui://2zlli80mr6cyce9",
-    "ui://3z9lj55vjokmky",
-    "ui://v0j9abjygq7mgo",
-    "ui://4skil1l6by4o1i2",
-    "ui://27vd145bpgy941",
-    "ui://27vd145bko559b",
-    "ui://27vd145beeqmcgu",
-    "ui://27vd145beeqmcgv",
-    "ui://27vd145bhxjc1ub",
-    "ui://l0ds4ys6h1uu2p",
-    "ui://l0ds4ys6h1uu26",
-    "ui://l0ds4ys6e54q2t",
-    "ui://z1qthxavlrfi0",
-    "ui://0khx14are0py2",
-    "ui://3z9lj55vjokm7l",
-    "ui://3n2top74kpmgp5",
-    "ui://c7j2rnvqtpf08x",
-    "ui://fnuxqeflkllg1x",
-    "ui://egnzysm7ffp3b2",
-    "ui://v2hilfzbgq7me6",
-    "ui://ypulwxjhl9mn37",
-    "ui://k15boclkl9mn37",
-    "ui://oubpz2r2ofil8x",
-    "ui://442j0uepdafga8",
-    "ui://3n2top74kpmgmh",
-    "ui://9n9stu2eprgzf0",
-    "ui://awernf6xbazq90",
-    "ui://qpsoxvaiprgzf0",
-    "ui://b8jloj2qprgzf0",
-    "ui://3op8sm5eu86s3p",
-    "ui://niy3ldiwl9mn37",
-    "ui://niy3ldiwl9mn34",
-    "ui://niy3ldiwl9mn31",
-    "ui://27vd145be54q3v",
-    "ui://niy3ldiwl9mn2s",
-    "ui://3z9lj55vjokmwr",
-    "ui://v0j9abjygq7ms2",
-    "ui://v6yvqp7wf55qwa",
-    "ui://35sf1c1fr05e8u",
-    "ui://35sf1c1fr05e9m",
-    "ui://35sf1c1fr05eae",
-    "ui://yzaioi79f55qwa",
-    "ui://c7j2rnvqtpf093",
-    "ui://c7j2rnvqtpf0w",
-    "ui://3n2top74kpmgbc",
-    "ui://3z9lj55vjokm8k",
-    "ui://3z9lj55vjokm8x",
-    "ui://3z9lj55vjokm8q",
-    "ui://3z9lj55vjokm8p",
-    "ui://c7j2rnvqtpf06k",
-    "ui://c7j2rnvqtpf08t",
-    "ui://c7j2rnvqtpf06p",
-    "ui://c7j2rnvqtpf08q",
-    "ui://3z9lj55vjokm8j",
-    "ui://v2hilfzbgq7mh7",
-    "ui://oubpz2r2i2djgl",
-    "ui://3n2top74kpmgp4",
-    "ui://m7iejg46tqi8hwa",
     "ui://27vd145bp2bz6s",
-    "ui://27vd145bhxjc7i4q",
+    "ui://27vd145bh1uu30"
-    "ui://27vd145b7jqkcdl",
-    "ui://27vd145blwcl28",
-    "ui://27vd145bimywcd5",
-    "ui://27vd145bofsx1e",
-    "ui://27vd145bep9w7ik3",
-    "ui://27vd145bcvc87i5t",
-    "ui://27vd145bzwbu1a",
-    "ui://27vd145bhznkce2",
-    "ui://27vd145blprqce1",
-    "ui://27vd145bh1uu30",
-    "ui://27vd145bnosez",
-    "ui://27vd145bcjli6",
-    "ui://m7iejg46kwi0hlb",
-    "ui://m7iejg46jr1l7i3c",
-    "ui://3n2top74kpmgoa",
-    "ui://3n2top74kpmgog",
-    "ui://9n9stu2eprgzgj",
-    "ui://awernf6xbazqbp",
-    "ui://b8jloj2qprgzgj",
-    "ui://2d9xdj6zl0lzb",
-    "ui://2d9xdj6zl0lzo",
-    "ui://lx6k641gajzhoe",
-    "ui://5cdldr01qaqfdr",
-    "ui://yzaioi79wyal8n",
-    "ui://v6yvqp7wwyal8n",
-    "ui://35sf1c1fr05ed8",
-    "ui://qpsoxvaiprgzgj",
-    "ui://3z9lj55vjokm8c",
-    "ui://v0j9abjygq7m8f",
-    "ui://4skil1l6ms5spy",
-    "ui://4skil1l6r6qo1kc",
-    "ui://5cdldr01qaqf9c",
-    "ui://5cdldr01qaqfa4",
-    "ui://5cdldr01qaqfaw",
-    "ui://5cdldr01qaqf2c",
-    "ui://niy3ldiwl9mn14",
-    "ui://niy3ldiwl9mn18",
-    "ui://27vd145baen8chp",
-    "ui://niy3ldiwl9mny",
-    "ui://niy3ldiwl9mnz",
-    "ui://niy3ldiwl9mn17"
   ],
   "auxline1": true,
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://3z9lj55vjokm7l",
+  "doc.activeDoc": "ui://27vd145bh1uu30",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
-    "0khx14ar",
+    "27vd145b",
-    "/",
-    "3z9lj55v",
-    "/",
-    "3z9lj55v",
-    "/Main_style_2/",
-    "3z9lj55v",
-    "/Main_style_2/turn/",
-    "3z9lj55v",
-    "/component/",
-    "3z9lj55v",
-    "/component/setting/",
-    "3z9lj55v",
-    "/component/setting/changeBG/",
-    "3z9lj55v",
-    "/image/",
-    "3z9lj55v",
-    "/images/",
-    "3z9lj55v",
-    "/images/bg/",
->>>>>>> ae897002583aa634896fa8de54f38d314f563b1a
-    "5cdldr01",
-    "/",
-    "5cdldr01",
-    "/component/",
-    "5cdldr01",
-    "/component/clearing/",
-<<<<<<< HEAD
-=======
-    "5cdldr01",
-    "/component/clearing/image/",
-    "5cdldr01",
-    "/images/",
->>>>>>> ae897002583aa634896fa8de54f38d314f563b1a
-    "v6yvqp7w",
-    "/",
-    "v6yvqp7w",
-    "/component/",
-    "v6yvqp7w",
-<<<<<<< HEAD
-    "/component/clearing/"
-  ],
-  "libview.firstColumnWidth": 413,
-  "libview.twoColumn": false
-=======
-    "/component/clearing/",
-    "m7iejg46",
     "/"
   ],
   "snapToGrid": true,
@@ -187,5 +19,4 @@
   "libview.currentGroup": "",
   "gridSize": 30,
   "gridColor": 80
->>>>>>> ae897002583aa634896fa8de54f38d314f563b1a
 }

fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg1.png.meta

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

fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg4.png.meta

@@ -124,5 +124,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/main_majiang/de3462a6bae19a6c7308e43e0192028f
+  assetBundleName: base/main_majiang/6ef1b27b11ed6b25e909b69fad627cbe
   assetBundleVariant: 

fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_1.png.meta

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

fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_4.png.meta

@@ -124,5 +124,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/main_zipai/dc2eb56e61dc14aa00c23ba6cd49c4f6
+  assetBundleName: base/main_zipai/1343c7ee760981d1d794bea58933e8c4
   assetBundleVariant: 

fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png.meta

@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: d2d1201bd63e5804c9d0d548e95ec807
-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: 

fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_1.png.meta

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

fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_4.png.meta

@@ -124,5 +124,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/main_zipaimajiang/5e7576133a2faa8ebd62dcf50daf15d5
+  assetBundleName: base/main_zipaimajiang/dcc3c5d598fffbb306afa5754c44de48
   assetBundleVariant: