json同步

fk101/wb_new_ui/.objs/workspace.json

@@ -1,213 +1,13 @@
 {
-  "libview.firstColumnWidth": 283,
-  "expanded_nodes": [
+  "doc.openedDocs": [],
+  "libview.iconScale": 0,
+  "libview.currentGroup": "",
+  "libview.expandedNodes": [
     "27vd145b",
     "/",
-    "m7iejg46",
-    "/"
+    "27vd145b",
+    "/conMui/"
   ],
-  "libview.iconScale": 0,
-  "doc.openedDocs": [
-<<<<<<< HEAD
-    "ui://l0ds4ys6h1uu26"
-=======
-    "ui://3n2top74kpmgp5",
-    "ui://3n2top74kpmgp4",
-    "ui://3n2top74kpmgq4",
-    "ui://27vd145bl8gg53",
-    "ui://27vd145bhugj7i61",
-    "ui://bx1t0boos9wx7",
-    "ui://4skil1l6piv91ny",
-    "ui://v0j9abjygq7med",
-    "ui://3z9lj55vjokmft",
-    "ui://3z9lj55vjokmet",
-    "ui://3z9lj55vjokmei",
-    "ui://27vd145bofsx1e",
-    "ui://27vd145bep9w7ik3",
-    "ui://27vd145bcvc87i5t",
-    "ui://3z9lj55vjokmev",
-    "ui://3z9lj55vjokm9z",
-    "ui://3z9lj55vjokm8z",
-    "ui://3z9lj55vjokmfu",
-    "ui://4skil1l6piv91mg",
-    "ui://4skil1l6piv91o5",
-    "ui://v0j9abjygq7md1",
-    "ui://v0j9abjygq7mct",
-    "ui://v0j9abjygq7md3",
-    "ui://bx1t0boos9wx8",
-    "ui://bx1t0boos9wxa",
-    "ui://bx1t0boos9wx9",
-    "ui://c7j2rnvqtpf02f",
-    "ui://27vd145bimywcd5",
-    "ui://c7j2rnvqtpf01r",
-    "ui://c7j2rnvqtpf02g",
-    "ui://c7j2rnvqtpf02b",
-    "ui://y8prev1ms9wx7",
-    "ui://y8prev1ms9wx8",
-    "ui://y8prev1ms9wx9",
-    "ui://y8prev1ms9wxa",
-    "ui://b50sd5s6s9wx7",
-    "ui://b50sd5s6s9wx8",
-    "ui://b50sd5s6s9wx9",
-    "ui://b50sd5s6s9wxa",
-    "ui://xul2z8cts9wx7",
-    "ui://xul2z8cts9wx8",
-    "ui://xul2z8cts9wx9",
-    "ui://xul2z8cts9wxa",
-    "ui://visk5g30gq7mo",
-    "ui://visk5g30gq7m18",
-    "ui://visk5g30gq7m1b",
-    "ui://visk5g30gq7m2c",
-    "ui://visk5g30gq7m45",
-    "ui://visk5g30gq7m48",
-    "ui://visk5g30gq7m2a",
-    "ui://kplym8mus9wxa",
-    "ui://egnzysm7ffp386",
-    "ui://s63l0suw6cpqv",
-    "ui://s63l0suw6cpqr",
-    "ui://s63l0suw6cpqt",
-    "ui://kplym8mus9wx8",
-    "ui://425x67nrs9wx8",
-    "ui://425x67nrs9wx9",
-    "ui://3z9lj55vjokm6h",
-    "ui://3z9lj55vjokmlo",
-    "ui://3z9lj55vjokmlr",
-    "ui://4skil1l6piv91nt",
-    "ui://v0j9abjygq7mcu",
-    "ui://3z9lj55vjokmdt",
-    "ui://3z9lj55vjokmdr",
-    "ui://442j0uepona1bm",
-    "ui://3z9lj55vjokme6",
-    "ui://3z9lj55vjokme4",
-    "ui://3z9lj55vjokmdq",
-    "ui://3z9lj55vjokme2",
-    "ui://niy3ldiwl9mny",
-    "ui://m7iejg4610snh5j",
-    "ui://27vd145b7jqkcdl",
-    "ui://s63l0suw6cpqs",
-    "ui://425x67nrs9wx7",
-    "ui://kplym8mus9wx7",
-    "ui://fnuxqeflnrnod",
-    "ui://egnzysm7ffp36a",
-    "ui://v2hilfzbgq7mde",
-    "ui://v2hilfzbgq7mc9",
-    "ui://ypulwxjhl9mn14",
-    "ui://k15boclkl9mn14",
-    "ui://oubpz2r2ofil7k",
-    "ui://27vd145bj0h759",
-    "ui://27vd145bvg2c4",
-    "ui://v6yvqp7wf55qwa",
-    "ui://35sf1c1fr05e8u",
-    "ui://35sf1c1fr05e5z",
-    "ui://m7iejg46l679hwn",
-    "ui://m7iejg46kwi0hm9",
-    "ui://m7iejg46kwi0hk0",
-    "ui://m7iejg46kwi0hm3",
-    "ui://m7iejg46qlxihsm",
-    "ui://m7iejg46kwi0hm5",
-    "ui://m7iejg46l679hws",
-    "ui://m7iejg46kwi0hls",
-    "ui://m7iejg46kwi0hmc",
-    "ui://m7iejg46n5sxha2",
-    "ui://35sf1c1fr05e4l",
-    "ui://35sf1c1fr05e4u",
-    "ui://35sf1c1fr05e9k",
-    "ui://35sf1c1fr05e57",
-    "ui://35sf1c1fr05e4r",
-    "ui://35sf1c1fr05e3w",
-    "ui://35sf1c1fr05e4c",
-    "ui://27vd145bl8gg54",
-    "ui://27vd145bcjli6",
-    "ui://27vd145bhznkce2",
-    "ui://27vd145blwcl28",
-    "ui://27vd145btjnvcg9",
-    "ui://27vd145btjnvcgc",
-    "ui://c7j2rnvqtpf03e",
-    "ui://visk5g30gq7m30",
-    "ui://v2hilfzbgq7mcl",
-    "ui://oubpz2r2ofil87",
-    "ui://3n2top74kpmgkn",
-    "ui://9n9stu2em9jahn",
-    "ui://awernf6xbazq8a",
-    "ui://qpsoxvaim9jahn",
-    "ui://3z9lj55vjokmey",
-    "ui://3z9lj55vjokmf5",
-    "ui://3z9lj55vjokmf7",
-    "ui://v0j9abjygq7mdo",
-    "ui://4skil1l6piv91mn",
-    "ui://b8jloj2qm9jahn",
-    "ui://3n2top74kpmge",
-    "ui://3n2top74kpmgh",
-    "ui://3n2top74kpmg2",
-    "ui://lx6k641gajzhoe",
-    "ui://3n2top74kpmgoh",
-    "ui://3n2top74kpmgoa",
-    "ui://3n2top74kpmgog",
-    "ui://3n2top74kpmgbc",
-    "ui://3n2top74kpmgdq",
-    "ui://3n2top74kpmge8",
-    "ui://3n2top74kpmg9f",
-    "ui://3n2top74kpmga4",
-    "ui://3n2top74kpmga1",
-    "ui://3z9lj55vjokm7l",
-    "ui://v0j9abjygq7m8f",
-    "ui://3z9lj55vjokm8c",
-    "ui://4skil1l6r6qo1kc",
-    "ui://3n2top74kpmgm2",
-    "ui://3n2top74kpmglv",
-    "ui://3n2top74kpmgm1",
-    "ui://96mvx2ml10kys6",
-    "ui://96mvx2mlocbrsh"
->>>>>>> cba10b0ffff21510cffe8fda2a55188ccbbfbe99
-  ],
-  "packageGroup.mine": [
-    "2d9xdj6z"
-  ],
-  "test.device": "iPhone XR",
-  "canvasColor": 10066329,
-  "auxline2": true,
-<<<<<<< HEAD
-  "doc.activeDoc": "ui://l0ds4ys6h1uu26",
-  "libview.twoColumn": false,
-  "libview.expandedNodes": [
-    "l0ds4ys6",
-    "/"
-=======
-  "doc.activeDoc": "ui://m7iejg46kwi0hls",
-  "libview.twoColumn": false,
-  "libview.expandedNodes": [
-    "3z9lj55v",
-    "/",
-    "3z9lj55v",
-    "/Main_style_2/",
-    "3z9lj55v",
-    "/component/",
-    "3z9lj55v",
-    "/component/clearing/",
-    "3z9lj55v",
-    "/component/clearing/clearing1/",
-    "3z9lj55v",
-    "/component/clearing/clearing2/",
-    "3z9lj55v",
-    "/component/clearing/room/",
-    "3z9lj55v",
-    "/images/",
-    "m7iejg46",
-    "/",
-    "m7iejg46",
-    "/images/",
-    "m7iejg46",
-    "/mgr/",
-    "m7iejg46",
-    "/mgr/Mui/"
->>>>>>> cba10b0ffff21510cffe8fda2a55188ccbbfbe99
-  ],
-  "auxline1": true,
-  "snapToGrid": true,
-  "test.orientation": "landscape",
-  "backgroundColor": 6710886,
-  "libview.currentGroup": "",
-  "hidden_packages": [],
-  "gridSize": 30,
-  "gridColor": 80
+  "libview.firstColumnWidth": 413,
+  "libview.twoColumn": false
 }

fk101/wb_new_ui/assets/Common/package.xml

@@ -1129,6 +1129,8 @@
     <image id="i8oc7ikp" name="Frame 11232.png" path="/conMui/"/>
     <image id="i8oc7ikq" name="Frame 11231.png" path="/conMui/"/>
     <image id="i8oc7ikr" name="Frame 1179.png" path="/conMui/"/>
+    <image id="o2817iks" name="Frame 1237.png" path="/conMui/"/>
+    <image id="o2817ikt" name="Frame 1238.png" path="/conMui/"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
     <atlas name="默认" index="0"/>