冲突同步
|
Before Width: | Height: | Size: 1.5 MiB After Width: | Height: | Size: 1.4 MiB |
|
Before Width: | Height: | Size: 2.1 MiB After Width: | Height: | Size: 2.0 MiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 3.3 MiB After Width: | Height: | Size: 2.7 MiB |
|
Before Width: | Height: | Size: 2.7 MiB After Width: | Height: | Size: 2.6 MiB |
|
Before Width: | Height: | Size: 670 KiB After Width: | Height: | Size: 703 KiB |
|
Before Width: | Height: | Size: 537 KiB After Width: | Height: | Size: 660 KiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 969 KiB |
|
|
@ -2,79 +2,26 @@
|
||||||
"libview.firstColumnWidth": 356,
|
"libview.firstColumnWidth": 356,
|
||||||
"libview.iconScale": 0,
|
"libview.iconScale": 0,
|
||||||
"doc.openedDocs": [
|
"doc.openedDocs": [
|
||||||
"ui://m7iejg46jgh8hwv",
|
"ui://27vd145bhxjc7i4q",
|
||||||
"ui://m7iejg46f6brhww",
|
"ui://kplym8mus9wxa",
|
||||||
"ui://m7iejg46nwgkhx0",
|
"ui://fnuxqeflnrnod",
|
||||||
"ui://m7iejg46nwgkhx1",
|
|
||||||
"ui://m7iejg46jr1l7i3c",
|
|
||||||
"ui://27vd145bhei77i2g",
|
|
||||||
"ui://3z9lj55vjokmft",
|
|
||||||
"ui://3z9lj55vjokmet",
|
|
||||||
"ui://3z9lj55vjokm7l",
|
|
||||||
"ui://27vd145bg8mhce4",
|
|
||||||
"ui://27vd145bloe77il6",
|
|
||||||
"ui://27vd145bloe77il5",
|
|
||||||
"ui://27vd145bvg2c4",
|
|
||||||
"ui://c7j2rnvqtpf02f",
|
"ui://c7j2rnvqtpf02f",
|
||||||
"ui://egnzysm7ffp36a",
|
"ui://y8prev1ms9wx7",
|
||||||
"ui://ypulwxjhl9mn14",
|
"ui://3z9lj55vjokmft",
|
||||||
"ui://ypulwxjhl9mny",
|
"ui://4skil1l6piv91ny",
|
||||||
"ui://ypulwxjhl9mn19",
|
"ui://niy3ldiwl9mny",
|
||||||
"ui://ypulwxjhl9mn10",
|
"ui://niy3ldiwl9mn19",
|
||||||
"ui://k15boclkl9mn14",
|
"ui://9n9stu2eprgzei",
|
||||||
"ui://m7iejg46csp47i42",
|
"ui://9n9stu2eprgzef"
|
||||||
"ui://m7iejg46hsbhhjn",
|
|
||||||
"ui://27vd145beeqmcgp",
|
|
||||||
"ui://m7iejg46wbjh7ica"
|
|
||||||
],
|
],
|
||||||
"auxline1": true,
|
"auxline1": true,
|
||||||
"canvasColor": 10066329,
|
"canvasColor": 10066329,
|
||||||
"auxline2": true,
|
"auxline2": true,
|
||||||
"doc.activeDoc": "ui://27vd145bhei77i2g",
|
"doc.activeDoc": "ui://9n9stu2eprgzef",
|
||||||
"libview.twoColumn": false,
|
"libview.twoColumn": false,
|
||||||
"libview.expandedNodes": [
|
"libview.expandedNodes": [
|
||||||
"27vd145b",
|
"27vd145b",
|
||||||
"/",
|
"/"
|
||||||
"27vd145b",
|
|
||||||
"/buttons/",
|
|
||||||
"27vd145b",
|
|
||||||
"/component/",
|
|
||||||
"27vd145b",
|
|
||||||
"/component/hand/",
|
|
||||||
"27vd145b",
|
|
||||||
"/component/hand/majiangHand/",
|
|
||||||
"27vd145b",
|
|
||||||
"/conMui/",
|
|
||||||
"27vd145b",
|
|
||||||
"/font/",
|
|
||||||
"27vd145b",
|
|
||||||
"/font/images/",
|
|
||||||
"27vd145b",
|
|
||||||
"/images/",
|
|
||||||
"egnzysm7",
|
|
||||||
"/",
|
|
||||||
"egnzysm7",
|
|
||||||
"/component/",
|
|
||||||
"egnzysm7",
|
|
||||||
"/component/clearing/",
|
|
||||||
"ypulwxjh",
|
|
||||||
"/",
|
|
||||||
"ypulwxjh",
|
|
||||||
"/component/",
|
|
||||||
"ypulwxjh",
|
|
||||||
"/component/EPFLSMui/",
|
|
||||||
"m7iejg46",
|
|
||||||
"/",
|
|
||||||
"m7iejg46",
|
|
||||||
"/mgr/",
|
|
||||||
"m7iejg46",
|
|
||||||
"/mgr/Mui/",
|
|
||||||
"m7iejg46",
|
|
||||||
"/mgr/component/",
|
|
||||||
"m7iejg46",
|
|
||||||
"/mgr/component/member/",
|
|
||||||
"m7iejg46",
|
|
||||||
"/mgr/component/member/partner/"
|
|
||||||
],
|
],
|
||||||
"snapToGrid": true,
|
"snapToGrid": true,
|
||||||
"backgroundColor": 6710886,
|
"backgroundColor": 6710886,
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 570 KiB After Width: | Height: | Size: 535 KiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 790 KiB |
|
Before Width: | Height: | Size: 951 KiB After Width: | Height: | Size: 716 KiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 723 KiB |
|
Before Width: | Height: | Size: 1.6 MiB After Width: | Height: | Size: 1.7 MiB |
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 709 KiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 557 KiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 656 KiB |
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 619 KiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 785 KiB |
|
Before Width: | Height: | Size: 990 KiB After Width: | Height: | Size: 787 KiB |
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 72 KiB |
|
Before Width: | Height: | Size: 2.6 MiB After Width: | Height: | Size: 2.4 MiB |
|
Before Width: | Height: | Size: 2.8 MiB After Width: | Height: | Size: 2.2 MiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 3.3 MiB After Width: | Height: | Size: 3.3 MiB |
|
Before Width: | Height: | Size: 6.0 MiB After Width: | Height: | Size: 3.3 MiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 1.6 MiB After Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 247 KiB After Width: | Height: | Size: 237 KiB |
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: base/main_majiang/de3462a6bae19a6c7308e43e0192028f
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -124,5 +124,5 @@ TextureImporter:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName: base/main_majiang/de3462a6bae19a6c7308e43e0192028f
|
assetBundleName: base/main_majiang/6ef1b27b11ed6b25e909b69fad627cbe
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 2.2 MiB After Width: | Height: | Size: 2.1 MiB |
|
Before Width: | Height: | Size: 2.3 MiB After Width: | Height: | Size: 2.2 MiB |
|
Before Width: | Height: | Size: 2.2 MiB After Width: | Height: | Size: 2.1 MiB |
|
Before Width: | Height: | Size: 1022 KiB After Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 959 KiB After Width: | Height: | Size: 961 KiB |
|
Before Width: | Height: | Size: 3.3 MiB After Width: | Height: | Size: 2.8 MiB |
|
Before Width: | Height: | Size: 2.0 MiB After Width: | Height: | Size: 2.0 MiB |
|
Before Width: | Height: | Size: 2.4 MiB After Width: | Height: | Size: 2.0 MiB |
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 71 KiB |
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 71 KiB |
|
Before Width: | Height: | Size: 1.6 MiB After Width: | Height: | Size: 1.6 MiB |
|
Before Width: | Height: | Size: 111 KiB After Width: | Height: | Size: 110 KiB |
|
Before Width: | Height: | Size: 2.5 MiB After Width: | Height: | Size: 2.5 MiB |
|
Before Width: | Height: | Size: 878 KiB After Width: | Height: | Size: 1.7 MiB |
|
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 1.5 MiB |
|
Before Width: | Height: | Size: 966 KiB After Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 481 KiB After Width: | Height: | Size: 626 KiB |
|
Before Width: | Height: | Size: 383 KiB After Width: | Height: | Size: 380 KiB |
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: base/main_zipai/dc2eb56e61dc14aa00c23ba6cd49c4f6
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -124,5 +124,5 @@ TextureImporter:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName: base/main_zipai/dc2eb56e61dc14aa00c23ba6cd49c4f6
|
assetBundleName: base/main_zipai/1343c7ee760981d1d794bea58933e8c4
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 1.8 MiB After Width: | Height: | Size: 1.8 MiB |
|
Before Width: | Height: | Size: 1.8 MiB After Width: | Height: | Size: 2.2 MiB |
|
Before Width: | Height: | Size: 2.2 MiB After Width: | Height: | Size: 2.1 MiB |
|
Before Width: | Height: | Size: 1.6 MiB After Width: | Height: | Size: 1.5 MiB |
|
Before Width: | Height: | Size: 497 KiB After Width: | Height: | Size: 504 KiB |
|
Before Width: | Height: | Size: 3.3 MiB After Width: | Height: | Size: 2.8 MiB |
|
Before Width: | Height: | Size: 2.0 MiB After Width: | Height: | Size: 2.0 MiB |
|
Before Width: | Height: | Size: 2.4 MiB After Width: | Height: | Size: 2.0 MiB |
|
|
@ -88,5 +88,5 @@ TextureImporter:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName: base/main_zipaimajiang/5e7576133a2faa8ebd62dcf50daf15d5
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
|
@ -124,5 +124,5 @@ TextureImporter:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
pSDShowRemoveMatteOption: 0
|
pSDShowRemoveMatteOption: 0
|
||||||
userData:
|
userData:
|
||||||
assetBundleName: base/main_zipaimajiang/5e7576133a2faa8ebd62dcf50daf15d5
|
assetBundleName: base/main_zipaimajiang/dcc3c5d598fffbb306afa5754c44de48
|
||||||
assetBundleVariant:
|
assetBundleVariant:
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 131 KiB After Width: | Height: | Size: 121 KiB |
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 946 KiB |
|
Before Width: | Height: | Size: 2.4 MiB After Width: | Height: | Size: 2.4 MiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 160 KiB After Width: | Height: | Size: 176 KiB |
|
Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 133 KiB |
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 222 KiB After Width: | Height: | Size: 224 KiB |
|
Before Width: | Height: | Size: 636 KiB After Width: | Height: | Size: 877 KiB |
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 542 KiB After Width: | Height: | Size: 574 KiB |
|
Before Width: | Height: | Size: 1.5 MiB After Width: | Height: | Size: 1.5 MiB |
|
Before Width: | Height: | Size: 179 KiB After Width: | Height: | Size: 153 KiB |
|
Before Width: | Height: | Size: 636 KiB After Width: | Height: | Size: 877 KiB |
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 636 KiB After Width: | Height: | Size: 877 KiB |
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 40 KiB |