diff --git a/assets/Prefab/AvatarPanel/AvatarPanel.prefab b/assets/Prefab/AvatarPanel/AvatarPanel.prefab index 497bf72..eb98dd1 100644 --- a/assets/Prefab/AvatarPanel/AvatarPanel.prefab +++ b/assets/Prefab/AvatarPanel/AvatarPanel.prefab @@ -30,14 +30,14 @@ "_active": false, "_components": [ { - "__id__": 79 + "__id__": 70 }, { - "__id__": 80 + "__id__": 71 } ], "_prefab": { - "__id__": 81 + "__id__": 72 }, "_opacity": 255, "_color": { @@ -276,7 +276,7 @@ "__uuid__": "1fd54956-5ef8-4cfb-b7c5-4b1ade8128e8" }, "_type": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillType": 0, "_fillCenter": { "__type__": "cc.Vec2", @@ -312,13 +312,13 @@ "__id__": 9 }, { - "__id__": 47 + "__id__": 50 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 78 + "__id__": 69 }, "_opacity": 255, "_color": { @@ -391,7 +391,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 46 + "__id__": 49 }, "_opacity": 255, "_color": { @@ -960,16 +960,16 @@ "__id__": 25 }, { - "__id__": 32 + "__id__": 33 }, { - "__id__": 39 + "__id__": 41 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 45 + "__id__": 48 }, "_opacity": 255, "_color": { @@ -1036,11 +1036,11 @@ "__id__": 29 }, { - "__id__": 30 + "__id__": 31 } ], "_prefab": { - "__id__": 31 + "__id__": 32 }, "_opacity": 255, "_color": { @@ -1208,7 +1208,11 @@ "_grayMaterial": null, "duration": 0.1, "zoomScale": 0.9, - "clickEvents": [], + "clickEvents": [ + { + "__id__": 30 + } + ], "_N$interactable": true, "_N$enableAutoGrayEffect": false, "_N$transition": 1, @@ -1268,6 +1272,16 @@ }, "_id": "" }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "424db5d3RpBGIWSlkuF1LkT", + "handler": "OnClickConfirm", + "customEventData": "" + }, { "__type__": "cc.Sprite", "_name": "", @@ -1320,20 +1334,20 @@ }, "_children": [ { - "__id__": 33 + "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 36 + "__id__": 37 }, { - "__id__": 37 + "__id__": 39 } ], "_prefab": { - "__id__": 38 + "__id__": 40 }, "_opacity": 255, "_color": { @@ -1387,17 +1401,17 @@ "_name": "Image", "_objFlags": 0, "_parent": { - "__id__": 32 + "__id__": 33 }, "_children": [], "_active": true, "_components": [ { - "__id__": 34 + "__id__": 35 } ], "_prefab": { - "__id__": 35 + "__id__": 36 }, "_opacity": 255, "_color": { @@ -1451,7 +1465,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 33 + "__id__": 34 }, "_enabled": true, "_materials": [ @@ -1494,14 +1508,18 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 32 + "__id__": 33 }, "_enabled": true, "_normalMaterial": null, "_grayMaterial": null, "duration": 0.1, "zoomScale": 0.9, - "clickEvents": [], + "clickEvents": [ + { + "__id__": 38 + } + ], "_N$interactable": true, "_N$enableAutoGrayEffect": false, "_N$transition": 1, @@ -1557,16 +1575,26 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 32 + "__id__": 33 }, "_id": "" }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "424db5d3RpBGIWSlkuF1LkT", + "handler": "Close", + "customEventData": "" + }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "node": { - "__id__": 32 + "__id__": 33 }, "_enabled": true, "_materials": [ @@ -1613,17 +1641,17 @@ }, "_children": [ { - "__id__": 40 + "__id__": 42 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 45 } ], "_prefab": { - "__id__": 44 + "__id__": 47 }, "_opacity": 255, "_color": { @@ -1677,17 +1705,17 @@ "_name": "Image", "_objFlags": 0, "_parent": { - "__id__": 39 + "__id__": 41 }, "_children": [], "_active": true, "_components": [ { - "__id__": 41 + "__id__": 43 } ], "_prefab": { - "__id__": 42 + "__id__": 44 }, "_opacity": 255, "_color": { @@ -1741,7 +1769,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 40 + "__id__": 42 }, "_enabled": true, "_materials": [ @@ -1784,14 +1812,18 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 39 + "__id__": 41 }, "_enabled": true, "_normalMaterial": null, "_grayMaterial": null, "duration": 0.1, "zoomScale": 0.9, - "clickEvents": [], + "clickEvents": [ + { + "__id__": 46 + } + ], "_N$interactable": true, "_N$enableAutoGrayEffect": false, "_N$transition": 1, @@ -1847,10 +1879,20 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 39 + "__id__": 41 }, "_id": "" }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "424db5d3RpBGIWSlkuF1LkT", + "handler": "OnClickNextColor", + "customEventData": "" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1893,13 +1935,13 @@ }, "_children": [ { - "__id__": 48 + "__id__": 51 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 77 + "__id__": 68 }, "_opacity": 255, "_color": { @@ -1953,24 +1995,24 @@ "_name": "Scroll View", "_objFlags": 0, "_parent": { - "__id__": 47 + "__id__": 50 }, "_children": [ { - "__id__": 49 + "__id__": 52 }, { - "__id__": 56 + "__id__": 59 } ], "_active": true, "_components": [ { - "__id__": 54 + "__id__": 57 } ], "_prefab": { - "__id__": 76 + "__id__": 67 }, "_opacity": 255, "_color": { @@ -2024,27 +2066,27 @@ "_name": "scrollBar", "_objFlags": 0, "_parent": { - "__id__": 48 + "__id__": 51 }, "_children": [ { - "__id__": 50 + "__id__": 53 } ], "_active": true, "_components": [ { - "__id__": 53 + "__id__": 56 }, { - "__id__": 73 + "__id__": 64 }, { - "__id__": 74 + "__id__": 65 } ], "_prefab": { - "__id__": 75 + "__id__": 66 }, "_opacity": 0, "_color": { @@ -2098,17 +2140,17 @@ "_name": "bar", "_objFlags": 0, "_parent": { - "__id__": 49 + "__id__": 52 }, "_children": [], "_active": true, "_components": [ { - "__id__": 51 + "__id__": 54 } ], "_prefab": { - "__id__": 52 + "__id__": 55 }, "_opacity": 255, "_color": { @@ -2162,7 +2204,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 50 + "__id__": 53 }, "_enabled": true, "_materials": [ @@ -2205,18 +2247,18 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 49 + "__id__": 52 }, "_enabled": true, "_scrollView": { - "__id__": 54 + "__id__": 57 }, "_touching": false, "_opacity": 255, "enableAutoHide": true, "autoHideTime": 1, "_N$handle": { - "__id__": 51 + "__id__": 54 }, "_N$direction": 1, "_id": "" @@ -2226,7 +2268,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 48 + "__id__": 51 }, "_enabled": true, "horizontal": false, @@ -2238,14 +2280,14 @@ "scrollEvents": [], "cancelInnerEvents": true, "_N$content": { - "__id__": 55 + "__id__": 58 }, "content": { - "__id__": 55 + "__id__": 58 }, "_N$horizontalScrollBar": null, "_N$verticalScrollBar": { - "__id__": 53 + "__id__": 56 }, "_id": "" }, @@ -2254,21 +2296,17 @@ "_name": "Content", "_objFlags": 0, "_parent": { - "__id__": 56 + "__id__": 59 }, - "_children": [ - { - "__id__": 59 - } - ], + "_children": [], "_active": true, "_components": [ { - "__id__": 71 + "__id__": 62 } ], "_prefab": { - "__id__": 72 + "__id__": 63 }, "_opacity": 255, "_color": { @@ -2322,21 +2360,21 @@ "_name": "view", "_objFlags": 0, "_parent": { - "__id__": 48 + "__id__": 51 }, "_children": [ { - "__id__": 55 + "__id__": 58 } ], "_active": true, "_components": [ { - "__id__": 57 + "__id__": 60 } ], "_prefab": { - "__id__": 58 + "__id__": 61 }, "_opacity": 255, "_color": { @@ -2390,7 +2428,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 56 + "__id__": 59 }, "_enabled": true, "_materials": [ @@ -2416,439 +2454,12 @@ "fileId": "96UE0srKRJJZj7RvxQ+wdJ", "sync": false }, - { - "__type__": "cc.Node", - "_name": "Item", - "_objFlags": 0, - "_parent": { - "__id__": 55 - }, - "_children": [ - { - "__id__": 60 - }, - { - "__id__": 66 - } - ], - "_active": true, - "_components": [ - { - "__id__": 69 - } - ], - "_prefab": { - "__id__": 70 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 115, - "height": 215 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 596.95 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - 128129.25000000001, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "Avatar", - "_objFlags": 0, - "_parent": { - "__id__": 59 - }, - "_children": [ - { - "__id__": 61 - } - ], - "_active": true, - "_components": [ - { - "__id__": 64 - } - ], - "_prefab": { - "__id__": 65 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 115, - "height": 209 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -0.445, - -128233.75000000001, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "Pic", - "_objFlags": 512, - "_parent": { - "__id__": 60 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 62 - } - ], - "_prefab": { - "__id__": 63 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 170, - "height": 235 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -3.917, - 7.4, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 61 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "591e9fe0-34ff-4ca9-936d-6224c67887ce" - }, - "_type": 0, - "_sizeMode": 0, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 59 - }, - "asset": { - "__uuid__": "69e392a1-9f30-4448-9cd0-b8f9af9df603" - }, - "fileId": "708AlFdEBEV55OC+i1Itot", - "sync": false - }, - { - "__type__": "cc.Mask", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 60 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_spriteFrame": null, - "_type": 0, - "_segments": 64, - "_N$alphaThreshold": 0.1, - "_N$inverted": false, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 59 - }, - "asset": { - "__uuid__": "69e392a1-9f30-4448-9cd0-b8f9af9df603" - }, - "fileId": "66DqVtV79NDouyrlS2pF9l", - "sync": false - }, - { - "__type__": "cc.Node", - "_name": "Border", - "_objFlags": 0, - "_parent": { - "__id__": 59 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 67 - } - ], - "_prefab": { - "__id__": 68 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 115, - "height": 6 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -0.041, - -128341.25000000001, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 66 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91" - }, - "_type": 0, - "_sizeMode": 0, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 59 - }, - "asset": { - "__uuid__": "69e392a1-9f30-4448-9cd0-b8f9af9df603" - }, - "fileId": "242Y7/XJpPhZ6c8dSw9g82", - "sync": false - }, { "__type__": "cc.Layout", "_name": "", "_objFlags": 0, "node": { - "__id__": 59 - }, - "_enabled": true, - "_layoutSize": { - "__type__": "cc.Size", - "width": 115, - "height": 215 - }, - "_resize": 1, - "_N$layoutType": 2, - "_N$cellSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 - }, - "_N$startAxis": 0, - "_N$paddingLeft": 0, - "_N$paddingRight": 0, - "_N$paddingTop": 0, - "_N$paddingBottom": 0, - "_N$spacingX": 0, - "_N$spacingY": 0, - "_N$verticalDirection": 1, - "_N$horizontalDirection": 0, - "_N$affectedByScale": false, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 59 - }, - "asset": { - "__uuid__": "69e392a1-9f30-4448-9cd0-b8f9af9df603" - }, - "fileId": "29QGakioxOjJiC3ETKXehF", - "sync": false - }, - { - "__type__": "cc.Layout", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 55 + "__id__": 58 }, "_enabled": true, "_layoutSize": { @@ -2891,7 +2502,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 49 + "__id__": 52 }, "_enabled": true, "alignMode": 0, @@ -2918,7 +2529,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 49 + "__id__": 52 }, "_enabled": true, "_materials": [ @@ -3017,6 +2628,18 @@ "__id__": 1 }, "_enabled": true, + "BtnItem": { + "__uuid__": "69e392a1-9f30-4448-9cd0-b8f9af9df603" + }, + "ItemContent": { + "__id__": 58 + }, + "InfoView": { + "__id__": 9 + }, + "BG": { + "__id__": 6 + }, "_id": "" }, { diff --git a/assets/Prefab/AvatarPanel/Item.prefab b/assets/Prefab/AvatarPanel/Item.prefab index f629f4e..6cf8606 100644 --- a/assets/Prefab/AvatarPanel/Item.prefab +++ b/assets/Prefab/AvatarPanel/Item.prefab @@ -21,17 +21,17 @@ "__id__": 2 }, { - "__id__": 8 + "__id__": 5 } ], "_active": true, "_components": [ { - "__id__": 11 + "__id__": 15 } ], "_prefab": { - "__id__": 12 + "__id__": 16 }, "_opacity": 255, "_color": { @@ -80,6 +80,113 @@ "groupIndex": 0, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Border", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + } + ], + "_prefab": { + "__id__": 4 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 115, + "height": 6 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -0.041, + -128132.25000000001, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91" + }, + "_type": 0, + "_sizeMode": 0, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "69e392a1-9f30-4448-9cd0-b8f9af9df603" + }, + "fileId": "242Y7/XJpPhZ6c8dSw9g82", + "sync": false + }, { "__type__": "cc.Node", "_name": "Avatar", @@ -89,17 +196,23 @@ }, "_children": [ { - "__id__": 3 + "__id__": 6 + }, + { + "__id__": 9 } ], "_active": true, "_components": [ { - "__id__": 6 + "__id__": 12 + }, + { + "__id__": 13 } ], "_prefab": { - "__id__": 7 + "__id__": 14 }, "_opacity": 255, "_color": { @@ -124,7 +237,7 @@ "ctor": "Float64Array", "array": [ -0.445, - -128233.75000000001, + -128239.75000000001, 0, 0, 0, @@ -150,20 +263,20 @@ }, { "__type__": "cc.Node", - "_name": "Pic", + "_name": "BG", "_objFlags": 512, "_parent": { - "__id__": 2 + "__id__": 5 }, "_children": [], "_active": true, "_components": [ { - "__id__": 4 + "__id__": 7 } ], "_prefab": { - "__id__": 5 + "__id__": 8 }, "_opacity": 255, "_color": { @@ -217,7 +330,112 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 3 + "__id__": 6 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": null, + "_type": 0, + "_sizeMode": 0, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "69e392a1-9f30-4448-9cd0-b8f9af9df603" + }, + "fileId": "28/DkOIjFCM7cZQscnEIYj", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "Pic", + "_objFlags": 512, + "_parent": { + "__id__": 5 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 10 + } + ], + "_prefab": { + "__id__": 11 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 170, + "height": 235 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -3.917, + 7.4, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 9 }, "_enabled": true, "_materials": [ @@ -260,7 +478,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 2 + "__id__": 5 }, "_enabled": true, "_materials": [ @@ -275,6 +493,76 @@ "_N$inverted": false, "_id": "" }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 5 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.2, + "clickEvents": [], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 1, + "transition": 1, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 200, + "g": 200, + "b": 200, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 200, + "g": 200, + "b": 200, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 245, + "g": 245, + "b": 245, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 245, + "g": 245, + "b": 245, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 6 + }, + "_id": "" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -286,113 +574,6 @@ "fileId": "66DqVtV79NDouyrlS2pF9l", "sync": false }, - { - "__type__": "cc.Node", - "_name": "Border", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 9 - } - ], - "_prefab": { - "__id__": 10 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 115, - "height": 6 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -0.041, - -128341.25000000001, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 8 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91" - }, - "_type": 0, - "_sizeMode": 0, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "69e392a1-9f30-4448-9cd0-b8f9af9df603" - }, - "fileId": "242Y7/XJpPhZ6c8dSw9g82", - "sync": false - }, { "__type__": "cc.Layout", "_name": "", diff --git a/assets/Prefab/Lobby/Toggle.prefab b/assets/Prefab/Lobby/Toggle.prefab index b3e7ac9..78a36db 100644 --- a/assets/Prefab/Lobby/Toggle.prefab +++ b/assets/Prefab/Lobby/Toggle.prefab @@ -213,7 +213,7 @@ "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 6 @@ -861,14 +861,14 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0.5 }, "_trs": { "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -83.331, + -115, 0, 0, 0, diff --git a/assets/Scene/main.fire b/assets/Scene/main.fire index cdf284a..a7fccec 100644 --- a/assets/Scene/main.fire +++ b/assets/Scene/main.fire @@ -78,13 +78,13 @@ "_active": true, "_components": [ { - "__id__": 1204 + "__id__": 1195 }, { - "__id__": 1205 + "__id__": 1196 }, { - "__id__": 1206 + "__id__": 1197 } ], "_prefab": null, @@ -260,13 +260,13 @@ "__id__": 883 }, { - "__id__": 964 + "__id__": 955 }, { - "__id__": 1032 + "__id__": 1023 }, { - "__id__": 1193 + "__id__": 1184 } ], "_active": true, @@ -34460,14 +34460,14 @@ "_active": false, "_components": [ { - "__id__": 961 + "__id__": 952 }, { - "__id__": 962 + "__id__": 953 } ], "_prefab": { - "__id__": 963 + "__id__": 954 }, "_opacity": 255, "_color": { @@ -34706,7 +34706,7 @@ "__uuid__": "1fd54956-5ef8-4cfb-b7c5-4b1ade8128e8" }, "_type": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillType": 0, "_fillCenter": { "__type__": "cc.Vec2", @@ -34742,13 +34742,13 @@ "__id__": 891 }, { - "__id__": 929 + "__id__": 932 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 960 + "__id__": 951 }, "_opacity": 255, "_color": { @@ -34821,7 +34821,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 928 + "__id__": 931 }, "_opacity": 255, "_color": { @@ -35390,16 +35390,16 @@ "__id__": 907 }, { - "__id__": 914 + "__id__": 915 }, { - "__id__": 921 + "__id__": 923 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 927 + "__id__": 930 }, "_opacity": 255, "_color": { @@ -35466,11 +35466,11 @@ "__id__": 911 }, { - "__id__": 912 + "__id__": 913 } ], "_prefab": { - "__id__": 913 + "__id__": 914 }, "_opacity": 255, "_color": { @@ -35638,7 +35638,11 @@ "_grayMaterial": null, "duration": 0.1, "zoomScale": 0.9, - "clickEvents": [], + "clickEvents": [ + { + "__id__": 912 + } + ], "_N$interactable": true, "_N$enableAutoGrayEffect": false, "_N$transition": 1, @@ -35698,6 +35702,16 @@ }, "_id": "d3baucINBOVYZab7TYRlsB" }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 883 + }, + "component": "", + "_componentId": "424db5d3RpBGIWSlkuF1LkT", + "handler": "OnClickConfirm", + "customEventData": "" + }, { "__type__": "cc.Sprite", "_name": "", @@ -35750,20 +35764,20 @@ }, "_children": [ { - "__id__": 915 + "__id__": 916 } ], "_active": true, "_components": [ { - "__id__": 918 + "__id__": 919 }, { - "__id__": 919 + "__id__": 921 } ], "_prefab": { - "__id__": 920 + "__id__": 922 }, "_opacity": 255, "_color": { @@ -35817,17 +35831,17 @@ "_name": "Image", "_objFlags": 0, "_parent": { - "__id__": 914 + "__id__": 915 }, "_children": [], "_active": true, "_components": [ { - "__id__": 916 + "__id__": 917 } ], "_prefab": { - "__id__": 917 + "__id__": 918 }, "_opacity": 255, "_color": { @@ -35881,7 +35895,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 915 + "__id__": 916 }, "_enabled": true, "_materials": [ @@ -35924,14 +35938,18 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 914 + "__id__": 915 }, "_enabled": true, "_normalMaterial": null, "_grayMaterial": null, "duration": 0.1, "zoomScale": 0.9, - "clickEvents": [], + "clickEvents": [ + { + "__id__": 920 + } + ], "_N$interactable": true, "_N$enableAutoGrayEffect": false, "_N$transition": 1, @@ -35987,16 +36005,26 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 914 + "__id__": 915 }, "_id": "d5jIaSIYRBroijoozMQTit" }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 883 + }, + "component": "", + "_componentId": "424db5d3RpBGIWSlkuF1LkT", + "handler": "Close", + "customEventData": "" + }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "node": { - "__id__": 914 + "__id__": 915 }, "_enabled": true, "_materials": [ @@ -36043,17 +36071,17 @@ }, "_children": [ { - "__id__": 922 + "__id__": 924 } ], "_active": true, "_components": [ { - "__id__": 925 + "__id__": 927 } ], "_prefab": { - "__id__": 926 + "__id__": 929 }, "_opacity": 255, "_color": { @@ -36107,17 +36135,17 @@ "_name": "Image", "_objFlags": 0, "_parent": { - "__id__": 921 + "__id__": 923 }, "_children": [], "_active": true, "_components": [ { - "__id__": 923 + "__id__": 925 } ], "_prefab": { - "__id__": 924 + "__id__": 926 }, "_opacity": 255, "_color": { @@ -36171,7 +36199,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 922 + "__id__": 924 }, "_enabled": true, "_materials": [ @@ -36214,14 +36242,18 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 921 + "__id__": 923 }, "_enabled": true, "_normalMaterial": null, "_grayMaterial": null, "duration": 0.1, "zoomScale": 0.9, - "clickEvents": [], + "clickEvents": [ + { + "__id__": 928 + } + ], "_N$interactable": true, "_N$enableAutoGrayEffect": false, "_N$transition": 1, @@ -36277,10 +36309,20 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 921 + "__id__": 923 }, "_id": "c9W3XsEhtNCZmaqaxaMwFc" }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 883 + }, + "component": "", + "_componentId": "424db5d3RpBGIWSlkuF1LkT", + "handler": "OnClickNextColor", + "customEventData": "" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -36323,13 +36365,13 @@ }, "_children": [ { - "__id__": 930 + "__id__": 933 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 959 + "__id__": 950 }, "_opacity": 255, "_color": { @@ -36383,24 +36425,24 @@ "_name": "Scroll View", "_objFlags": 0, "_parent": { - "__id__": 929 + "__id__": 932 }, "_children": [ { - "__id__": 931 + "__id__": 934 }, { - "__id__": 938 + "__id__": 941 } ], "_active": true, "_components": [ { - "__id__": 936 + "__id__": 939 } ], "_prefab": { - "__id__": 958 + "__id__": 949 }, "_opacity": 255, "_color": { @@ -36454,27 +36496,27 @@ "_name": "scrollBar", "_objFlags": 0, "_parent": { - "__id__": 930 + "__id__": 933 }, "_children": [ { - "__id__": 932 + "__id__": 935 } ], "_active": true, "_components": [ { - "__id__": 935 + "__id__": 938 }, { - "__id__": 955 + "__id__": 946 }, { - "__id__": 956 + "__id__": 947 } ], "_prefab": { - "__id__": 957 + "__id__": 948 }, "_opacity": 0, "_color": { @@ -36528,17 +36570,17 @@ "_name": "bar", "_objFlags": 0, "_parent": { - "__id__": 931 + "__id__": 934 }, "_children": [], "_active": true, "_components": [ { - "__id__": 933 + "__id__": 936 } ], "_prefab": { - "__id__": 934 + "__id__": 937 }, "_opacity": 255, "_color": { @@ -36592,7 +36634,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 932 + "__id__": 935 }, "_enabled": true, "_materials": [ @@ -36635,18 +36677,18 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 931 + "__id__": 934 }, "_enabled": true, "_scrollView": { - "__id__": 936 + "__id__": 939 }, "_touching": false, "_opacity": 255, "enableAutoHide": true, "autoHideTime": 1, "_N$handle": { - "__id__": 933 + "__id__": 936 }, "_N$direction": 1, "_id": "8el9kggj5LfZl90IHFfOlf" @@ -36656,7 +36698,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 930 + "__id__": 933 }, "_enabled": true, "horizontal": false, @@ -36668,14 +36710,14 @@ "scrollEvents": [], "cancelInnerEvents": true, "_N$content": { - "__id__": 937 + "__id__": 940 }, "content": { - "__id__": 937 + "__id__": 940 }, "_N$horizontalScrollBar": null, "_N$verticalScrollBar": { - "__id__": 935 + "__id__": 938 }, "_id": "28cB0m8PdHE5caohDFGnhm" }, @@ -36684,21 +36726,17 @@ "_name": "Content", "_objFlags": 0, "_parent": { - "__id__": 938 + "__id__": 941 }, - "_children": [ - { - "__id__": 941 - } - ], + "_children": [], "_active": true, "_components": [ { - "__id__": 953 + "__id__": 944 } ], "_prefab": { - "__id__": 954 + "__id__": 945 }, "_opacity": 255, "_color": { @@ -36752,21 +36790,21 @@ "_name": "view", "_objFlags": 0, "_parent": { - "__id__": 930 + "__id__": 933 }, "_children": [ { - "__id__": 937 + "__id__": 940 } ], "_active": true, "_components": [ { - "__id__": 939 + "__id__": 942 } ], "_prefab": { - "__id__": 940 + "__id__": 943 }, "_opacity": 255, "_color": { @@ -36820,7 +36858,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 938 + "__id__": 941 }, "_enabled": true, "_materials": [ @@ -36846,439 +36884,12 @@ "fileId": "96UE0srKRJJZj7RvxQ+wdJ", "sync": false }, - { - "__type__": "cc.Node", - "_name": "Item", - "_objFlags": 0, - "_parent": { - "__id__": 937 - }, - "_children": [ - { - "__id__": 942 - }, - { - "__id__": 948 - } - ], - "_active": true, - "_components": [ - { - "__id__": 951 - } - ], - "_prefab": { - "__id__": 952 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 115, - "height": 215 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 596.95 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - 128129.25000000001, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "a3LMsAG8RFA4pPZGSpKWVz" - }, - { - "__type__": "cc.Node", - "_name": "Avatar", - "_objFlags": 0, - "_parent": { - "__id__": 941 - }, - "_children": [ - { - "__id__": 943 - } - ], - "_active": true, - "_components": [ - { - "__id__": 946 - } - ], - "_prefab": { - "__id__": 947 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 115, - "height": 209 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -0.445, - -128233.75000000001, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "67O5xLv/1M05auPAaKiNjG" - }, - { - "__type__": "cc.Node", - "_name": "Pic", - "_objFlags": 512, - "_parent": { - "__id__": 942 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 944 - } - ], - "_prefab": { - "__id__": 945 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 170, - "height": 235 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -3.917, - 7.4, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "49hBEU7vFJYKCVogvLmQVX" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 943 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "591e9fe0-34ff-4ca9-936d-6224c67887ce" - }, - "_type": 0, - "_sizeMode": 0, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "28vgoB1MRL/L+ha6eSPhIt" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 941 - }, - "asset": { - "__uuid__": "69e392a1-9f30-4448-9cd0-b8f9af9df603" - }, - "fileId": "708AlFdEBEV55OC+i1Itot", - "sync": false - }, - { - "__type__": "cc.Mask", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 942 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_spriteFrame": null, - "_type": 0, - "_segments": 64, - "_N$alphaThreshold": 0.1, - "_N$inverted": false, - "_id": "d46u5/cdZJarbNKG3O4MqB" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 941 - }, - "asset": { - "__uuid__": "69e392a1-9f30-4448-9cd0-b8f9af9df603" - }, - "fileId": "66DqVtV79NDouyrlS2pF9l", - "sync": false - }, - { - "__type__": "cc.Node", - "_name": "Border", - "_objFlags": 0, - "_parent": { - "__id__": 941 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 949 - } - ], - "_prefab": { - "__id__": 950 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 115, - "height": 6 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -0.041, - -128341.25000000001, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "c15/LGGypJmrozM6cYY42k" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 948 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91" - }, - "_type": 0, - "_sizeMode": 0, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "f3dp06d/RBXYQBwtytXkXA" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 941 - }, - "asset": { - "__uuid__": "69e392a1-9f30-4448-9cd0-b8f9af9df603" - }, - "fileId": "242Y7/XJpPhZ6c8dSw9g82", - "sync": false - }, { "__type__": "cc.Layout", "_name": "", "_objFlags": 0, "node": { - "__id__": 941 - }, - "_enabled": true, - "_layoutSize": { - "__type__": "cc.Size", - "width": 115, - "height": 215 - }, - "_resize": 1, - "_N$layoutType": 2, - "_N$cellSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 - }, - "_N$startAxis": 0, - "_N$paddingLeft": 0, - "_N$paddingRight": 0, - "_N$paddingTop": 0, - "_N$paddingBottom": 0, - "_N$spacingX": 0, - "_N$spacingY": 0, - "_N$verticalDirection": 1, - "_N$horizontalDirection": 0, - "_N$affectedByScale": false, - "_id": "cbsi3jzDlJI6hYYHD77S2y" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 941 - }, - "asset": { - "__uuid__": "69e392a1-9f30-4448-9cd0-b8f9af9df603" - }, - "fileId": "29QGakioxOjJiC3ETKXehF", - "sync": false - }, - { - "__type__": "cc.Layout", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 937 + "__id__": 940 }, "_enabled": true, "_layoutSize": { @@ -37321,7 +36932,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 931 + "__id__": 934 }, "_enabled": true, "alignMode": 0, @@ -37348,7 +36959,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 931 + "__id__": 934 }, "_enabled": true, "_materials": [ @@ -37447,6 +37058,18 @@ "__id__": 883 }, "_enabled": true, + "BtnItem": { + "__uuid__": "69e392a1-9f30-4448-9cd0-b8f9af9df603" + }, + "ItemContent": { + "__id__": 940 + }, + "InfoView": { + "__id__": 891 + }, + "BG": { + "__id__": 888 + }, "_id": "eeDHtiGJhHRZ1gesRL/Pxm" }, { @@ -37469,29 +37092,29 @@ }, "_children": [ { - "__id__": 965 + "__id__": 956 }, { - "__id__": 968 + "__id__": 959 + }, + { + "__id__": 993 }, { "__id__": 1002 }, { - "__id__": 1011 - }, - { - "__id__": 1015 + "__id__": 1006 } ], "_active": false, "_components": [ { - "__id__": 1030 + "__id__": 1021 } ], "_prefab": { - "__id__": 1031 + "__id__": 1022 }, "_opacity": 255, "_color": { @@ -37545,17 +37168,17 @@ "_name": "mask", "_objFlags": 0, "_parent": { - "__id__": 964 + "__id__": 955 }, "_children": [], "_active": true, "_components": [ { - "__id__": 966 + "__id__": 957 } ], "_prefab": { - "__id__": 967 + "__id__": 958 }, "_opacity": 200, "_color": { @@ -37609,7 +37232,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 965 + "__id__": 956 }, "_enabled": true, "_materials": [ @@ -37639,7 +37262,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -37652,20 +37275,20 @@ "_name": "PlayerMenu", "_objFlags": 0, "_parent": { - "__id__": 964 + "__id__": 955 }, "_children": [ { - "__id__": 969 + "__id__": 960 }, { - "__id__": 972 + "__id__": 963 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 1001 + "__id__": 992 }, "_opacity": 255, "_color": { @@ -37719,17 +37342,17 @@ "_name": "BG", "_objFlags": 0, "_parent": { - "__id__": 968 + "__id__": 959 }, "_children": [], "_active": true, "_components": [ { - "__id__": 970 + "__id__": 961 } ], "_prefab": { - "__id__": 971 + "__id__": 962 }, "_opacity": 255, "_color": { @@ -37783,7 +37406,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 969 + "__id__": 960 }, "_enabled": true, "_materials": [ @@ -37813,7 +37436,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -37826,24 +37449,24 @@ "_name": "Scroll View", "_objFlags": 0, "_parent": { - "__id__": 968 + "__id__": 959 }, "_children": [ { - "__id__": 973 + "__id__": 964 }, { - "__id__": 980 + "__id__": 971 } ], "_active": true, "_components": [ { - "__id__": 978 + "__id__": 969 } ], "_prefab": { - "__id__": 1000 + "__id__": 991 }, "_opacity": 255, "_color": { @@ -37897,27 +37520,27 @@ "_name": "scrollBar", "_objFlags": 0, "_parent": { - "__id__": 972 + "__id__": 963 }, "_children": [ { - "__id__": 974 + "__id__": 965 } ], "_active": true, "_components": [ { - "__id__": 977 + "__id__": 968 }, { - "__id__": 997 + "__id__": 988 }, { - "__id__": 998 + "__id__": 989 } ], "_prefab": { - "__id__": 999 + "__id__": 990 }, "_opacity": 0, "_color": { @@ -37971,17 +37594,17 @@ "_name": "bar", "_objFlags": 0, "_parent": { - "__id__": 973 + "__id__": 964 }, "_children": [], "_active": true, "_components": [ { - "__id__": 975 + "__id__": 966 } ], "_prefab": { - "__id__": 976 + "__id__": 967 }, "_opacity": 255, "_color": { @@ -38035,7 +37658,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 974 + "__id__": 965 }, "_enabled": true, "_materials": [ @@ -38065,7 +37688,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -38078,18 +37701,18 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 973 + "__id__": 964 }, "_enabled": true, "_scrollView": { - "__id__": 978 + "__id__": 969 }, "_touching": false, "_opacity": 255, "enableAutoHide": true, "autoHideTime": 1, "_N$handle": { - "__id__": 975 + "__id__": 966 }, "_N$direction": 1, "_id": "93EXBby0NAX4kFOxNtVmI3" @@ -38099,7 +37722,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 972 + "__id__": 963 }, "_enabled": true, "horizontal": false, @@ -38111,14 +37734,14 @@ "scrollEvents": [], "cancelInnerEvents": true, "_N$content": { - "__id__": 979 + "__id__": 970 }, "content": { - "__id__": 979 + "__id__": 970 }, "_N$horizontalScrollBar": null, "_N$verticalScrollBar": { - "__id__": 977 + "__id__": 968 }, "_id": "70QCLyIHVBibtKdTz4hNpO" }, @@ -38127,21 +37750,21 @@ "_name": "Content", "_objFlags": 0, "_parent": { - "__id__": 980 + "__id__": 971 }, "_children": [ { - "__id__": 983 + "__id__": 974 } ], "_active": true, "_components": [ { - "__id__": 995 + "__id__": 986 } ], "_prefab": { - "__id__": 996 + "__id__": 987 }, "_opacity": 255, "_color": { @@ -38195,21 +37818,21 @@ "_name": "view", "_objFlags": 0, "_parent": { - "__id__": 972 + "__id__": 963 }, "_children": [ { - "__id__": 979 + "__id__": 970 } ], "_active": true, "_components": [ { - "__id__": 981 + "__id__": 972 } ], "_prefab": { - "__id__": 982 + "__id__": 973 }, "_opacity": 255, "_color": { @@ -38263,7 +37886,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 980 + "__id__": 971 }, "_enabled": true, "_materials": [ @@ -38281,7 +37904,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -38294,27 +37917,27 @@ "_name": "History", "_objFlags": 0, "_parent": { - "__id__": 979 + "__id__": 970 }, "_children": [ { - "__id__": 984 + "__id__": 975 }, { - "__id__": 987 + "__id__": 978 }, { - "__id__": 990 + "__id__": 981 } ], "_active": true, "_components": [ { - "__id__": 993 + "__id__": 984 } ], "_prefab": { - "__id__": 994 + "__id__": 985 }, "_opacity": 255, "_color": { @@ -38368,17 +37991,17 @@ "_name": "DateText", "_objFlags": 0, "_parent": { - "__id__": 983 + "__id__": 974 }, "_children": [], "_active": true, "_components": [ { - "__id__": 985 + "__id__": 976 } ], "_prefab": { - "__id__": 986 + "__id__": 977 }, "_opacity": 255, "_color": { @@ -38432,7 +38055,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 984 + "__id__": 975 }, "_enabled": true, "_materials": [ @@ -38463,7 +38086,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 983 + "__id__": 974 }, "asset": { "__uuid__": "236eda57-453f-4e5a-92b8-f879022a5911" @@ -38476,17 +38099,17 @@ "_name": "Players", "_objFlags": 0, "_parent": { - "__id__": 983 + "__id__": 974 }, "_children": [], "_active": true, "_components": [ { - "__id__": 988 + "__id__": 979 } ], "_prefab": { - "__id__": 989 + "__id__": 980 }, "_opacity": 255, "_color": { @@ -38540,7 +38163,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 987 + "__id__": 978 }, "_enabled": true, "_layoutSize": { @@ -38570,7 +38193,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 983 + "__id__": 974 }, "asset": { "__uuid__": "236eda57-453f-4e5a-92b8-f879022a5911" @@ -38583,17 +38206,17 @@ "_name": "Image", "_objFlags": 0, "_parent": { - "__id__": 983 + "__id__": 974 }, "_children": [], "_active": true, "_components": [ { - "__id__": 991 + "__id__": 982 } ], "_prefab": { - "__id__": 992 + "__id__": 983 }, "_opacity": 255, "_color": { @@ -38647,7 +38270,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 990 + "__id__": 981 }, "_enabled": true, "_materials": [ @@ -38677,7 +38300,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 983 + "__id__": 974 }, "asset": { "__uuid__": "236eda57-453f-4e5a-92b8-f879022a5911" @@ -38690,7 +38313,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 983 + "__id__": 974 }, "_enabled": true, "_layoutSize": { @@ -38720,7 +38343,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 983 + "__id__": 974 }, "asset": { "__uuid__": "236eda57-453f-4e5a-92b8-f879022a5911" @@ -38733,7 +38356,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 979 + "__id__": 970 }, "_enabled": true, "_layoutSize": { @@ -38763,7 +38386,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -38776,7 +38399,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 973 + "__id__": 964 }, "_enabled": true, "alignMode": 0, @@ -38803,7 +38426,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 973 + "__id__": 964 }, "_enabled": true, "_materials": [ @@ -38833,7 +38456,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -38844,7 +38467,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -38855,7 +38478,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -38868,24 +38491,24 @@ "_name": "Hint", "_objFlags": 0, "_parent": { - "__id__": 964 + "__id__": 955 }, "_children": [ { - "__id__": 1003 + "__id__": 994 }, { - "__id__": 1006 + "__id__": 997 } ], "_active": true, "_components": [ { - "__id__": 1009 + "__id__": 1000 } ], "_prefab": { - "__id__": 1010 + "__id__": 1001 }, "_opacity": 255, "_color": { @@ -38939,17 +38562,17 @@ "_name": "Text", "_objFlags": 0, "_parent": { - "__id__": 1002 + "__id__": 993 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1004 + "__id__": 995 } ], "_prefab": { - "__id__": 1005 + "__id__": 996 }, "_opacity": 255, "_color": { @@ -39003,7 +38626,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1003 + "__id__": 994 }, "_enabled": true, "_materials": [ @@ -39034,7 +38657,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -39047,17 +38670,17 @@ "_name": "Image", "_objFlags": 0, "_parent": { - "__id__": 1002 + "__id__": 993 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1007 + "__id__": 998 } ], "_prefab": { - "__id__": 1008 + "__id__": 999 }, "_opacity": 255, "_color": { @@ -39111,7 +38734,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1006 + "__id__": 997 }, "_enabled": true, "_materials": [ @@ -39141,7 +38764,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -39154,7 +38777,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1002 + "__id__": 993 }, "_enabled": true, "_materials": [ @@ -39184,7 +38807,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -39197,20 +38820,20 @@ "_name": "Btn_Exit", "_objFlags": 0, "_parent": { - "__id__": 964 + "__id__": 955 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1012 + "__id__": 1003 }, { - "__id__": 1013 + "__id__": 1004 } ], "_prefab": { - "__id__": 1014 + "__id__": 1005 }, "_opacity": 255, "_color": { @@ -39264,7 +38887,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1011 + "__id__": 1002 }, "_enabled": true, "_normalMaterial": null, @@ -39327,7 +38950,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1011 + "__id__": 1002 }, "_id": "54zwB20O5LoK4G0Yz+F05k" }, @@ -39336,7 +38959,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1011 + "__id__": 1002 }, "_enabled": true, "_materials": [ @@ -39366,7 +38989,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -39379,27 +39002,27 @@ "_name": "Btn_Reset", "_objFlags": 0, "_parent": { - "__id__": 964 + "__id__": 955 }, "_children": [ { - "__id__": 1016 + "__id__": 1007 }, { - "__id__": 1019 + "__id__": 1010 } ], "_active": true, "_components": [ { - "__id__": 1027 + "__id__": 1018 }, { - "__id__": 1028 + "__id__": 1019 } ], "_prefab": { - "__id__": 1029 + "__id__": 1020 }, "_opacity": 255, "_color": { @@ -39453,17 +39076,17 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 1015 + "__id__": 1006 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1017 + "__id__": 1008 } ], "_prefab": { - "__id__": 1018 + "__id__": 1009 }, "_opacity": 255, "_color": { @@ -39517,7 +39140,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1016 + "__id__": 1007 }, "_enabled": true, "_materials": [ @@ -39548,7 +39171,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -39561,20 +39184,20 @@ "_name": "holdLine", "_objFlags": 512, "_parent": { - "__id__": 1015 + "__id__": 1006 }, "_children": [ { - "__id__": 1020 + "__id__": 1011 }, { - "__id__": 1023 + "__id__": 1014 } ], "_active": false, "_components": [], "_prefab": { - "__id__": 1026 + "__id__": 1017 }, "_opacity": 255, "_color": { @@ -39628,17 +39251,17 @@ "_name": "bg", "_objFlags": 0, "_parent": { - "__id__": 1019 + "__id__": 1010 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1021 + "__id__": 1012 } ], "_prefab": { - "__id__": 1022 + "__id__": 1013 }, "_opacity": 255, "_color": { @@ -39692,7 +39315,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1020 + "__id__": 1011 }, "_enabled": true, "_materials": [ @@ -39722,7 +39345,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -39735,17 +39358,17 @@ "_name": "line", "_objFlags": 0, "_parent": { - "__id__": 1019 + "__id__": 1010 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1024 + "__id__": 1015 } ], "_prefab": { - "__id__": 1025 + "__id__": 1016 }, "_opacity": 255, "_color": { @@ -39799,7 +39422,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1023 + "__id__": 1014 }, "_enabled": true, "_materials": [ @@ -39829,7 +39452,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -39840,7 +39463,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -39853,7 +39476,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1015 + "__id__": 1006 }, "_enabled": true, "_normalMaterial": { @@ -39918,7 +39541,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1015 + "__id__": 1006 }, "_id": "08bYeVhvpPO5ASTUcYcLTQ" }, @@ -39927,7 +39550,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1015 + "__id__": 1006 }, "_enabled": true, "_materials": [ @@ -39957,7 +39580,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -39970,7 +39593,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 964 + "__id__": 955 }, "_enabled": true, "_id": "a3k4u3cVRC/YD8xB8Ijlcx" @@ -39978,7 +39601,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 964 + "__id__": 955 }, "asset": { "__uuid__": "dcfed4bd-d59f-455e-b05e-21e3bca5275e" @@ -39995,19 +39618,19 @@ }, "_children": [ { - "__id__": 1033 + "__id__": 1024 }, { - "__id__": 1096 + "__id__": 1087 }, { - "__id__": 1146 + "__id__": 1137 }, { - "__id__": 1188 + "__id__": 1179 }, { - "__id__": 1192 + "__id__": 1183 } ], "_active": false, @@ -40065,23 +39688,23 @@ "_name": "Member", "_objFlags": 0, "_parent": { - "__id__": 1032 + "__id__": 1023 }, "_children": [ { - "__id__": 1034 + "__id__": 1025 }, { - "__id__": 1036 + "__id__": 1027 }, { - "__id__": 1078 + "__id__": 1069 }, { - "__id__": 1080 + "__id__": 1071 }, { - "__id__": 1091 + "__id__": 1082 } ], "_active": true, @@ -40139,13 +39762,13 @@ "_name": "BG", "_objFlags": 0, "_parent": { - "__id__": 1033 + "__id__": 1024 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1035 + "__id__": 1026 } ], "_prefab": null, @@ -40201,7 +39824,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1034 + "__id__": 1025 }, "_enabled": true, "_materials": [ @@ -40233,20 +39856,20 @@ "_name": "Scroll View", "_objFlags": 0, "_parent": { - "__id__": 1033 + "__id__": 1024 }, "_children": [ { - "__id__": 1037 + "__id__": 1028 }, { - "__id__": 1043 + "__id__": 1034 } ], "_active": true, "_components": [ { - "__id__": 1041 + "__id__": 1032 } ], "_prefab": null, @@ -40302,23 +39925,23 @@ "_name": "scrollBar", "_objFlags": 0, "_parent": { - "__id__": 1036 + "__id__": 1027 }, "_children": [ { - "__id__": 1038 + "__id__": 1029 } ], "_active": true, "_components": [ { - "__id__": 1040 + "__id__": 1031 }, { - "__id__": 1076 + "__id__": 1067 }, { - "__id__": 1077 + "__id__": 1068 } ], "_prefab": null, @@ -40374,13 +39997,13 @@ "_name": "bar", "_objFlags": 0, "_parent": { - "__id__": 1037 + "__id__": 1028 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1039 + "__id__": 1030 } ], "_prefab": null, @@ -40436,7 +40059,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1038 + "__id__": 1029 }, "_enabled": true, "_materials": [ @@ -40468,18 +40091,18 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1037 + "__id__": 1028 }, "_enabled": true, "_scrollView": { - "__id__": 1041 + "__id__": 1032 }, "_touching": false, "_opacity": 255, "enableAutoHide": true, "autoHideTime": 1, "_N$handle": { - "__id__": 1039 + "__id__": 1030 }, "_N$direction": 1, "_id": "dfS79vR8pF0YRbJ3sXLP6s" @@ -40489,7 +40112,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1036 + "__id__": 1027 }, "_enabled": true, "horizontal": false, @@ -40501,14 +40124,14 @@ "scrollEvents": [], "cancelInnerEvents": true, "_N$content": { - "__id__": 1042 + "__id__": 1033 }, "content": { - "__id__": 1042 + "__id__": 1033 }, "_N$horizontalScrollBar": null, "_N$verticalScrollBar": { - "__id__": 1040 + "__id__": 1031 }, "_id": "e8xHlNVgVA3aHPisS5yjj+" }, @@ -40517,17 +40140,17 @@ "_name": "Member", "_objFlags": 0, "_parent": { - "__id__": 1043 + "__id__": 1034 }, "_children": [ { - "__id__": 1045 + "__id__": 1036 } ], "_active": true, "_components": [ { - "__id__": 1075 + "__id__": 1066 } ], "_prefab": null, @@ -40583,17 +40206,17 @@ "_name": "view", "_objFlags": 0, "_parent": { - "__id__": 1036 + "__id__": 1027 }, "_children": [ { - "__id__": 1042 + "__id__": 1033 } ], "_active": true, "_components": [ { - "__id__": 1044 + "__id__": 1035 } ], "_prefab": null, @@ -40649,7 +40272,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1043 + "__id__": 1034 }, "_enabled": true, "_materials": [ @@ -40669,39 +40292,39 @@ "_name": "Toggle", "_objFlags": 0, "_parent": { - "__id__": 1042 + "__id__": 1033 }, "_children": [ { - "__id__": 1046 + "__id__": 1037 + }, + { + "__id__": 1040 + }, + { + "__id__": 1043 }, { "__id__": 1049 }, { - "__id__": 1052 + "__id__": 1056 }, { - "__id__": 1058 - }, - { - "__id__": 1065 - }, - { - "__id__": 1068 + "__id__": 1059 } ], "_active": true, "_components": [ { - "__id__": 1072 + "__id__": 1063 }, { - "__id__": 1073 + "__id__": 1064 } ], "_prefab": { - "__id__": 1074 + "__id__": 1065 }, "_opacity": 255, "_color": { @@ -40755,17 +40378,17 @@ "_name": "Image", "_objFlags": 0, "_parent": { - "__id__": 1045 + "__id__": 1036 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1047 + "__id__": 1038 } ], "_prefab": { - "__id__": 1048 + "__id__": 1039 }, "_opacity": 255, "_color": { @@ -40819,7 +40442,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1046 + "__id__": 1037 }, "_enabled": true, "_materials": [ @@ -40849,7 +40472,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1045 + "__id__": 1036 }, "asset": { "__uuid__": "266b6fad-84ee-4a95-8d59-49ec8c220df6" @@ -40862,17 +40485,17 @@ "_name": "Score", "_objFlags": 0, "_parent": { - "__id__": 1045 + "__id__": 1036 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1050 + "__id__": 1041 } ], "_prefab": { - "__id__": 1051 + "__id__": 1042 }, "_opacity": 255, "_color": { @@ -40926,7 +40549,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1049 + "__id__": 1040 }, "_enabled": true, "_materials": [ @@ -40957,7 +40580,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1045 + "__id__": 1036 }, "asset": { "__uuid__": "266b6fad-84ee-4a95-8d59-49ec8c220df6" @@ -40970,21 +40593,21 @@ "_name": "Background", "_objFlags": 0, "_parent": { - "__id__": 1045 + "__id__": 1036 }, "_children": [ { - "__id__": 1053 + "__id__": 1044 } ], "_active": true, "_components": [ { - "__id__": 1056 + "__id__": 1047 } ], "_prefab": { - "__id__": 1057 + "__id__": 1048 }, "_opacity": 255, "_color": { @@ -41038,17 +40661,17 @@ "_name": "checkmark", "_objFlags": 0, "_parent": { - "__id__": 1052 + "__id__": 1043 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1054 + "__id__": 1045 } ], "_prefab": { - "__id__": 1055 + "__id__": 1046 }, "_opacity": 255, "_color": { @@ -41102,7 +40725,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1053 + "__id__": 1044 }, "_enabled": true, "_materials": [ @@ -41132,7 +40755,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1045 + "__id__": 1036 }, "asset": { "__uuid__": "266b6fad-84ee-4a95-8d59-49ec8c220df6" @@ -41145,7 +40768,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1052 + "__id__": 1043 }, "_enabled": true, "_materials": [ @@ -41175,7 +40798,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1045 + "__id__": 1036 }, "asset": { "__uuid__": "266b6fad-84ee-4a95-8d59-49ec8c220df6" @@ -41188,21 +40811,21 @@ "_name": "Avatar", "_objFlags": 0, "_parent": { - "__id__": 1045 + "__id__": 1036 }, "_children": [ { - "__id__": 1059 + "__id__": 1050 } ], "_active": true, "_components": [ { - "__id__": 1063 + "__id__": 1054 } ], "_prefab": { - "__id__": 1064 + "__id__": 1055 }, "_opacity": 255, "_color": { @@ -41256,20 +40879,20 @@ "_name": "Pic", "_objFlags": 0, "_parent": { - "__id__": 1058 + "__id__": 1049 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1060 + "__id__": 1051 }, { - "__id__": 1061 + "__id__": 1052 } ], "_prefab": { - "__id__": 1062 + "__id__": 1053 }, "_opacity": 255, "_color": { @@ -41323,7 +40946,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1059 + "__id__": 1050 }, "_enabled": true, "_normalMaterial": null, @@ -41386,7 +41009,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1059 + "__id__": 1050 }, "_id": "8bfJhygDZP2rOwo5ya2i+b" }, @@ -41395,7 +41018,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1059 + "__id__": 1050 }, "_enabled": true, "_materials": [ @@ -41425,7 +41048,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1045 + "__id__": 1036 }, "asset": { "__uuid__": "266b6fad-84ee-4a95-8d59-49ec8c220df6" @@ -41438,7 +41061,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1058 + "__id__": 1049 }, "_enabled": false, "_materials": [ @@ -41456,7 +41079,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1045 + "__id__": 1036 }, "asset": { "__uuid__": "266b6fad-84ee-4a95-8d59-49ec8c220df6" @@ -41469,17 +41092,17 @@ "_name": "Name", "_objFlags": 0, "_parent": { - "__id__": 1045 + "__id__": 1036 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1066 + "__id__": 1057 } ], "_prefab": { - "__id__": 1067 + "__id__": 1058 }, "_opacity": 255, "_color": { @@ -41533,7 +41156,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1065 + "__id__": 1056 }, "_enabled": true, "_materials": [ @@ -41564,7 +41187,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1045 + "__id__": 1036 }, "asset": { "__uuid__": "266b6fad-84ee-4a95-8d59-49ec8c220df6" @@ -41577,20 +41200,20 @@ "_name": "Btn_Del", "_objFlags": 0, "_parent": { - "__id__": 1045 + "__id__": 1036 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1069 + "__id__": 1060 }, { - "__id__": 1070 + "__id__": 1061 } ], "_prefab": { - "__id__": 1071 + "__id__": 1062 }, "_opacity": 255, "_color": { @@ -41644,7 +41267,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1068 + "__id__": 1059 }, "_enabled": true, "_normalMaterial": null, @@ -41707,7 +41330,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1068 + "__id__": 1059 }, "_id": "91I3OpGSBB9qD2Kz+gF8GY" }, @@ -41716,7 +41339,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1068 + "__id__": 1059 }, "_enabled": true, "_materials": [ @@ -41746,7 +41369,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1045 + "__id__": 1036 }, "asset": { "__uuid__": "266b6fad-84ee-4a95-8d59-49ec8c220df6" @@ -41759,7 +41382,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1045 + "__id__": 1036 }, "_enabled": true, "_normalMaterial": null, @@ -41820,12 +41443,12 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1046 + "__id__": 1037 }, "_N$isChecked": true, "toggleGroup": null, "checkMark": { - "__id__": 1054 + "__id__": 1045 }, "checkEvents": [], "_id": "fcrgM9CZhN45zSIkXeKsUe" @@ -41835,7 +41458,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1045 + "__id__": 1036 }, "_enabled": true, "_materials": [ @@ -41853,7 +41476,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1045 + "__id__": 1036 }, "asset": { "__uuid__": "266b6fad-84ee-4a95-8d59-49ec8c220df6" @@ -41866,7 +41489,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1042 + "__id__": 1033 }, "_enabled": true, "_layoutSize": { @@ -41898,7 +41521,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1037 + "__id__": 1028 }, "_enabled": true, "alignMode": 0, @@ -41925,7 +41548,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1037 + "__id__": 1028 }, "_enabled": true, "_materials": [ @@ -41957,13 +41580,13 @@ "_name": "Desc", "_objFlags": 0, "_parent": { - "__id__": 1033 + "__id__": 1024 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1079 + "__id__": 1070 } ], "_prefab": null, @@ -42019,7 +41642,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1078 + "__id__": 1069 }, "_enabled": true, "_materials": [ @@ -42052,23 +41675,23 @@ "_name": "InputMember", "_objFlags": 0, "_parent": { - "__id__": 1033 + "__id__": 1024 }, "_children": [ { - "__id__": 1081 + "__id__": 1072 }, { - "__id__": 1084 + "__id__": 1075 }, { - "__id__": 1087 + "__id__": 1078 } ], "_active": true, "_components": [ { - "__id__": 1090 + "__id__": 1081 } ], "_prefab": null, @@ -42124,16 +41747,16 @@ "_name": "BACKGROUND_SPRITE", "_objFlags": 512, "_parent": { - "__id__": 1080 + "__id__": 1071 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1082 + "__id__": 1073 }, { - "__id__": 1083 + "__id__": 1074 } ], "_prefab": null, @@ -42189,7 +41812,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1081 + "__id__": 1072 }, "_enabled": true, "_materials": [ @@ -42221,7 +41844,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1081 + "__id__": 1072 }, "_enabled": true, "alignMode": 0, @@ -42248,16 +41871,16 @@ "_name": "TEXT_LABEL", "_objFlags": 512, "_parent": { - "__id__": 1080 + "__id__": 1071 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1085 + "__id__": 1076 }, { - "__id__": 1086 + "__id__": 1077 } ], "_prefab": null, @@ -42313,7 +41936,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1084 + "__id__": 1075 }, "_enabled": true, "_materials": [ @@ -42346,7 +41969,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1084 + "__id__": 1075 }, "_enabled": true, "alignMode": 0, @@ -42373,16 +41996,16 @@ "_name": "PLACEHOLDER_LABEL", "_objFlags": 512, "_parent": { - "__id__": 1080 + "__id__": 1071 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1088 + "__id__": 1079 }, { - "__id__": 1089 + "__id__": 1080 } ], "_prefab": null, @@ -42438,7 +42061,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1087 + "__id__": 1078 }, "_enabled": true, "_materials": [ @@ -42471,7 +42094,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1087 + "__id__": 1078 }, "_enabled": true, "alignMode": 0, @@ -42498,7 +42121,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1080 + "__id__": 1071 }, "_enabled": true, "_string": "", @@ -42510,13 +42133,13 @@ "editingDidEnded": [], "editingReturn": [], "_N$textLabel": { - "__id__": 1085 + "__id__": 1076 }, "_N$placeholderLabel": { - "__id__": 1088 + "__id__": 1079 }, "_N$background": { - "__id__": 1082 + "__id__": 1073 }, "_N$inputFlag": 5, "_N$inputMode": 6, @@ -42528,20 +42151,20 @@ "_name": "Btn_Add", "_objFlags": 0, "_parent": { - "__id__": 1033 + "__id__": 1024 }, "_children": [ { - "__id__": 1092 + "__id__": 1083 } ], "_active": true, "_components": [ { - "__id__": 1094 + "__id__": 1085 }, { - "__id__": 1095 + "__id__": 1086 } ], "_prefab": null, @@ -42597,13 +42220,13 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 1091 + "__id__": 1082 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1093 + "__id__": 1084 } ], "_prefab": null, @@ -42659,7 +42282,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1092 + "__id__": 1083 }, "_enabled": true, "_materials": [ @@ -42692,7 +42315,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1091 + "__id__": 1082 }, "_enabled": true, "_normalMaterial": null, @@ -42755,7 +42378,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1091 + "__id__": 1082 }, "_id": "269xPFNx9KSpYE3owopTCs" }, @@ -42764,7 +42387,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1091 + "__id__": 1082 }, "_enabled": true, "_materials": [ @@ -42796,17 +42419,17 @@ "_name": "RightLayout", "_objFlags": 0, "_parent": { - "__id__": 1032 + "__id__": 1023 }, "_children": [ { - "__id__": 1097 + "__id__": 1088 }, { - "__id__": 1127 + "__id__": 1118 }, { - "__id__": 1145 + "__id__": 1136 } ], "_active": true, @@ -42864,23 +42487,23 @@ "_name": "Team", "_objFlags": 0, "_parent": { - "__id__": 1096 + "__id__": 1087 }, "_children": [ { - "__id__": 1098 + "__id__": 1089 }, { - "__id__": 1100 + "__id__": 1091 }, { - "__id__": 1124 + "__id__": 1115 } ], "_active": true, "_components": [ { - "__id__": 1126 + "__id__": 1117 } ], "_prefab": null, @@ -42936,13 +42559,13 @@ "_name": "Title", "_objFlags": 0, "_parent": { - "__id__": 1097 + "__id__": 1088 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1099 + "__id__": 1090 } ], "_prefab": null, @@ -42998,7 +42621,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1098 + "__id__": 1089 }, "_enabled": true, "_materials": [ @@ -43031,20 +42654,20 @@ "_name": "Scroll View", "_objFlags": 0, "_parent": { - "__id__": 1097 + "__id__": 1088 }, "_children": [ { - "__id__": 1101 + "__id__": 1092 }, { - "__id__": 1107 + "__id__": 1098 } ], "_active": true, "_components": [ { - "__id__": 1105 + "__id__": 1096 } ], "_prefab": null, @@ -43100,23 +42723,23 @@ "_name": "scrollBar", "_objFlags": 0, "_parent": { - "__id__": 1100 + "__id__": 1091 }, "_children": [ { - "__id__": 1102 + "__id__": 1093 } ], "_active": true, "_components": [ { - "__id__": 1104 + "__id__": 1095 }, { - "__id__": 1122 + "__id__": 1113 }, { - "__id__": 1123 + "__id__": 1114 } ], "_prefab": null, @@ -43172,13 +42795,13 @@ "_name": "bar", "_objFlags": 0, "_parent": { - "__id__": 1101 + "__id__": 1092 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1103 + "__id__": 1094 } ], "_prefab": null, @@ -43234,7 +42857,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1102 + "__id__": 1093 }, "_enabled": true, "_materials": [ @@ -43266,18 +42889,18 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1101 + "__id__": 1092 }, "_enabled": true, "_scrollView": { - "__id__": 1105 + "__id__": 1096 }, "_touching": false, "_opacity": 255, "enableAutoHide": true, "autoHideTime": 1, "_N$handle": { - "__id__": 1103 + "__id__": 1094 }, "_N$direction": 1, "_id": "87ofFDBvhFVaDFruqxsL6d" @@ -43287,7 +42910,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1100 + "__id__": 1091 }, "_enabled": true, "horizontal": false, @@ -43299,14 +42922,14 @@ "scrollEvents": [], "cancelInnerEvents": true, "_N$content": { - "__id__": 1106 + "__id__": 1097 }, "content": { - "__id__": 1106 + "__id__": 1097 }, "_N$horizontalScrollBar": null, "_N$verticalScrollBar": { - "__id__": 1104 + "__id__": 1095 }, "_id": "a0nu1xFgZMNIWWoAc0Nmsj" }, @@ -43315,17 +42938,17 @@ "_name": "Content", "_objFlags": 0, "_parent": { - "__id__": 1107 + "__id__": 1098 }, "_children": [ { - "__id__": 1109 + "__id__": 1100 } ], "_active": true, "_components": [ { - "__id__": 1121 + "__id__": 1112 } ], "_prefab": null, @@ -43381,17 +43004,17 @@ "_name": "view", "_objFlags": 0, "_parent": { - "__id__": 1100 + "__id__": 1091 }, "_children": [ { - "__id__": 1106 + "__id__": 1097 } ], "_active": true, "_components": [ { - "__id__": 1108 + "__id__": 1099 } ], "_prefab": null, @@ -43447,7 +43070,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1107 + "__id__": 1098 }, "_enabled": true, "_materials": [ @@ -43467,23 +43090,23 @@ "_name": "TeamItem", "_objFlags": 0, "_parent": { - "__id__": 1106 + "__id__": 1097 }, "_children": [ { - "__id__": 1110 + "__id__": 1101 }, { - "__id__": 1114 + "__id__": 1105 }, { - "__id__": 1118 + "__id__": 1109 } ], "_active": true, "_components": [ { - "__id__": 1120 + "__id__": 1111 } ], "_prefab": null, @@ -43539,17 +43162,17 @@ "_name": "Member_1", "_objFlags": 0, "_parent": { - "__id__": 1109 + "__id__": 1100 }, "_children": [ { - "__id__": 1111 + "__id__": 1102 } ], "_active": true, "_components": [ { - "__id__": 1113 + "__id__": 1104 } ], "_prefab": null, @@ -43605,13 +43228,13 @@ "_name": "Name", "_objFlags": 0, "_parent": { - "__id__": 1110 + "__id__": 1101 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1112 + "__id__": 1103 } ], "_prefab": null, @@ -43667,7 +43290,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1111 + "__id__": 1102 }, "_enabled": true, "_materials": [ @@ -43700,7 +43323,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1110 + "__id__": 1101 }, "_enabled": true, "_materials": [ @@ -43732,17 +43355,17 @@ "_name": "Member_2", "_objFlags": 0, "_parent": { - "__id__": 1109 + "__id__": 1100 }, "_children": [ { - "__id__": 1115 + "__id__": 1106 } ], "_active": true, "_components": [ { - "__id__": 1117 + "__id__": 1108 } ], "_prefab": null, @@ -43798,13 +43421,13 @@ "_name": "Name", "_objFlags": 0, "_parent": { - "__id__": 1114 + "__id__": 1105 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1116 + "__id__": 1107 } ], "_prefab": null, @@ -43860,7 +43483,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1115 + "__id__": 1106 }, "_enabled": true, "_materials": [ @@ -43893,7 +43516,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1114 + "__id__": 1105 }, "_enabled": true, "_materials": [ @@ -43925,13 +43548,13 @@ "_name": "No", "_objFlags": 0, "_parent": { - "__id__": 1109 + "__id__": 1100 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1119 + "__id__": 1110 } ], "_prefab": null, @@ -43987,7 +43610,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1118 + "__id__": 1109 }, "_enabled": true, "_materials": [ @@ -44020,7 +43643,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1109 + "__id__": 1100 }, "_enabled": true, "_materials": [ @@ -44052,7 +43675,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1106 + "__id__": 1097 }, "_enabled": true, "_layoutSize": { @@ -44084,7 +43707,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1101 + "__id__": 1092 }, "_enabled": true, "alignMode": 0, @@ -44111,7 +43734,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1101 + "__id__": 1092 }, "_enabled": true, "_materials": [ @@ -44143,13 +43766,13 @@ "_name": "Image", "_objFlags": 0, "_parent": { - "__id__": 1097 + "__id__": 1088 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1125 + "__id__": 1116 } ], "_prefab": null, @@ -44205,7 +43828,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1124 + "__id__": 1115 }, "_enabled": true, "_materials": [ @@ -44237,7 +43860,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1097 + "__id__": 1088 }, "_enabled": true, "_materials": [ @@ -44269,14 +43892,14 @@ "_name": "TeamButtonArea", "_objFlags": 0, "_parent": { - "__id__": 1096 + "__id__": 1087 }, "_children": [ { - "__id__": 1128 + "__id__": 1119 }, { - "__id__": 1139 + "__id__": 1130 } ], "_active": true, @@ -44334,14 +43957,14 @@ "_name": "Team", "_objFlags": 0, "_parent": { - "__id__": 1127 + "__id__": 1118 }, "_children": [ { - "__id__": 1129 + "__id__": 1120 }, { - "__id__": 1134 + "__id__": 1125 } ], "_active": true, @@ -44399,20 +44022,20 @@ "_name": "Btn_Team", "_objFlags": 0, "_parent": { - "__id__": 1128 + "__id__": 1119 }, "_children": [ { - "__id__": 1130 + "__id__": 1121 } ], "_active": true, "_components": [ { - "__id__": 1132 + "__id__": 1123 }, { - "__id__": 1133 + "__id__": 1124 } ], "_prefab": null, @@ -44468,13 +44091,13 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 1129 + "__id__": 1120 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1131 + "__id__": 1122 } ], "_prefab": null, @@ -44530,7 +44153,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1130 + "__id__": 1121 }, "_enabled": true, "_materials": [ @@ -44563,7 +44186,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1129 + "__id__": 1120 }, "_enabled": true, "_normalMaterial": null, @@ -44626,7 +44249,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1129 + "__id__": 1120 }, "_id": "f7J6Y8AexBl5rpF34/4kAq" }, @@ -44635,7 +44258,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1129 + "__id__": 1120 }, "_enabled": true, "_materials": [ @@ -44667,20 +44290,20 @@ "_name": "Btn_TeamAuto", "_objFlags": 0, "_parent": { - "__id__": 1128 + "__id__": 1119 }, "_children": [ { - "__id__": 1135 + "__id__": 1126 } ], "_active": true, "_components": [ { - "__id__": 1137 + "__id__": 1128 }, { - "__id__": 1138 + "__id__": 1129 } ], "_prefab": null, @@ -44736,13 +44359,13 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 1134 + "__id__": 1125 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1136 + "__id__": 1127 } ], "_prefab": null, @@ -44798,7 +44421,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1135 + "__id__": 1126 }, "_enabled": true, "_materials": [ @@ -44831,7 +44454,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1134 + "__id__": 1125 }, "_enabled": true, "_normalMaterial": null, @@ -44894,7 +44517,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1134 + "__id__": 1125 }, "_id": "24w1Nxvd9OD5cLoua+pGt8" }, @@ -44903,7 +44526,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1134 + "__id__": 1125 }, "_enabled": true, "_materials": [ @@ -44935,11 +44558,11 @@ "_name": "TeamUnlock", "_objFlags": 0, "_parent": { - "__id__": 1127 + "__id__": 1118 }, "_children": [ { - "__id__": 1140 + "__id__": 1131 } ], "_active": false, @@ -44997,20 +44620,20 @@ "_name": "Btn_TeamUnlock", "_objFlags": 0, "_parent": { - "__id__": 1139 + "__id__": 1130 }, "_children": [ { - "__id__": 1141 + "__id__": 1132 } ], "_active": true, "_components": [ { - "__id__": 1143 + "__id__": 1134 }, { - "__id__": 1144 + "__id__": 1135 } ], "_prefab": null, @@ -45066,13 +44689,13 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 1140 + "__id__": 1131 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1142 + "__id__": 1133 } ], "_prefab": null, @@ -45128,7 +44751,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1141 + "__id__": 1132 }, "_enabled": true, "_materials": [ @@ -45161,7 +44784,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1140 + "__id__": 1131 }, "_enabled": true, "_normalMaterial": null, @@ -45224,7 +44847,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1140 + "__id__": 1131 }, "_id": "81YKtkIANISqoYQNi4pyEo" }, @@ -45233,7 +44856,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1140 + "__id__": 1131 }, "_enabled": true, "_materials": [ @@ -45265,7 +44888,7 @@ "_name": "ScoreButtonArea", "_objFlags": 0, "_parent": { - "__id__": 1096 + "__id__": 1087 }, "_children": [], "_active": true, @@ -45323,23 +44946,23 @@ "_name": "Button", "_objFlags": 0, "_parent": { - "__id__": 1032 + "__id__": 1023 }, "_children": [ { - "__id__": 1147 + "__id__": 1138 }, { - "__id__": 1152 + "__id__": 1143 }, { - "__id__": 1157 + "__id__": 1148 }, { - "__id__": 1162 + "__id__": 1153 }, { - "__id__": 1167 + "__id__": 1158 } ], "_active": true, @@ -45397,20 +45020,20 @@ "_name": "Btn_ScoreBoard", "_objFlags": 0, "_parent": { - "__id__": 1146 + "__id__": 1137 }, "_children": [ { - "__id__": 1148 + "__id__": 1139 } ], "_active": true, "_components": [ { - "__id__": 1150 + "__id__": 1141 }, { - "__id__": 1151 + "__id__": 1142 } ], "_prefab": null, @@ -45466,13 +45089,13 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 1147 + "__id__": 1138 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1149 + "__id__": 1140 } ], "_prefab": null, @@ -45528,7 +45151,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1148 + "__id__": 1139 }, "_enabled": true, "_materials": [ @@ -45561,7 +45184,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1147 + "__id__": 1138 }, "_enabled": true, "_normalMaterial": null, @@ -45624,7 +45247,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1147 + "__id__": 1138 }, "_id": "e37CUk7eNOBqfWlw4L65m+" }, @@ -45633,7 +45256,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1147 + "__id__": 1138 }, "_enabled": true, "_materials": [ @@ -45665,20 +45288,20 @@ "_name": "Btn_Clear", "_objFlags": 0, "_parent": { - "__id__": 1146 + "__id__": 1137 }, "_children": [ { - "__id__": 1153 + "__id__": 1144 } ], "_active": false, "_components": [ { - "__id__": 1155 + "__id__": 1146 }, { - "__id__": 1156 + "__id__": 1147 } ], "_prefab": null, @@ -45734,13 +45357,13 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 1152 + "__id__": 1143 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1154 + "__id__": 1145 } ], "_prefab": null, @@ -45796,7 +45419,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1153 + "__id__": 1144 }, "_enabled": true, "_materials": [ @@ -45829,7 +45452,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1152 + "__id__": 1143 }, "_enabled": true, "_normalMaterial": null, @@ -45892,7 +45515,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1152 + "__id__": 1143 }, "_id": "89YFxN92pBkY6UUWudhpG7" }, @@ -45901,7 +45524,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1152 + "__id__": 1143 }, "_enabled": true, "_materials": [ @@ -45933,20 +45556,20 @@ "_name": "Btn_Sound", "_objFlags": 0, "_parent": { - "__id__": 1146 + "__id__": 1137 }, "_children": [ { - "__id__": 1158 + "__id__": 1149 } ], "_active": true, "_components": [ { - "__id__": 1160 + "__id__": 1151 }, { - "__id__": 1161 + "__id__": 1152 } ], "_prefab": null, @@ -46002,13 +45625,13 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 1157 + "__id__": 1148 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1159 + "__id__": 1150 } ], "_prefab": null, @@ -46064,7 +45687,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1158 + "__id__": 1149 }, "_enabled": true, "_materials": [ @@ -46097,7 +45720,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1157 + "__id__": 1148 }, "_enabled": true, "_normalMaterial": null, @@ -46160,7 +45783,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1157 + "__id__": 1148 }, "_id": "135Zq6R7hHr72q7ji096PZ" }, @@ -46169,7 +45792,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1157 + "__id__": 1148 }, "_enabled": true, "_materials": [ @@ -46201,20 +45824,20 @@ "_name": "Btn_History", "_objFlags": 0, "_parent": { - "__id__": 1146 + "__id__": 1137 }, "_children": [ { - "__id__": 1163 + "__id__": 1154 } ], "_active": true, "_components": [ { - "__id__": 1165 + "__id__": 1156 }, { - "__id__": 1166 + "__id__": 1157 } ], "_prefab": null, @@ -46270,13 +45893,13 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 1162 + "__id__": 1153 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1164 + "__id__": 1155 } ], "_prefab": null, @@ -46332,7 +45955,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1163 + "__id__": 1154 }, "_enabled": true, "_materials": [ @@ -46365,7 +45988,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1162 + "__id__": 1153 }, "_enabled": true, "_normalMaterial": { @@ -46430,7 +46053,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1162 + "__id__": 1153 }, "_id": "9dXhRow/JB7pJtY6jkjTI5" }, @@ -46439,7 +46062,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1162 + "__id__": 1153 }, "_enabled": true, "_materials": [ @@ -46471,17 +46094,17 @@ "_name": "Team", "_objFlags": 0, "_parent": { - "__id__": 1146 + "__id__": 1137 }, "_children": [ { - "__id__": 1168 + "__id__": 1159 }, { - "__id__": 1173 + "__id__": 1164 }, { - "__id__": 1178 + "__id__": 1169 } ], "_active": true, @@ -46539,20 +46162,20 @@ "_name": "Btn_clean", "_objFlags": 0, "_parent": { - "__id__": 1167 + "__id__": 1158 }, "_children": [ { - "__id__": 1169 + "__id__": 1160 } ], "_active": true, "_components": [ { - "__id__": 1171 + "__id__": 1162 }, { - "__id__": 1172 + "__id__": 1163 } ], "_prefab": null, @@ -46608,13 +46231,13 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 1168 + "__id__": 1159 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1170 + "__id__": 1161 } ], "_prefab": null, @@ -46670,7 +46293,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1169 + "__id__": 1160 }, "_enabled": true, "_materials": [ @@ -46703,7 +46326,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1168 + "__id__": 1159 }, "_enabled": true, "_normalMaterial": null, @@ -46766,7 +46389,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1168 + "__id__": 1159 }, "_id": "1dzrtDZqZGfJLn8d0pRS8G" }, @@ -46775,7 +46398,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1168 + "__id__": 1159 }, "_enabled": true, "_materials": [ @@ -46807,20 +46430,20 @@ "_name": "Btn_load", "_objFlags": 0, "_parent": { - "__id__": 1167 + "__id__": 1158 }, "_children": [ { - "__id__": 1174 + "__id__": 1165 } ], "_active": true, "_components": [ { - "__id__": 1176 + "__id__": 1167 }, { - "__id__": 1177 + "__id__": 1168 } ], "_prefab": null, @@ -46876,13 +46499,13 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 1173 + "__id__": 1164 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1175 + "__id__": 1166 } ], "_prefab": null, @@ -46938,7 +46561,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1174 + "__id__": 1165 }, "_enabled": true, "_materials": [ @@ -46971,7 +46594,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1173 + "__id__": 1164 }, "_enabled": true, "_normalMaterial": null, @@ -47034,7 +46657,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1173 + "__id__": 1164 }, "_id": "91kW3vOv9GyocyArXE7eBu" }, @@ -47043,7 +46666,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1173 + "__id__": 1164 }, "_enabled": true, "_materials": [ @@ -47075,23 +46698,23 @@ "_name": "Btn_Reset", "_objFlags": 0, "_parent": { - "__id__": 1167 + "__id__": 1158 }, "_children": [ { - "__id__": 1179 + "__id__": 1170 }, { - "__id__": 1181 + "__id__": 1172 } ], "_active": true, "_components": [ { - "__id__": 1186 + "__id__": 1177 }, { - "__id__": 1187 + "__id__": 1178 } ], "_prefab": null, @@ -47147,13 +46770,13 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 1178 + "__id__": 1169 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1180 + "__id__": 1171 } ], "_prefab": null, @@ -47209,7 +46832,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1179 + "__id__": 1170 }, "_enabled": true, "_materials": [ @@ -47242,14 +46865,14 @@ "_name": "holdLine", "_objFlags": 0, "_parent": { - "__id__": 1178 + "__id__": 1169 }, "_children": [ { - "__id__": 1182 + "__id__": 1173 }, { - "__id__": 1184 + "__id__": 1175 } ], "_active": false, @@ -47307,13 +46930,13 @@ "_name": "bg", "_objFlags": 0, "_parent": { - "__id__": 1181 + "__id__": 1172 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1183 + "__id__": 1174 } ], "_prefab": null, @@ -47369,7 +46992,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1182 + "__id__": 1173 }, "_enabled": true, "_materials": [ @@ -47401,13 +47024,13 @@ "_name": "line", "_objFlags": 0, "_parent": { - "__id__": 1181 + "__id__": 1172 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1185 + "__id__": 1176 } ], "_prefab": null, @@ -47463,7 +47086,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1184 + "__id__": 1175 }, "_enabled": true, "_materials": [ @@ -47495,7 +47118,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1178 + "__id__": 1169 }, "_enabled": true, "_normalMaterial": null, @@ -47558,7 +47181,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1178 + "__id__": 1169 }, "_id": "11x4JFGtZDpqbkzfEOjpLb" }, @@ -47567,7 +47190,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1178 + "__id__": 1169 }, "_enabled": true, "_materials": [ @@ -47599,11 +47222,11 @@ "_name": "MemberLock", "_objFlags": 0, "_parent": { - "__id__": 1032 + "__id__": 1023 }, "_children": [ { - "__id__": 1189 + "__id__": 1180 } ], "_active": false, @@ -47661,16 +47284,16 @@ "_name": "BGMask", "_objFlags": 0, "_parent": { - "__id__": 1188 + "__id__": 1179 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1190 + "__id__": 1181 }, { - "__id__": 1191 + "__id__": 1182 } ], "_prefab": null, @@ -47726,7 +47349,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1189 + "__id__": 1180 }, "_enabled": true, "_materials": [ @@ -47758,7 +47381,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1189 + "__id__": 1180 }, "_enabled": true, "_id": "21oqfrGcBBkr6IDnCc+jTF" @@ -47768,7 +47391,7 @@ "_name": "TeamAutoLock", "_objFlags": 0, "_parent": { - "__id__": 1032 + "__id__": 1023 }, "_children": [], "_active": false, @@ -47829,23 +47452,23 @@ "__id__": 5 }, "_children": [ + { + "__id__": 1185 + }, + { + "__id__": 1190 + }, + { + "__id__": 1191 + }, + { + "__id__": 1192 + }, + { + "__id__": 1193 + }, { "__id__": 1194 - }, - { - "__id__": 1199 - }, - { - "__id__": 1200 - }, - { - "__id__": 1201 - }, - { - "__id__": 1202 - }, - { - "__id__": 1203 } ], "_active": false, @@ -47903,14 +47526,14 @@ "_name": "BG", "_objFlags": 0, "_parent": { - "__id__": 1193 + "__id__": 1184 }, "_children": [ { - "__id__": 1195 + "__id__": 1186 }, { - "__id__": 1197 + "__id__": 1188 } ], "_active": true, @@ -47968,13 +47591,13 @@ "_name": "line", "_objFlags": 0, "_parent": { - "__id__": 1194 + "__id__": 1185 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1196 + "__id__": 1187 } ], "_prefab": null, @@ -48030,7 +47653,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1195 + "__id__": 1186 }, "_enabled": true, "_materials": [ @@ -48062,13 +47685,13 @@ "_name": "ClockText", "_objFlags": 0, "_parent": { - "__id__": 1194 + "__id__": 1185 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1198 + "__id__": 1189 } ], "_prefab": null, @@ -48124,7 +47747,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1197 + "__id__": 1188 }, "_enabled": true, "_materials": [ @@ -48157,7 +47780,7 @@ "_name": "History", "_objFlags": 0, "_parent": { - "__id__": 1193 + "__id__": 1184 }, "_children": [], "_active": true, @@ -48215,7 +47838,7 @@ "_name": "TeamA", "_objFlags": 0, "_parent": { - "__id__": 1193 + "__id__": 1184 }, "_children": [], "_active": true, @@ -48273,7 +47896,7 @@ "_name": "TeamB", "_objFlags": 0, "_parent": { - "__id__": 1193 + "__id__": 1184 }, "_children": [], "_active": true, @@ -48331,7 +47954,7 @@ "_name": "UI_Btns", "_objFlags": 0, "_parent": { - "__id__": 1193 + "__id__": 1184 }, "_children": [], "_active": true, @@ -48389,7 +48012,7 @@ "_name": "TurnMessage", "_objFlags": 0, "_parent": { - "__id__": 1193 + "__id__": 1184 }, "_children": [], "_active": true, @@ -48516,10 +48139,10 @@ "__id__": 500 }, "AvatarPanel": { - "__id__": 962 + "__id__": 953 }, "HistoryPanel": { - "__id__": 1030 + "__id__": 1021 }, "VoicePanel": { "__id__": 881 diff --git a/assets/Script/AvatarPanel/AvatarPanel.ts b/assets/Script/AvatarPanel/AvatarPanel.ts index a73805e..828d1e8 100644 --- a/assets/Script/AvatarPanel/AvatarPanel.ts +++ b/assets/Script/AvatarPanel/AvatarPanel.ts @@ -1,12 +1,148 @@ +import { Badminton } from "../Badminton/Badminton"; +import { AvatarColor, AvatarData, MemberData } from "../Badminton/MemberData"; import UIPanel from "../Engine/Component/UIPanel/UIPanel"; +import { RandomEx } from "../Engine/Utils/Number/RandomEx"; const { ccclass, property } = cc._decorator; /** AvatarPanel */ @ccclass export default class AvatarPanel extends UIPanel { + //#region property - //#region OnClick + @property({ type: cc.Prefab }) + public BtnItem: cc.Prefab = null; + + @property({ type: cc.Node }) + public ItemContent: cc.Node = null; + + @property({ type: cc.Node }) + public InfoView: cc.Node = null; + + @property({ type: cc.Sprite }) + public BG: cc.Sprite = null; + + //#endregion + + //#region public + + public Main: Badminton = null; + + //#endregion + + //#region private + + private _m_currentMember: MemberData = null; + + private _avatars: AvatarData[] = null; + + private _m_currentIndex: number = null; + + //#endregion + + //#region Lifecycle + + protected ImplementInitial(...initData: any[]): void { + let self: this = this; + this.Main = initData[0]; + this._avatars = this.Main.config.Avatars; + let btnItem: cc.Node = cc.instantiate(this.BtnItem); + btnItem.active = false; + // 載入兔兔設定 更新UI + let container: cc.Node = this.ItemContent; + for (let i: number = container.childrenCount - 1; i >= 0; i--) { + let obj: cc.Node = container.children[i]; + if (obj !== btnItem) { + obj.destroy(); + } + + } + + for (let i: number = 0; i < this._avatars.length; i++) { + let data: AvatarData = this._avatars[i]; + if (data.color !== AvatarColor.Pink && data.color !== AvatarColor.None) { + continue; + } + let item: cc.Node = container.ExAddChild(btnItem); + item.Find("Avatar/Pic").getComponent(cc.Sprite).spriteFrame = data.Pic; + item.Find("Avatar/BG").getComponent(cc.Sprite).spriteFrame = data.BG; + item.Find("Avatar").on("click", () => { self._showAvatarInfoById(i); }); + item.active = true; + } + } + + protected *ImplementReadyShow(...param: any[]): IterableIterator { + this._m_currentMember = param[0]; + } + + protected *ImplementShow(): IterableIterator { + if (this._m_currentMember != null) { + let index: number = 0; + for (let i: number = 0; i < this._avatars.length; i++) { + if (this._m_currentMember.AvatarId === this._avatars[i].ID) { + index = i; + break; + } + } + this._showAvatarInfoById(index); + } + this.Main.Lobby.Close(); + } + + protected *ImplementHide(...param: any[]): IterableIterator { + yield* this.Main.Lobby.Show(); + } + + //#endregion + + //#region Custom + + private _getNextColorAvatarIndex(index: number): number { + if (index < 0 || index >= this._avatars.length) { + return 0; + } + let cur: AvatarData = this._avatars[index]; + for (let i: number = 0; i < this._avatars.length; i++) { + let data: AvatarData = this._avatars[i]; + if (data.Model === cur.Model && data.color !== cur.color) { + return i; + } + } + return 0; + } + + private _showAvatarInfoById(index: number): void { + if (index < 0 || index >= this._avatars.length) { + return; + } + let data: AvatarData = this._avatars[index]; + this.BG.spriteFrame = data.BG; + this.InfoView.Find("Image").getComponent(cc.Sprite).spriteFrame = data.BigPic != null ? data.BigPic : data.Pic; + this.InfoView.Find("Title/Text").getComponent(cc.Label).string = data.Name; + this.InfoView.Find("Text").getComponent(cc.Label).string = data.Desc; + this._m_currentIndex = index; + } + + public OnClickNextColor(): void { + this._showAvatarInfoById(this._getNextColorAvatarIndex(this._m_currentIndex)); + } + + public OnClickConfirm(): void { + let data: AvatarData = this._avatars[this._m_currentIndex]; + if (data.Model <= 0) { + // let list = this._avatars.FindAll(a => a.model > 0); + // let list: any[] = this._avatars.map(a => { + // if (a.Model > 0) { + // return Object.values(a)[0]; + // } + // }).filter(item => item); + let list: AvatarData[] = this._avatars.filter(item => item.Model > 0); + data = list[RandomEx.GetInt(0, list.length)]; + } + this._m_currentMember.AvatarId = data.ID; + this.Main.ReloadUI(); + this.Close(); + } //#endregion } \ No newline at end of file diff --git a/assets/Script/Badminton/Badminton.ts b/assets/Script/Badminton/Badminton.ts index 2889759..30c21ec 100644 --- a/assets/Script/Badminton/Badminton.ts +++ b/assets/Script/Badminton/Badminton.ts @@ -131,6 +131,7 @@ export class Badminton extends cc.Component { CoroutineV2.Single(self.HistoryPanel.Hide()).Start(); } // textToSpeech = FindObjectOfType(); + self.AvatarPanel.Initial(self); CoroutineV2.Single(self.Show()).Start(); }; CoroutineV2.Single(AsyncFunction()).Start(); @@ -158,17 +159,19 @@ export class Badminton extends cc.Component { this._updateCurSelMember(); // this.toggleItem.gameObject.SetActive(false); // this.teamItem.gameObject.SetActive(false); + let parent: cc.Node = this.TeamItemContent; - for (let i: number = parent.childrenCount - 1; i > 0; i--) { - parent.children[i].destroy(); - } + // for (let i: number = parent.childrenCount - 1; i > 0; i--) { + // parent.children[i].destroy(); + // } + parent.removeAllChildren(); this._m_teamList.Clear(); - parent = this.ToggleItemContent; - for (let i: number = parent.childrenCount - 1; i > 0; i--) { - parent.children[i].destroy(); - } + // for (let i: number = parent.childrenCount - 1; i > 0; i--) { + // parent.children[i].destroy(); + // } + parent.removeAllChildren(); this._m_toggleList.Clear(); for (let idx: number = 0; idx < this.TeamMemberList.length; idx++) { @@ -180,7 +183,7 @@ export class Badminton extends cc.Component { let picObj: cc.Node = item.node.getChildByName("Avatar").getChildByName("Pic"); if (picObj != null) { picObj.getComponent(cc.Sprite).spriteFrame = this.config.GetAvatarPicById(this.TeamMemberList[idx].AvatarId); - picObj.parent.getComponent(HoldButton).OnInvoke.AddListener(() => { this.OnChangeAvatar(idx); }); + picObj.parent.getComponent(HoldButton).OnInvoke.AddListener(() => { this.OnChangeAvatar(+idx); }); picObj.parent.on("click", () => { item.isChecked = !item.isChecked; self._onChangeSelMember(item); @@ -347,9 +350,7 @@ export class Badminton extends cc.Component { } public OnChangeAvatar(index: number): void { - index = +index; - console.log("OnChangeAvatar"); - // this.AvatarPanel.OpenChange(teamMemberList[index]); + CoroutineV2.Single(this.AvatarPanel.Show(this.TeamMemberList[index])).Start(); } public LoadStatus(): void { diff --git a/assets/Script/Badminton/ConfigManager.ts b/assets/Script/Badminton/ConfigManager.ts index ff5e32d..f00f02f 100644 --- a/assets/Script/Badminton/ConfigManager.ts +++ b/assets/Script/Badminton/ConfigManager.ts @@ -8,22 +8,18 @@ import { AvatarData, MemberData } from "./MemberData"; /** ConfigManager */ export default class ConfigManager { - //#region get + //#region public public Main: Badminton = null; - //#endregion - - //#region public - public Avatars: AvatarData[] = []; //#endregion //#region Lifecycle - constructor(mainControl: Badminton) { - this.Main = mainControl; + constructor(main: Badminton) { + this.Main = main; } public *Init(): IterableIterator { diff --git a/assets/Script/Badminton/MemberData.ts b/assets/Script/Badminton/MemberData.ts index 4158de6..15cddc3 100644 --- a/assets/Script/Badminton/MemberData.ts +++ b/assets/Script/Badminton/MemberData.ts @@ -1,3 +1,4 @@ + const { ccclass, property } = cc._decorator; //#region Enum @@ -25,8 +26,9 @@ export class MemberData { /** * @param {string} name 名稱 */ - constructor(name: string) { + constructor(name: string, avatarId: number = 0) { this.Name = name; + this.AvatarId = avatarId; } } diff --git a/assets/Script/Engine/Component/Button/HoldButton.ts b/assets/Script/Engine/Component/Button/HoldButton.ts index 4c7afe4..2f6de2a 100644 --- a/assets/Script/Engine/Component/Button/HoldButton.ts +++ b/assets/Script/Engine/Component/Button/HoldButton.ts @@ -91,10 +91,12 @@ export default class HoldButton extends cc.Component { this._m_pressDeltaTime = 0; if (this.OnInvoke != null) { this.OnInvoke.forEach((eventHandler: cc.Component.EventHandler) => { - if (eventHandler.target === "Callback" && eventHandler.component === "Callback" && eventHandler.handler) { - (eventHandler.handler)(); - } else { - eventHandler.emit([this.node.getComponent(cc.Button)]); + if (eventHandler) { + if (eventHandler.target === "Callback" && eventHandler.component === "Callback" && eventHandler.handler) { + (eventHandler.handler)(); + } else { + eventHandler.emit([this.node.getComponent(cc.Button)]); + } } }); } diff --git a/assets/Script/Engine/Utils/CCExtensions/CCExtension.ts b/assets/Script/Engine/Utils/CCExtensions/CCExtension.ts index 4c8d126..9a75e1c 100644 --- a/assets/Script/Engine/Utils/CCExtensions/CCExtension.ts +++ b/assets/Script/Engine/Utils/CCExtensions/CCExtension.ts @@ -39,6 +39,13 @@ declare namespace cc { /**位置維持在原位 */ ExSetParent(parentObj: cc.Node): void; ExSetGray(showGray: boolean): void; + /** + * 通过名称获取节点的子节点。 + * @param name A name to find the child node. + * @example + * let child: cc.Node = this.node.Find("childname/childname"); + */ + Find(name: string): cc.Node; } } @@ -184,6 +191,27 @@ cc.Node.prototype.ExSetGray || Object.defineProperty(cc.Node.prototype, 'ExSetGr // } }, }); +cc.Node.prototype.Find || Object.defineProperty(cc.Node.prototype, "Find", { + enumerable: false, + /** + * 通过名称获取节点的子节点。 + * @param name A name to find the child node. + */ + value: function (name: string): any { + let names: string[] = name.split("/"); + let node: cc.Node = this; + for (let i: number = 0; i < names.length; i++) { + const targetname: string = names[i]; + let nodeName: string = node.name; + node = node.getChildByName(targetname); + if (!node) { + cc.error(`${nodeName} child hst not found ${targetname} in node`); + return null; + } + } + return node; + }, +}); // cc.Node.prototype.SetWorldPosition = function (cocosWorldPos: cc.Vec2): void { // // let cocosWorldPos = new cc.Vec2(unityWorldPos.x + 711, unityWorldPos.y + 400); // this.setPosition(this.parent.convertToNodeSpaceAR(cocosWorldPos)); diff --git a/assets/Script/Lobby/Lobby.ts b/assets/Script/Lobby/Lobby.ts index 5805457..a081fa3 100644 --- a/assets/Script/Lobby/Lobby.ts +++ b/assets/Script/Lobby/Lobby.ts @@ -6,7 +6,11 @@ const { ccclass, property } = cc._decorator; @ccclass export default class Lobby extends UIPanel { - //#region OnClick + //#region Lifecycle + + protected *ImplementReadyShow(...param: any[]): IterableIterator { + cc.log("Lobby ImplementReadyShow"); + } //#endregion } \ No newline at end of file