其他地方头像显示问题

master
chenanghui 18 hours ago
parent 9d6957e2c0
commit 7ddea78d88
  1. 8
      assets/bundles/comm/prefab/ui_baseInfo.prefab
  2. 32
      assets/bundles/first/config/Headicon.json
  3. 6
      assets/bundles/first/config/Hero.json.meta
  4. 0
      assets/bundles/icons/head/999.png
  5. 16
      assets/bundles/icons/head/999.png.meta
  6. 592
      assets/bundles/popCommon/match/prefab/match.prefab
  7. 13
      assets/bundles/popCommon/settings/prefab/PanelSettings.prefab
  8. 2
      assets/script/ui/match/UImatch.ts

@ -373,8 +373,8 @@
}, },
"_lscale": { "_lscale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 1.2, "x": 0.6,
"y": 1.2, "y": 0.6,
"z": 1 "z": 1
}, },
"_mobility": 0, "_mobility": 0,
@ -401,8 +401,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2, "width": 201,
"height": 2 "height": 201
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",

@ -3,7 +3,7 @@
"id": 1, "id": 1,
"name": "天兵", "name": "天兵",
"desc": "默认解锁", "desc": "默认解锁",
"icon": "天兵", "icon": 1,
"unlocktype": 0, "unlocktype": 0,
"para": "" "para": ""
}, },
@ -11,15 +11,7 @@
"id": 2, "id": 2,
"name": "猴子", "name": "猴子",
"desc": "默认解锁", "desc": "默认解锁",
"icon": "猴子", "icon": 2,
"unlocktype": 0,
"para": ""
},
{
"id": 3,
"name": "巡山小妖",
"desc": "默认解锁",
"icon": "巡山小妖",
"unlocktype": 0, "unlocktype": 0,
"para": "" "para": ""
}, },
@ -27,7 +19,7 @@
"id": 4, "id": 4,
"name": "白骨精", "name": "白骨精",
"desc": "默认解锁", "desc": "默认解锁",
"icon": "白骨精", "icon": 4,
"unlocktype": 0, "unlocktype": 0,
"para": "" "para": ""
}, },
@ -35,7 +27,7 @@
"id": 5, "id": 5,
"name": "仙女", "name": "仙女",
"desc": "地仙·初阶解锁", "desc": "地仙·初阶解锁",
"icon": "仙女", "icon": 5,
"unlocktype": 1, "unlocktype": 1,
"para": 41 "para": 41
}, },
@ -43,7 +35,7 @@
"id": 6, "id": 6,
"name": "唐僧", "name": "唐僧",
"desc": "真仙·初阶解锁", "desc": "真仙·初阶解锁",
"icon": "唐僧", "icon": 6,
"unlocktype": 1, "unlocktype": 1,
"para": 81 "para": 81
}, },
@ -51,7 +43,7 @@
"id": 7, "id": 7,
"name": "嫦娥", "name": "嫦娥",
"desc": "合10次嫦娥解锁", "desc": "合10次嫦娥解锁",
"icon": "嫦娥", "icon": 7,
"unlocktype": 2, "unlocktype": 2,
"para": "21,10" "para": "21,10"
}, },
@ -59,7 +51,7 @@
"id": 8, "id": 8,
"name": "哪吒", "name": "哪吒",
"desc": "获得火尖枪解锁", "desc": "获得火尖枪解锁",
"icon": "哪吒", "icon": 8,
"unlocktype": 3, "unlocktype": 3,
"para": 504 "para": 504
}, },
@ -67,7 +59,7 @@
"id": 9, "id": 9,
"name": "杨戬", "name": "杨戬",
"desc": "获得三尖两面刀解锁", "desc": "获得三尖两面刀解锁",
"icon": "杨戬", "icon": 9,
"unlocktype": 3, "unlocktype": 3,
"para": 506 "para": 506
}, },
@ -75,7 +67,7 @@
"id": 10, "id": 10,
"name": "孙悟空", "name": "孙悟空",
"desc": "获得如意金箍棒解锁", "desc": "获得如意金箍棒解锁",
"icon": "孙悟空", "icon": 520,
"unlocktype": 3, "unlocktype": 3,
"para": 501 "para": 501
}, },
@ -83,7 +75,7 @@
"id": 11, "id": 11,
"name": "猪八戒", "name": "猪八戒",
"desc": "合5次悟能解锁", "desc": "合5次悟能解锁",
"icon": "猪八戒", "icon": 666,
"unlocktype": 2, "unlocktype": 2,
"para": "12,5" "para": "12,5"
}, },
@ -91,7 +83,7 @@
"id": 12, "id": 12,
"name": "玉帝", "name": "玉帝",
"desc": "获得轩辕剑解锁", "desc": "获得轩辕剑解锁",
"icon": "玉帝", "icon": 888,
"unlocktype": 3, "unlocktype": 3,
"para": 507 "para": 507
}, },
@ -99,7 +91,7 @@
"id": 13, "id": 13,
"name": "女儿国国王", "name": "女儿国国王",
"desc": "太乙·初阶解锁", "desc": "太乙·初阶解锁",
"icon": "女儿国国王", "icon": 999,
"unlocktype": 1, "unlocktype": 1,
"para": 141 "para": 141
} }

@ -1,9 +1,11 @@
{ {
"ver": "2.0.1", "ver": "2.0.1",
"importer": "json", "importer": "json",
"imported": false, "imported": true,
"uuid": "dbb10377-adfa-47e3-8f6d-4edfbedf94eb", "uuid": "dbb10377-adfa-47e3-8f6d-4edfbedf94eb",
"files": [], "files": [
".json"
],
"subMetas": {}, "subMetas": {},
"userData": {} "userData": {}
} }

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

@ -2,7 +2,7 @@
"ver": "1.0.27", "ver": "1.0.27",
"importer": "image", "importer": "image",
"imported": true, "imported": true,
"uuid": "33dbc659-3e5a-41b5-8dfe-ecb46e05c1dc", "uuid": "392c32c1-ee03-4b9c-a309-0321768c8cb2",
"files": [ "files": [
".json", ".json",
".png" ".png"
@ -10,14 +10,14 @@
"subMetas": { "subMetas": {
"6c48a": { "6c48a": {
"importer": "texture", "importer": "texture",
"uuid": "33dbc659-3e5a-41b5-8dfe-ecb46e05c1dc@6c48a", "uuid": "392c32c1-ee03-4b9c-a309-0321768c8cb2@6c48a",
"displayName": "996", "displayName": "999",
"id": "6c48a", "id": "6c48a",
"name": "texture", "name": "texture",
"userData": { "userData": {
"wrapModeS": "clamp-to-edge", "wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge", "wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "33dbc659-3e5a-41b5-8dfe-ecb46e05c1dc", "imageUuidOrDatabaseUri": "392c32c1-ee03-4b9c-a309-0321768c8cb2",
"isUuid": true, "isUuid": true,
"visible": false, "visible": false,
"minfilter": "linear", "minfilter": "linear",
@ -34,8 +34,8 @@
}, },
"f9941": { "f9941": {
"importer": "sprite-frame", "importer": "sprite-frame",
"uuid": "33dbc659-3e5a-41b5-8dfe-ecb46e05c1dc@f9941", "uuid": "392c32c1-ee03-4b9c-a309-0321768c8cb2@f9941",
"displayName": "996", "displayName": "999",
"id": "f9941", "id": "f9941",
"name": "spriteFrame", "name": "spriteFrame",
"userData": { "userData": {
@ -113,7 +113,7 @@
] ]
}, },
"isUuid": true, "isUuid": true,
"imageUuidOrDatabaseUri": "33dbc659-3e5a-41b5-8dfe-ecb46e05c1dc@6c48a", "imageUuidOrDatabaseUri": "392c32c1-ee03-4b9c-a309-0321768c8cb2@6c48a",
"atlasUuid": "", "atlasUuid": "",
"trimType": "auto" "trimType": "auto"
}, },
@ -129,6 +129,6 @@
"type": "sprite-frame", "type": "sprite-frame",
"fixAlphaTransparencyArtifacts": false, "fixAlphaTransparencyArtifacts": false,
"hasAlpha": true, "hasAlpha": true,
"redirect": "33dbc659-3e5a-41b5-8dfe-ecb46e05c1dc@6c48a" "redirect": "392c32c1-ee03-4b9c-a309-0321768c8cb2@6c48a"
} }
} }

File diff suppressed because it is too large Load Diff

@ -13260,8 +13260,8 @@
}, },
"_lscale": { "_lscale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 1, "x": 0.45,
"y": 1, "y": 0.45,
"z": 1 "z": 1
}, },
"_mobility": 0, "_mobility": 0,
@ -13288,8 +13288,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2, "width": 201,
"height": 2 "height": 201
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -13324,10 +13324,7 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": null,
"__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0, "_type": 0,
"_fillType": 0, "_fillType": 0,
"_sizeMode": 1, "_sizeMode": 1,

@ -664,7 +664,7 @@ export class UImatch extends Auto_match {
*/ */
private _findHead(side: Node | null | undefined): Node | null { private _findHead(side: Node | null | undefined): Node | null {
if (!side?.isValid) return null; if (!side?.isValid) return null;
return side.getChildByName('head') ?? side.find('headMask/head'); return side.getChildByName('headMask').getChildByName('head') ?? side.find('headMask/head');
} }
/** /**

Loading…
Cancel
Save