From 7ddea78d88a1e3314abf3f1b3b7661ec09e70412 Mon Sep 17 00:00:00 2001 From: chenanghui <220722433@qq.com> Date: Fri, 16 Oct 2026 17:27:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=9C=B0=E6=96=B9=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/bundles/comm/prefab/ui_baseInfo.prefab | 8 +- assets/bundles/first/config/Headicon.json | 32 +- assets/bundles/first/config/Hero.json.meta | 6 +- .../bundles/icons/head/{996.png => 999.png} | Bin .../icons/head/{996.png.meta => 999.png.meta} | 16 +- .../popCommon/match/prefab/match.prefab | 592 ++++++++++++++---- .../settings/prefab/PanelSettings.prefab | 13 +- assets/script/ui/match/UImatch.ts | 2 +- 8 files changed, 495 insertions(+), 174 deletions(-) rename assets/bundles/icons/head/{996.png => 999.png} (100%) rename assets/bundles/icons/head/{996.png.meta => 999.png.meta} (84%) diff --git a/assets/bundles/comm/prefab/ui_baseInfo.prefab b/assets/bundles/comm/prefab/ui_baseInfo.prefab index c09199d..2c3b5cf 100644 --- a/assets/bundles/comm/prefab/ui_baseInfo.prefab +++ b/assets/bundles/comm/prefab/ui_baseInfo.prefab @@ -373,8 +373,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.2, - "y": 1.2, + "x": 0.6, + "y": 0.6, "z": 1 }, "_mobility": 0, @@ -401,8 +401,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 2, - "height": 2 + "width": 201, + "height": 201 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/bundles/first/config/Headicon.json b/assets/bundles/first/config/Headicon.json index b8fe7c4..12d77d7 100644 --- a/assets/bundles/first/config/Headicon.json +++ b/assets/bundles/first/config/Headicon.json @@ -3,7 +3,7 @@ "id": 1, "name": "天兵", "desc": "默认解锁", - "icon": "天兵", + "icon": 1, "unlocktype": 0, "para": "" }, @@ -11,15 +11,7 @@ "id": 2, "name": "猴子", "desc": "默认解锁", - "icon": "猴子", - "unlocktype": 0, - "para": "" - }, - { - "id": 3, - "name": "巡山小妖", - "desc": "默认解锁", - "icon": "巡山小妖", + "icon": 2, "unlocktype": 0, "para": "" }, @@ -27,7 +19,7 @@ "id": 4, "name": "白骨精", "desc": "默认解锁", - "icon": "白骨精", + "icon": 4, "unlocktype": 0, "para": "" }, @@ -35,7 +27,7 @@ "id": 5, "name": "仙女", "desc": "地仙·初阶解锁", - "icon": "仙女", + "icon": 5, "unlocktype": 1, "para": 41 }, @@ -43,7 +35,7 @@ "id": 6, "name": "唐僧", "desc": "真仙·初阶解锁", - "icon": "唐僧", + "icon": 6, "unlocktype": 1, "para": 81 }, @@ -51,7 +43,7 @@ "id": 7, "name": "嫦娥", "desc": "合10次嫦娥解锁", - "icon": "嫦娥", + "icon": 7, "unlocktype": 2, "para": "21,10" }, @@ -59,7 +51,7 @@ "id": 8, "name": "哪吒", "desc": "获得火尖枪解锁", - "icon": "哪吒", + "icon": 8, "unlocktype": 3, "para": 504 }, @@ -67,7 +59,7 @@ "id": 9, "name": "杨戬", "desc": "获得三尖两面刀解锁", - "icon": "杨戬", + "icon": 9, "unlocktype": 3, "para": 506 }, @@ -75,7 +67,7 @@ "id": 10, "name": "孙悟空", "desc": "获得如意金箍棒解锁", - "icon": "孙悟空", + "icon": 520, "unlocktype": 3, "para": 501 }, @@ -83,7 +75,7 @@ "id": 11, "name": "猪八戒", "desc": "合5次悟能解锁", - "icon": "猪八戒", + "icon": 666, "unlocktype": 2, "para": "12,5" }, @@ -91,7 +83,7 @@ "id": 12, "name": "玉帝", "desc": "获得轩辕剑解锁", - "icon": "玉帝", + "icon": 888, "unlocktype": 3, "para": 507 }, @@ -99,7 +91,7 @@ "id": 13, "name": "女儿国国王", "desc": "太乙·初阶解锁", - "icon": "女儿国国王", + "icon": 999, "unlocktype": 1, "para": 141 } diff --git a/assets/bundles/first/config/Hero.json.meta b/assets/bundles/first/config/Hero.json.meta index 6a18efb..64cc83d 100644 --- a/assets/bundles/first/config/Hero.json.meta +++ b/assets/bundles/first/config/Hero.json.meta @@ -1,9 +1,11 @@ { "ver": "2.0.1", "importer": "json", - "imported": false, + "imported": true, "uuid": "dbb10377-adfa-47e3-8f6d-4edfbedf94eb", - "files": [], + "files": [ + ".json" + ], "subMetas": {}, "userData": {} } diff --git a/assets/bundles/icons/head/996.png b/assets/bundles/icons/head/999.png similarity index 100% rename from assets/bundles/icons/head/996.png rename to assets/bundles/icons/head/999.png diff --git a/assets/bundles/icons/head/996.png.meta b/assets/bundles/icons/head/999.png.meta similarity index 84% rename from assets/bundles/icons/head/996.png.meta rename to assets/bundles/icons/head/999.png.meta index 83c3e9d..e295d2f 100644 --- a/assets/bundles/icons/head/996.png.meta +++ b/assets/bundles/icons/head/999.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "33dbc659-3e5a-41b5-8dfe-ecb46e05c1dc", + "uuid": "392c32c1-ee03-4b9c-a309-0321768c8cb2", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "33dbc659-3e5a-41b5-8dfe-ecb46e05c1dc@6c48a", - "displayName": "996", + "uuid": "392c32c1-ee03-4b9c-a309-0321768c8cb2@6c48a", + "displayName": "999", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "33dbc659-3e5a-41b5-8dfe-ecb46e05c1dc", + "imageUuidOrDatabaseUri": "392c32c1-ee03-4b9c-a309-0321768c8cb2", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "33dbc659-3e5a-41b5-8dfe-ecb46e05c1dc@f9941", - "displayName": "996", + "uuid": "392c32c1-ee03-4b9c-a309-0321768c8cb2@f9941", + "displayName": "999", "id": "f9941", "name": "spriteFrame", "userData": { @@ -113,7 +113,7 @@ ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "33dbc659-3e5a-41b5-8dfe-ecb46e05c1dc@6c48a", + "imageUuidOrDatabaseUri": "392c32c1-ee03-4b9c-a309-0321768c8cb2@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "33dbc659-3e5a-41b5-8dfe-ecb46e05c1dc@6c48a" + "redirect": "392c32c1-ee03-4b9c-a309-0321768c8cb2@6c48a" } } diff --git a/assets/bundles/popCommon/match/prefab/match.prefab b/assets/bundles/popCommon/match/prefab/match.prefab index 891e0a8..cbec127 100644 --- a/assets/bundles/popCommon/match/prefab/match.prefab +++ b/assets/bundles/popCommon/match/prefab/match.prefab @@ -25,17 +25,17 @@ "_active": true, "_components": [ { - "__id__": 130 + "__id__": 146 }, { - "__id__": 132 + "__id__": 148 }, { - "__id__": 134 + "__id__": 150 } ], "_prefab": { - "__id__": 136 + "__id__": 152 }, "_lpos": { "__type__": "cc.Vec3", @@ -97,23 +97,23 @@ "__id__": 39 }, { - "__id__": 79 + "__id__": 87 }, { - "__id__": 119 + "__id__": 135 } ], "_active": true, "_components": [ { - "__id__": 125 + "__id__": 141 }, { - "__id__": 127 + "__id__": 143 } ], "_prefab": { - "__id__": 129 + "__id__": 145 }, "_lpos": { "__type__": "cc.Vec3", @@ -976,11 +976,11 @@ "_active": true, "_components": [ { - "__id__": 76 + "__id__": 84 } ], "_prefab": { - "__id__": 78 + "__id__": 86 }, "_lpos": { "__type__": "cc.Vec3", @@ -1030,20 +1030,20 @@ "__id__": 53 }, { - "__id__": 61 + "__id__": 69 }, { - "__id__": 67 + "__id__": 75 } ], "_active": true, "_components": [ { - "__id__": 73 + "__id__": 81 } ], "_prefab": { - "__id__": 75 + "__id__": 83 }, "_lpos": { "__type__": "cc.Vec3", @@ -1348,39 +1348,43 @@ }, { "__type__": "cc.Node", - "_name": "head", + "_name": "headMask", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 40 }, - "_children": [], + "_children": [ + { + "__id__": 54 + } + ], "_active": true, "_components": [ { - "__id__": 54 + "__id__": 62 }, { - "__id__": 56 + "__id__": 64 }, { - "__id__": 58 + "__id__": 66 } ], "_prefab": { - "__id__": 60 + "__id__": 68 }, "_lpos": { "__type__": "cc.Vec3", - "x": 82.736, - "y": 353.986, + "x": 81.736, + "y": 354.586, "z": 0 }, "_lrot": { "__type__": "cc.Quat", "x": 0, "y": 0, - "z": 1.8367099231598242e-40, + "z": 0, "w": 1 }, "_lscale": { @@ -1395,7 +1399,60 @@ "__type__": "cc.Vec3", "x": 0, "y": 0, - "z": 2.1047145357371133e-38 + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "head", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 53 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 55 + }, + { + "__id__": 57 + }, + { + "__id__": 59 + } + ], + "_prefab": { + "__id__": 61 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.6, + "y": 0.6, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 }, "_id": "" }, @@ -1405,16 +1462,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 100 + "width": 201, + "height": 201 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1425,7 +1482,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bbBZmV+B1AaLFcDFeXq8VO" + "fileId": "83aQrLdu5FNKRekuBy88Yp" }, { "__type__": "cc.Sprite", @@ -1433,11 +1490,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 58 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1467,7 +1524,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "c9JedHfRNNV6KE3A3X9BZo" + "fileId": "7fDEAQhuxCMqnc3gIs0/cf" }, { "__type__": "ac82ab4SStCOaU2daegwA2Q", @@ -1475,11 +1532,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 60 }, "bundleName": "icons", "SpriteNode": null, @@ -1488,7 +1545,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "45GAn6Xv9Gzb09urJJ320d" + "fileId": "2bTB88C1FFh7b1DuFOzrN5" }, { "__type__": "cc.PrefabInfo", @@ -1498,7 +1555,115 @@ "asset": { "__id__": 0 }, - "fileId": "01jIaD4oJGP5hMOfsfDxi4", + "fileId": "586935eJxJg6qYMwrNI73G", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 53 + }, + "_enabled": true, + "__prefab": { + "__id__": 63 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 105, + "height": 105 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "22gXMWVNlO34SaBJO7up9v" + }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 53 + }, + "_enabled": true, + "__prefab": { + "__id__": 65 + }, + "_type": 3, + "_inverted": false, + "_segments": 64, + "_alphaThreshold": 0.1, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "32Q/+FGPdKk5lBA2MCni5C" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 53 + }, + "_enabled": true, + "__prefab": { + "__id__": 67 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "c475cd80-7461-4966-9698-39813efc36bb@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "28x51Q0mBDC6W0iKiO1GnL" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "6dVu/dzUFEDbBmfktbfUj2", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1515,14 +1680,14 @@ "_active": true, "_components": [ { - "__id__": 62 + "__id__": 70 }, { - "__id__": 64 + "__id__": 72 } ], "_prefab": { - "__id__": 66 + "__id__": 74 }, "_lpos": { "__type__": "cc.Vec3", @@ -1559,11 +1724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 69 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 71 }, "_contentSize": { "__type__": "cc.Size", @@ -1587,11 +1752,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 69 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 73 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1674,14 +1839,14 @@ "_active": true, "_components": [ { - "__id__": 68 + "__id__": 76 }, { - "__id__": 70 + "__id__": 78 } ], "_prefab": { - "__id__": 72 + "__id__": 80 }, "_lpos": { "__type__": "cc.Vec3", @@ -1718,11 +1883,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 77 }, "_contentSize": { "__type__": "cc.Size", @@ -1746,11 +1911,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 75 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 79 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1831,7 +1996,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 82 }, "_contentSize": { "__type__": "cc.Size", @@ -1872,7 +2037,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 85 }, "_contentSize": { "__type__": "cc.Size", @@ -1913,17 +2078,17 @@ }, "_children": [ { - "__id__": 80 + "__id__": 88 } ], "_active": true, "_components": [ { - "__id__": 116 + "__id__": 132 } ], "_prefab": { - "__id__": 118 + "__id__": 134 }, "_lpos": { "__type__": "cc.Vec3", @@ -1960,33 +2125,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 79 + "__id__": 87 }, "_children": [ { - "__id__": 81 + "__id__": 89 }, { - "__id__": 87 + "__id__": 95 }, { - "__id__": 95 + "__id__": 111 }, { - "__id__": 101 + "__id__": 117 }, { - "__id__": 107 + "__id__": 123 } ], "_active": true, "_components": [ { - "__id__": 113 + "__id__": 129 } ], "_prefab": { - "__id__": 115 + "__id__": 131 }, "_lpos": { "__type__": "cc.Vec3", @@ -2023,20 +2188,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 80 + "__id__": 88 }, "_children": [], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 90 }, { - "__id__": 84 + "__id__": 92 } ], "_prefab": { - "__id__": 86 + "__id__": 94 }, "_lpos": { "__type__": "cc.Vec3", @@ -2073,11 +2238,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 91 }, "_contentSize": { "__type__": "cc.Size", @@ -2101,11 +2266,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 89 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 93 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2155,27 +2320,31 @@ }, { "__type__": "cc.Node", - "_name": "head", + "_name": "headMask", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 80 + "__id__": 88 }, - "_children": [], + "_children": [ + { + "__id__": 96 + } + ], "_active": true, "_components": [ { - "__id__": 88 + "__id__": 104 }, { - "__id__": 90 + "__id__": 106 }, { - "__id__": 92 + "__id__": 108 } ], "_prefab": { - "__id__": 94 + "__id__": 110 }, "_lpos": { "__type__": "cc.Vec3", @@ -2206,22 +2375,75 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "head", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 95 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 97 + }, + { + "__id__": 99 + }, + { + "__id__": 101 + } + ], + "_prefab": { + "__id__": 103 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.6, + "y": 0.6, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 98 }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 100 + "width": 201, + "height": 201 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2232,7 +2454,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1cvNWDJ7BCZpB9iT4LeaJN" + "fileId": "6dWXGOIk5Hv7D/L3oM6Kpa" }, { "__type__": "cc.Sprite", @@ -2240,11 +2462,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 100 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2274,7 +2496,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a7+Xu73o5Irri9YPoB1mnq" + "fileId": "bbiMgU1ZRNZZl8THTQklKX" }, { "__type__": "ac82ab4SStCOaU2daegwA2Q", @@ -2282,11 +2504,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 87 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 102 }, "bundleName": "icons", "SpriteNode": null, @@ -2295,7 +2517,115 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2buLNN+GZKUIjKqrItOYGt" + "fileId": "fe2qRGMPhHF4x4889L1Wwc" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "21WzNMk49G1pPIt1x/+FD8", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 95 + }, + "_enabled": true, + "__prefab": { + "__id__": 105 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 105, + "height": 105 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1bis3kCthK84XFkalxZqWk" + }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 95 + }, + "_enabled": true, + "__prefab": { + "__id__": 107 + }, + "_type": 3, + "_inverted": false, + "_segments": 64, + "_alphaThreshold": 0.1, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "aaFxMBeMVBarSGRvaJdpLg" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 95 + }, + "_enabled": true, + "__prefab": { + "__id__": 109 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "c475cd80-7461-4966-9698-39813efc36bb@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e0OGhAixtPQYxVK3ZlOf7t" }, { "__type__": "cc.PrefabInfo", @@ -2305,7 +2635,7 @@ "asset": { "__id__": 0 }, - "fileId": "29MtFXV+xGTKJuxhOEMosx", + "fileId": "f8q9hNkz9GsrfHtSQR8zmc", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2316,20 +2646,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 80 + "__id__": 88 }, "_children": [], "_active": false, "_components": [ { - "__id__": 96 + "__id__": 112 }, { - "__id__": 98 + "__id__": 114 } ], "_prefab": { - "__id__": 100 + "__id__": 116 }, "_lpos": { "__type__": "cc.Vec3", @@ -2366,11 +2696,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 113 }, "_contentSize": { "__type__": "cc.Size", @@ -2394,11 +2724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 115 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2452,20 +2782,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 80 + "__id__": 88 }, "_children": [], "_active": true, "_components": [ { - "__id__": 102 + "__id__": 118 }, { - "__id__": 104 + "__id__": 120 } ], "_prefab": { - "__id__": 106 + "__id__": 122 }, "_lpos": { "__type__": "cc.Vec3", @@ -2502,11 +2832,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 119 }, "_contentSize": { "__type__": "cc.Size", @@ -2530,11 +2860,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 121 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2611,20 +2941,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 80 + "__id__": 88 }, "_children": [], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 124 }, { - "__id__": 110 + "__id__": 126 } ], "_prefab": { - "__id__": 112 + "__id__": 128 }, "_lpos": { "__type__": "cc.Vec3", @@ -2661,11 +2991,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 125 }, "_contentSize": { "__type__": "cc.Size", @@ -2689,11 +3019,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 127 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2770,11 +3100,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 88 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 130 }, "_contentSize": { "__type__": "cc.Size", @@ -2811,11 +3141,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 79 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 133 }, "_contentSize": { "__type__": "cc.Size", @@ -2858,14 +3188,14 @@ "_active": true, "_components": [ { - "__id__": 120 + "__id__": 136 }, { - "__id__": 122 + "__id__": 138 } ], "_prefab": { - "__id__": 124 + "__id__": 140 }, "_lpos": { "__type__": "cc.Vec3", @@ -2902,11 +3232,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 137 }, "_contentSize": { "__type__": "cc.Size", @@ -2930,11 +3260,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 139 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2992,7 +3322,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 142 }, "_contentSize": { "__type__": "cc.Size", @@ -3020,7 +3350,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 144 }, "_opacity": 255, "_id": "" @@ -3052,7 +3382,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 147 }, "_contentSize": { "__type__": "cc.Size", @@ -3080,7 +3410,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 149 }, "_alignFlags": 45, "_target": null, @@ -3116,7 +3446,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 151 }, "_id": "" }, diff --git a/assets/bundles/popCommon/settings/prefab/PanelSettings.prefab b/assets/bundles/popCommon/settings/prefab/PanelSettings.prefab index bd57625..531a480 100644 --- a/assets/bundles/popCommon/settings/prefab/PanelSettings.prefab +++ b/assets/bundles/popCommon/settings/prefab/PanelSettings.prefab @@ -13260,8 +13260,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.45, + "y": 0.45, "z": 1 }, "_mobility": 0, @@ -13288,8 +13288,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 2, - "height": 2 + "width": 201, + "height": 201 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -13324,10 +13324,7 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 0, "_fillType": 0, "_sizeMode": 1, diff --git a/assets/script/ui/match/UImatch.ts b/assets/script/ui/match/UImatch.ts index a52d79f..97bbffc 100644 --- a/assets/script/ui/match/UImatch.ts +++ b/assets/script/ui/match/UImatch.ts @@ -664,7 +664,7 @@ export class UImatch extends Auto_match { */ private _findHead(side: Node | null | undefined): Node | null { if (!side?.isValid) return null; - return side.getChildByName('head') ?? side.find('headMask/head'); + return side.getChildByName('headMask').getChildByName('head') ?? side.find('headMask/head'); } /**