diff --git a/assets/resources/prefabs/bar_count_pop.prefab b/assets/resources/prefabs/bar_count_pop.prefab index 9db4c9c..4088d74 100644 --- a/assets/resources/prefabs/bar_count_pop.prefab +++ b/assets/resources/prefabs/bar_count_pop.prefab @@ -15,16 +15,23 @@ "_name": "bar_count_pop", "_objFlags": 0, "_parent": null, - "_children": [], - "_active": true, - "_level": 2, - "_components": [ + "_children": [ { "__id__": 2 } ], + "_active": true, + "_level": 1, + "_components": [ + { + "__id__": 5 + }, + { + "__id__": 6 + } + ], "_prefab": { - "__id__": 3 + "__id__": 7 }, "_opacity": 255, "_color": { @@ -71,6 +78,105 @@ "groupIndex": 0, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "title_label", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_level": 2, + "_components": [ + { + "__id__": 3 + } + ], + "_prefab": { + "__id__": 4 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 121, + "g": 45, + "b": 7, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 50, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 0, + "y": 11, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "_zIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "_srcBlendFactor": 1, + "_dstBlendFactor": 771, + "_useOriginalSize": false, + "_string": "预约\n即送", + "_N$string": "预约\n即送", + "_fontSize": 25, + "_lineHeight": 30, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "391e7d9b-3837-4fb1-9606-effba4f81d22" + }, + "fileId": "9ei+F154tN94s1l9ws7AIH", + "sync": false + }, { "__type__": "cc.Sprite", "_name": "", @@ -99,13 +205,27 @@ "_atlas": null, "_id": "" }, + { + "__type__": "400a8lfG3FLI5iARZru+LrT", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1 + }, + "_enabled": true, + "titleLabel": { + "__id__": 3 + }, + "title": null, + "_id": "" + }, { "__type__": "cc.PrefabInfo", "root": { "__id__": 1 }, "asset": { - "__id__": 0 + "__uuid__": "391e7d9b-3837-4fb1-9606-effba4f81d22" }, "fileId": "bd1cThZb9Bj5w+R4VKYZNa", "sync": false diff --git a/assets/resources/prefabs/bar_cube.prefab b/assets/resources/prefabs/bar_cube.prefab index ec0787a..35c926b 100644 --- a/assets/resources/prefabs/bar_cube.prefab +++ b/assets/resources/prefabs/bar_cube.prefab @@ -28,10 +28,13 @@ }, { "__id__": 6 + }, + { + "__id__": 7 } ], "_prefab": { - "__id__": 7 + "__id__": 8 }, "_opacity": 255, "_color": { @@ -235,6 +238,20 @@ "_originalHeight": 0, "_id": "" }, + { + "__type__": "539f6Ao2E1GFoOceXjDyjy/", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1 + }, + "_enabled": true, + "box": { + "__id__": 5 + }, + "type": "wood", + "_id": "" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/prefabs/bar_line.prefab b/assets/resources/prefabs/bar_line.prefab index 0449cfd..ba07506 100644 --- a/assets/resources/prefabs/bar_line.prefab +++ b/assets/resources/prefabs/bar_line.prefab @@ -17,14 +17,17 @@ "_parent": null, "_children": [], "_active": true, - "_level": 4, + "_level": 1, "_components": [ { "__id__": 2 + }, + { + "__id__": 3 } ], "_prefab": { - "__id__": 3 + "__id__": 4 }, "_opacity": 255, "_color": { @@ -99,13 +102,27 @@ "_atlas": null, "_id": "" }, + { + "__type__": "87547behTtIDIO7h/3AbdKl", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1 + }, + "_enabled": true, + "point": { + "__id__": 2 + }, + "color": "w", + "_id": "" + }, { "__type__": "cc.PrefabInfo", "root": { "__id__": 1 }, "asset": { - "__id__": 0 + "__uuid__": "9090470b-343b-4a6f-9ef5-5c692222dbce" }, "fileId": "72RLfJontPa5HlQlHjnlun", "sync": false diff --git a/assets/resources/prefabs/content.prefab b/assets/resources/prefabs/content.prefab index 614f15d..21a6489 100644 --- a/assets/resources/prefabs/content.prefab +++ b/assets/resources/prefabs/content.prefab @@ -20,27 +20,27 @@ "__id__": 2 }, { - "__id__": 28 + "__id__": 25 }, { - "__id__": 55 + "__id__": 52 }, { - "__id__": 71 + "__id__": 68 }, { - "__id__": 115 + "__id__": 112 } ], "_active": true, "_level": 1, "_components": [ { - "__id__": 117 + "__id__": 114 } ], "_prefab": { - "__id__": 118 + "__id__": 115 }, "_opacity": 255, "_color": { @@ -109,23 +109,20 @@ }, { "__id__": 18 - }, - { - "__id__": 22 } ], "_active": true, "_level": 2, "_components": [ { - "__id__": 25 + "__id__": 22 }, { - "__id__": 26 + "__id__": 23 } ], "_prefab": { - "__id__": 27 + "__id__": 24 }, "_opacity": 255, "_color": { @@ -844,105 +841,6 @@ "fileId": "88axSUuZBOiqZ6YnD1JXLJ", "sync": false }, - { - "__type__": "cc.Node", - "_name": "people_count", - "_objFlags": 0, - "_parent": { - "__id__": 2 - }, - "_children": [], - "_active": true, - "_level": 3, - "_components": [ - { - "__id__": 23 - } - ], - "_prefab": { - "__id__": 24 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 330.15, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_position": { - "__type__": "cc.Vec3", - "x": 0, - "y": -539, - "z": 0 - }, - "_scale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_rotationX": 0, - "_rotationY": 0, - "_quat": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_skewX": 0, - "_skewY": 0, - "_zIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 22 - }, - "_enabled": true, - "_srcBlendFactor": 1, - "_dstBlendFactor": 771, - "_useOriginalSize": false, - "_string": "当前预约人数: 19999999", - "_N$string": "当前预约人数: 19999999", - "_fontSize": 30, - "_lineHeight": 40, - "_enableWrapText": true, - "_N$file": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_N$horizontalAlign": 1, - "_N$verticalAlign": 1, - "_N$fontFamily": "Arial", - "_N$overflow": 0, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "9d572a53-1800-4095-b553-392a21202673" - }, - "fileId": "181XZWPdtOrJIwBa4ehCqW", - "sync": false - }, { "__type__": "cc.Sprite", "_name": "", @@ -1018,24 +916,24 @@ }, "_children": [ { - "__id__": 29 + "__id__": 26 + }, + { + "__id__": 32 }, { "__id__": 35 - }, - { - "__id__": 38 } ], "_active": true, "_level": 2, "_components": [ { - "__id__": 53 + "__id__": 50 } ], "_prefab": { - "__id__": 54 + "__id__": 51 }, "_opacity": 255, "_color": { @@ -1087,22 +985,22 @@ "_name": "btn_back", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 25 }, "_children": [ { - "__id__": 30 + "__id__": 27 } ], "_active": true, "_level": 3, "_components": [ { - "__id__": 33 + "__id__": 30 } ], "_prefab": { - "__id__": 34 + "__id__": 31 }, "_opacity": 255, "_color": { @@ -1154,18 +1052,18 @@ "_name": "btn_title_3", "_objFlags": 0, "_parent": { - "__id__": 29 + "__id__": 26 }, "_children": [], "_active": true, "_level": 4, "_components": [ { - "__id__": 31 + "__id__": 28 } ], "_prefab": { - "__id__": 32 + "__id__": 29 }, "_opacity": 255, "_color": { @@ -1217,7 +1115,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 30 + "__id__": 27 }, "_enabled": true, "_srcBlendFactor": 770, @@ -1256,7 +1154,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 29 + "__id__": 26 }, "_enabled": true, "_srcBlendFactor": 770, @@ -1295,18 +1193,18 @@ "_name": "part3_bg", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 25 }, "_children": [], "_active": true, "_level": 3, "_components": [ { - "__id__": 36 + "__id__": 33 } ], "_prefab": { - "__id__": 37 + "__id__": 34 }, "_opacity": 255, "_color": { @@ -1358,7 +1256,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 35 + "__id__": 32 }, "_enabled": true, "_srcBlendFactor": 770, @@ -1397,9 +1295,12 @@ "_name": "border", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 25 }, "_children": [ + { + "__id__": 36 + }, { "__id__": 39 }, @@ -1408,20 +1309,17 @@ }, { "__id__": 45 - }, - { - "__id__": 48 } ], "_active": true, "_level": 3, "_components": [ { - "__id__": 51 + "__id__": 48 } ], "_prefab": { - "__id__": 52 + "__id__": 49 }, "_opacity": 255, "_color": { @@ -1473,8 +1371,110 @@ "_name": "scope", "_objFlags": 0, "_parent": { + "__id__": 35 + }, + "_children": [], + "_active": true, + "_level": 4, + "_components": [ + { + "__id__": 37 + } + ], + "_prefab": { "__id__": 38 }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 22, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": -125, + "y": 229, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "_zIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 36 + }, + "_enabled": true, + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "0558adbd-eebf-4266-852b-4181899cebf5" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_state": 0, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "9d572a53-1800-4095-b553-392a21202673" + }, + "fileId": "ba28AaQ3lAWpCGNY0GaESw", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "scope", + "_objFlags": 0, + "_parent": { + "__id__": 35 + }, "_children": [], "_active": true, "_level": 4, @@ -1506,7 +1506,7 @@ }, "_position": { "__type__": "cc.Vec3", - "x": -125, + "x": 130, "y": 229, "z": 0 }, @@ -1567,15 +1567,15 @@ "asset": { "__uuid__": "9d572a53-1800-4095-b553-392a21202673" }, - "fileId": "ba28AaQ3lAWpCGNY0GaESw", + "fileId": "55qET3Z9VBbbBnoN6mZ1Gz", "sync": false }, { "__type__": "cc.Node", - "_name": "scope", + "_name": "border_bl", "_objFlags": 0, "_parent": { - "__id__": 38 + "__id__": 35 }, "_children": [], "_active": true, @@ -1596,108 +1596,6 @@ "b": 255, "a": 255 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 22, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_position": { - "__type__": "cc.Vec3", - "x": 130, - "y": 229, - "z": 0 - }, - "_scale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_rotationX": 0, - "_rotationY": 0, - "_quat": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_skewX": 0, - "_skewY": 0, - "_zIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 42 - }, - "_enabled": true, - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "0558adbd-eebf-4266-852b-4181899cebf5" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_state": 0, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "9d572a53-1800-4095-b553-392a21202673" - }, - "fileId": "55qET3Z9VBbbBnoN6mZ1Gz", - "sync": false - }, - { - "__type__": "cc.Node", - "_name": "border_bl", - "_objFlags": 0, - "_parent": { - "__id__": 38 - }, - "_children": [], - "_active": true, - "_level": 4, - "_components": [ - { - "__id__": 46 - } - ], - "_prefab": { - "__id__": 47 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, "_contentSize": { "__type__": "cc.Size", "width": 121, @@ -1740,7 +1638,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 45 + "__id__": 42 }, "_enabled": true, "_srcBlendFactor": 770, @@ -1779,18 +1677,18 @@ "_name": "border_tr", "_objFlags": 0, "_parent": { - "__id__": 38 + "__id__": 35 }, "_children": [], "_active": true, "_level": 4, "_components": [ { - "__id__": 49 + "__id__": 46 } ], "_prefab": { - "__id__": 50 + "__id__": 47 }, "_opacity": 255, "_color": { @@ -1842,7 +1740,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 48 + "__id__": 45 }, "_enabled": true, "_srcBlendFactor": 770, @@ -1881,7 +1779,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 38 + "__id__": 35 }, "_enabled": true, "_srcBlendFactor": 770, @@ -1920,7 +1818,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 25 }, "_enabled": true, "_srcBlendFactor": 770, @@ -1963,24 +1861,24 @@ }, "_children": [ { - "__id__": 56 + "__id__": 53 + }, + { + "__id__": 59 }, { "__id__": 62 - }, - { - "__id__": 65 } ], "_active": true, "_level": 2, "_components": [ { - "__id__": 69 + "__id__": 66 } ], "_prefab": { - "__id__": 70 + "__id__": 67 }, "_opacity": 255, "_color": { @@ -2032,22 +1930,22 @@ "_name": "btn_back", "_objFlags": 0, "_parent": { - "__id__": 55 + "__id__": 52 }, "_children": [ { - "__id__": 57 + "__id__": 54 } ], "_active": true, "_level": 3, "_components": [ { - "__id__": 60 + "__id__": 57 } ], "_prefab": { - "__id__": 61 + "__id__": 58 }, "_opacity": 255, "_color": { @@ -2099,18 +1997,18 @@ "_name": "btn_title_2", "_objFlags": 0, "_parent": { - "__id__": 56 + "__id__": 53 }, "_children": [], "_active": true, "_level": 4, "_components": [ { - "__id__": 58 + "__id__": 55 } ], "_prefab": { - "__id__": 59 + "__id__": 56 }, "_opacity": 255, "_color": { @@ -2162,7 +2060,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 57 + "__id__": 54 }, "_enabled": true, "_srcBlendFactor": 770, @@ -2201,7 +2099,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 56 + "__id__": 53 }, "_enabled": true, "_srcBlendFactor": 770, @@ -2240,18 +2138,18 @@ "_name": "ruls", "_objFlags": 0, "_parent": { - "__id__": 55 + "__id__": 52 }, "_children": [], "_active": true, "_level": 3, "_components": [ { - "__id__": 63 + "__id__": 60 } ], "_prefab": { - "__id__": 64 + "__id__": 61 }, "_opacity": 255, "_color": { @@ -2303,7 +2201,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 62 + "__id__": 59 }, "_enabled": true, "_srcBlendFactor": 770, @@ -2342,21 +2240,21 @@ "_name": "invite_btn", "_objFlags": 0, "_parent": { - "__id__": 55 + "__id__": 52 }, "_children": [], "_active": true, "_level": 3, "_components": [ { - "__id__": 66 + "__id__": 63 }, { - "__id__": 67 + "__id__": 64 } ], "_prefab": { - "__id__": 68 + "__id__": 65 }, "_opacity": 255, "_color": { @@ -2408,7 +2306,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 65 + "__id__": 62 }, "_enabled": true, "_srcBlendFactor": 770, @@ -2436,7 +2334,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 65 + "__id__": 62 }, "_enabled": true, "transition": 0, @@ -2480,7 +2378,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 65 + "__id__": 62 }, "_id": "" }, @@ -2500,7 +2398,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 55 + "__id__": 52 }, "_enabled": true, "_srcBlendFactor": 770, @@ -2543,36 +2441,36 @@ }, "_children": [ { - "__id__": 72 + "__id__": 69 }, { - "__id__": 78 + "__id__": 75 }, { - "__id__": 88 + "__id__": 85 }, { - "__id__": 98 + "__id__": 95 }, { - "__id__": 104 + "__id__": 101 }, { - "__id__": 108 + "__id__": 105 } ], "_active": true, "_level": 2, "_components": [ { - "__id__": 112 + "__id__": 109 }, { - "__id__": 113 + "__id__": 110 } ], "_prefab": { - "__id__": 114 + "__id__": 111 }, "_opacity": 255, "_color": { @@ -2624,22 +2522,22 @@ "_name": "btn_back", "_objFlags": 0, "_parent": { - "__id__": 71 + "__id__": 68 }, "_children": [ { - "__id__": 73 + "__id__": 70 } ], "_active": true, "_level": 3, "_components": [ { - "__id__": 76 + "__id__": 73 } ], "_prefab": { - "__id__": 77 + "__id__": 74 }, "_opacity": 255, "_color": { @@ -2691,18 +2589,18 @@ "_name": "btn_title_5", "_objFlags": 0, "_parent": { - "__id__": 72 + "__id__": 69 }, "_children": [], "_active": true, "_level": 4, "_components": [ { - "__id__": 74 + "__id__": 71 } ], "_prefab": { - "__id__": 75 + "__id__": 72 }, "_opacity": 255, "_color": { @@ -2754,7 +2652,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 73 + "__id__": 70 }, "_enabled": true, "_srcBlendFactor": 770, @@ -2793,7 +2691,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 72 + "__id__": 69 }, "_enabled": true, "_srcBlendFactor": 770, @@ -2832,25 +2730,25 @@ "_name": "qr_qq", "_objFlags": 0, "_parent": { - "__id__": 71 + "__id__": 68 }, "_children": [ { - "__id__": 79 + "__id__": 76 }, { - "__id__": 82 + "__id__": 79 } ], "_active": true, "_level": 3, "_components": [ { - "__id__": 86 + "__id__": 83 } ], "_prefab": { - "__id__": 87 + "__id__": 84 }, "_opacity": 255, "_color": { @@ -2902,18 +2800,18 @@ "_name": "border", "_objFlags": 0, "_parent": { - "__id__": 78 + "__id__": 75 }, "_children": [], "_active": true, "_level": 4, "_components": [ { - "__id__": 80 + "__id__": 77 } ], "_prefab": { - "__id__": 81 + "__id__": 78 }, "_opacity": 255, "_color": { @@ -2965,7 +2863,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 79 + "__id__": 76 }, "_enabled": true, "_srcBlendFactor": 770, @@ -3004,21 +2902,21 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 78 + "__id__": 75 }, "_children": [], "_active": true, "_level": 4, "_components": [ { - "__id__": 83 + "__id__": 80 }, { - "__id__": 84 + "__id__": 81 } ], "_prefab": { - "__id__": 85 + "__id__": 82 }, "_opacity": 255, "_color": { @@ -3070,7 +2968,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 82 + "__id__": 79 }, "_enabled": true, "_srcBlendFactor": 1, @@ -3095,7 +2993,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 82 + "__id__": 79 }, "_enabled": true, "_color": { @@ -3124,7 +3022,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 78 + "__id__": 75 }, "_enabled": true, "_srcBlendFactor": 770, @@ -3163,25 +3061,25 @@ "_name": "qr_wechat", "_objFlags": 0, "_parent": { - "__id__": 71 + "__id__": 68 }, "_children": [ { - "__id__": 89 + "__id__": 86 }, { - "__id__": 92 + "__id__": 89 } ], "_active": true, "_level": 3, "_components": [ { - "__id__": 96 + "__id__": 93 } ], "_prefab": { - "__id__": 97 + "__id__": 94 }, "_opacity": 255, "_color": { @@ -3233,18 +3131,18 @@ "_name": "border", "_objFlags": 0, "_parent": { - "__id__": 88 + "__id__": 85 }, "_children": [], "_active": true, "_level": 4, "_components": [ { - "__id__": 90 + "__id__": 87 } ], "_prefab": { - "__id__": 91 + "__id__": 88 }, "_opacity": 255, "_color": { @@ -3296,7 +3194,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 89 + "__id__": 86 }, "_enabled": true, "_srcBlendFactor": 770, @@ -3335,21 +3233,21 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 88 + "__id__": 85 }, "_children": [], "_active": true, "_level": 4, "_components": [ { - "__id__": 93 + "__id__": 90 }, { - "__id__": 94 + "__id__": 91 } ], "_prefab": { - "__id__": 95 + "__id__": 92 }, "_opacity": 255, "_color": { @@ -3401,7 +3299,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 92 + "__id__": 89 }, "_enabled": true, "_srcBlendFactor": 1, @@ -3426,7 +3324,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 92 + "__id__": 89 }, "_enabled": true, "_color": { @@ -3455,7 +3353,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 88 + "__id__": 85 }, "_enabled": true, "_srcBlendFactor": 770, @@ -3494,22 +3392,22 @@ "_name": "bottom_tip", "_objFlags": 0, "_parent": { - "__id__": 71 + "__id__": 68 }, "_children": [ { - "__id__": 99 + "__id__": 96 } ], "_active": true, "_level": 3, "_components": [ { - "__id__": 102 + "__id__": 99 } ], "_prefab": { - "__id__": 103 + "__id__": 100 }, "_opacity": 255, "_color": { @@ -3561,18 +3459,18 @@ "_name": "tip_label", "_objFlags": 0, "_parent": { - "__id__": 98 + "__id__": 95 }, "_children": [], "_active": true, "_level": 4, "_components": [ { - "__id__": 100 + "__id__": 97 } ], "_prefab": { - "__id__": 101 + "__id__": 98 }, "_opacity": 255, "_color": { @@ -3624,7 +3522,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 99 + "__id__": 96 }, "_enabled": true, "_srcBlendFactor": 1, @@ -3660,7 +3558,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 98 + "__id__": 95 }, "_enabled": true, "_srcBlendFactor": 770, @@ -3699,21 +3597,21 @@ "_name": "bottom_btn", "_objFlags": 0, "_parent": { - "__id__": 71 + "__id__": 68 }, "_children": [], "_active": true, "_level": 3, "_components": [ { - "__id__": 105 + "__id__": 102 }, { - "__id__": 106 + "__id__": 103 } ], "_prefab": { - "__id__": 107 + "__id__": 104 }, "_opacity": 255, "_color": { @@ -3765,7 +3663,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 104 + "__id__": 101 }, "_enabled": true, "_srcBlendFactor": 770, @@ -3793,7 +3691,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 104 + "__id__": 101 }, "_enabled": true, "transition": 0, @@ -3837,7 +3735,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 104 + "__id__": 101 }, "_id": "" }, @@ -3857,21 +3755,21 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 71 + "__id__": 68 }, "_children": [], "_active": true, "_level": 3, "_components": [ { - "__id__": 109 + "__id__": 106 }, { - "__id__": 110 + "__id__": 107 } ], "_prefab": { - "__id__": 111 + "__id__": 108 }, "_opacity": 255, "_color": { @@ -3923,7 +3821,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 108 + "__id__": 105 }, "_enabled": true, "_srcBlendFactor": 1, @@ -3948,7 +3846,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 108 + "__id__": 105 }, "_enabled": true, "_color": { @@ -3977,7 +3875,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 71 + "__id__": 68 }, "_enabled": true, "_srcBlendFactor": 770, @@ -4005,7 +3903,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 71 + "__id__": 68 }, "_enabled": true, "alignMode": 1, @@ -4050,7 +3948,7 @@ "_level": 2, "_components": [], "_prefab": { - "__id__": 116 + "__id__": 113 }, "_opacity": 255, "_color": { @@ -4120,16 +4018,16 @@ "__id__": 2 }, "part2": { - "__id__": 55 + "__id__": 52 }, "part3": { - "__id__": 28 + "__id__": 25 }, "part4": { - "__id__": 115 + "__id__": 112 }, "part5": { - "__id__": 71 + "__id__": 68 }, "processBarPrefab": { "__uuid__": "f353cb4a-ce95-42aa-90df-fefb96f58cf5" @@ -4150,10 +4048,10 @@ "__id__": 18 }, "inviteBtn": { - "__id__": 65 + "__id__": 62 }, "ruleBtn": { - "__id__": 104 + "__id__": 101 }, "_id": "" }, diff --git a/assets/resources/prefabs/progress_bar.prefab b/assets/resources/prefabs/progress_bar.prefab index eac5457..abe9e19 100644 --- a/assets/resources/prefabs/progress_bar.prefab +++ b/assets/resources/prefabs/progress_bar.prefab @@ -20,42 +20,30 @@ "__id__": 2 }, { - "__id__": 29 + "__id__": 17 }, { - "__id__": 32 + "__id__": 20 }, { - "__id__": 39 + "__id__": 27 }, { - "__id__": 46 - }, - { - "__id__": 53 - }, - { - "__id__": 56 - }, - { - "__id__": 59 - }, - { - "__id__": 62 + "__id__": 30 } ], "_active": true, "_level": 1, "_components": [ { - "__id__": 65 + "__id__": 33 }, { - "__id__": 66 + "__id__": 34 } ], "_prefab": { - "__id__": 67 + "__id__": 35 }, "_opacity": 255, "_color": { @@ -114,18 +102,18 @@ "__id__": 3 }, { - "__id__": 23 + "__id__": 11 } ], "_active": true, "_level": 2, "_components": [ { - "__id__": 27 + "__id__": 15 } ], "_prefab": { - "__id__": 28 + "__id__": 16 }, "_opacity": 255, "_color": { @@ -182,32 +170,20 @@ "_children": [ { "__id__": 4 - }, - { - "__id__": 8 - }, - { - "__id__": 11 - }, - { - "__id__": 14 - }, - { - "__id__": 17 } ], "_active": true, "_level": 3, "_components": [ { - "__id__": 20 + "__id__": 8 }, { - "__id__": 21 + "__id__": 9 } ], "_prefab": { - "__id__": 22 + "__id__": 10 }, "_opacity": 255, "_color": { @@ -386,414 +362,6 @@ "fileId": "e6OadwVgBKF7DiwSTa5PI/", "sync": false }, - { - "__type__": "cc.Node", - "_name": "bar_line", - "_objFlags": 0, - "_parent": { - "__id__": 3 - }, - "_children": [], - "_active": true, - "_level": 4, - "_components": [ - { - "__id__": 9 - } - ], - "_prefab": { - "__id__": 10 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 8, - "height": 45 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_position": { - "__type__": "cc.Vec3", - "x": -233, - "y": 21, - "z": 0 - }, - "_scale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_rotationX": 0, - "_rotationY": 0, - "_quat": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_skewX": 0, - "_skewY": 0, - "_zIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 8 - }, - "_enabled": true, - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "3c380664-ea2f-4205-891f-261e7f0e1bb3" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_state": 0, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "f353cb4a-ce95-42aa-90df-fefb96f58cf5" - }, - "fileId": "5aviDRSyJFXLiNJtx6+bV6", - "sync": false - }, - { - "__type__": "cc.Node", - "_name": "bar_line", - "_objFlags": 0, - "_parent": { - "__id__": 3 - }, - "_children": [], - "_active": true, - "_level": 4, - "_components": [ - { - "__id__": 12 - } - ], - "_prefab": { - "__id__": 13 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 8, - "height": 45 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_position": { - "__type__": "cc.Vec3", - "x": -85, - "y": 21, - "z": 0 - }, - "_scale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_rotationX": 0, - "_rotationY": 0, - "_quat": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_skewX": 0, - "_skewY": 0, - "_zIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 11 - }, - "_enabled": true, - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "3c380664-ea2f-4205-891f-261e7f0e1bb3" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_state": 0, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "f353cb4a-ce95-42aa-90df-fefb96f58cf5" - }, - "fileId": "37ah0Kj3xEtKBB4hMJyGm7", - "sync": false - }, - { - "__type__": "cc.Node", - "_name": "bar_line", - "_objFlags": 0, - "_parent": { - "__id__": 3 - }, - "_children": [], - "_active": true, - "_level": 4, - "_components": [ - { - "__id__": 15 - } - ], - "_prefab": { - "__id__": 16 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 8, - "height": 45 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_position": { - "__type__": "cc.Vec3", - "x": 76, - "y": 21, - "z": 0 - }, - "_scale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_rotationX": 0, - "_rotationY": 0, - "_quat": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_skewX": 0, - "_skewY": 0, - "_zIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 14 - }, - "_enabled": true, - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "3c380664-ea2f-4205-891f-261e7f0e1bb3" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_state": 0, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "f353cb4a-ce95-42aa-90df-fefb96f58cf5" - }, - "fileId": "490vkhPA1Be5rR0o09vj8S", - "sync": false - }, - { - "__type__": "cc.Node", - "_name": "bar_line", - "_objFlags": 0, - "_parent": { - "__id__": 3 - }, - "_children": [], - "_active": true, - "_level": 4, - "_components": [ - { - "__id__": 18 - } - ], - "_prefab": { - "__id__": 19 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 8, - "height": 45 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_position": { - "__type__": "cc.Vec3", - "x": 237, - "y": 21, - "z": 0 - }, - "_scale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_rotationX": 0, - "_rotationY": 0, - "_quat": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_skewX": 0, - "_skewY": 0, - "_zIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 17 - }, - "_enabled": true, - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "3c380664-ea2f-4205-891f-261e7f0e1bb3" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_state": 0, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "f353cb4a-ce95-42aa-90df-fefb96f58cf5" - }, - "fileId": "39jsr9fZFIRaO/XB+A/A57", - "sync": false - }, { "__type__": "cc.Sprite", "_name": "", @@ -872,14 +440,14 @@ "_level": 3, "_components": [ { - "__id__": 24 + "__id__": 12 }, { - "__id__": 25 + "__id__": 13 } ], "_prefab": { - "__id__": 26 + "__id__": 14 }, "_opacity": 255, "_color": { @@ -931,7 +499,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 23 + "__id__": 11 }, "_enabled": true, "_srcBlendFactor": 770, @@ -959,7 +527,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 23 + "__id__": 11 }, "_enabled": true, "alignMode": 1, @@ -1042,11 +610,11 @@ "_level": 2, "_components": [ { - "__id__": 30 + "__id__": 18 } ], "_prefab": { - "__id__": 31 + "__id__": 19 }, "_opacity": 255, "_color": { @@ -1098,7 +666,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 29 + "__id__": 17 }, "_enabled": true, "_srcBlendFactor": 770, @@ -1141,21 +709,21 @@ }, "_children": [ { - "__id__": 33 + "__id__": 21 } ], "_active": false, "_level": 2, "_components": [ { - "__id__": 36 + "__id__": 24 }, { - "__id__": 37 + "__id__": 25 } ], "_prefab": { - "__id__": 38 + "__id__": 26 }, "_opacity": 255, "_color": { @@ -1207,18 +775,18 @@ "_name": "bar_pop", "_objFlags": 0, "_parent": { - "__id__": 32 + "__id__": 20 }, "_children": [], "_active": true, "_level": 2, "_components": [ { - "__id__": 34 + "__id__": 22 } ], "_prefab": { - "__id__": 35 + "__id__": 23 }, "_opacity": 255, "_color": { @@ -1270,7 +838,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 33 + "__id__": 21 }, "_enabled": true, "_srcBlendFactor": 770, @@ -1309,7 +877,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 32 + "__id__": 20 }, "_enabled": true, "_srcBlendFactor": 770, @@ -1337,7 +905,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 32 + "__id__": 20 }, "_enabled": true, "alignMode": 1, @@ -1370,482 +938,6 @@ "fileId": "9bCtInjZNJoYih37mi7U0J", "sync": false }, - { - "__type__": "cc.Node", - "_name": "bar_cube", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_children": [ - { - "__id__": 40 - } - ], - "_active": true, - "_level": 2, - "_components": [ - { - "__id__": 43 - }, - { - "__id__": 44 - } - ], - "_prefab": { - "__id__": 45 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 92, - "height": 77 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_position": { - "__type__": "cc.Vec3", - "x": 75, - "y": -125, - "z": 0 - }, - "_scale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_rotationX": 0, - "_rotationY": 0, - "_quat": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_skewX": 0, - "_skewY": 0, - "_zIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "bar_pop", - "_objFlags": 0, - "_parent": { - "__id__": 39 - }, - "_children": [], - "_active": true, - "_level": 2, - "_components": [ - { - "__id__": 41 - } - ], - "_prefab": { - "__id__": 42 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 119, - "height": 137 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_position": { - "__type__": "cc.Vec3", - "x": -91, - "y": 73, - "z": 0 - }, - "_scale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_rotationX": 0, - "_rotationY": 0, - "_quat": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_skewX": 0, - "_skewY": 0, - "_zIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 40 - }, - "_enabled": true, - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "17a0d49a-24ad-4517-99b5-5e043f550957" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_state": 0, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "f353cb4a-ce95-42aa-90df-fefb96f58cf5" - }, - "fileId": "1bCdmc5bhGcLe2N6SPTti3", - "sync": false - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 39 - }, - "_enabled": true, - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "77ddd38e-c771-4d3d-b287-9a69ccb1ea49" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_state": 0, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 39 - }, - "_enabled": true, - "alignMode": 1, - "_target": null, - "_alignFlags": 4, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": -2.5, - "_verticalCenter": 0, - "_horizontalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 0, - "_originalHeight": 0, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "f353cb4a-ce95-42aa-90df-fefb96f58cf5" - }, - "fileId": "24p48ujbtLVLRbMP1b39Wl", - "sync": false - }, - { - "__type__": "cc.Node", - "_name": "bar_cube", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_children": [ - { - "__id__": 47 - } - ], - "_active": true, - "_level": 2, - "_components": [ - { - "__id__": 50 - }, - { - "__id__": 51 - } - ], - "_prefab": { - "__id__": 52 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 92, - "height": 77 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_position": { - "__type__": "cc.Vec3", - "x": 235, - "y": -125, - "z": 0 - }, - "_scale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_rotationX": 0, - "_rotationY": 0, - "_quat": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_skewX": 0, - "_skewY": 0, - "_zIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "bar_pop", - "_objFlags": 0, - "_parent": { - "__id__": 46 - }, - "_children": [], - "_active": true, - "_level": 2, - "_components": [ - { - "__id__": 48 - } - ], - "_prefab": { - "__id__": 49 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 119, - "height": 137 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_position": { - "__type__": "cc.Vec3", - "x": -91, - "y": 73, - "z": 0 - }, - "_scale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_rotationX": 0, - "_rotationY": 0, - "_quat": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_skewX": 0, - "_skewY": 0, - "_zIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 47 - }, - "_enabled": true, - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "17a0d49a-24ad-4517-99b5-5e043f550957" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_state": 0, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "f353cb4a-ce95-42aa-90df-fefb96f58cf5" - }, - "fileId": "03rKarYyVEf4Hdt+zM1R2E", - "sync": false - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 46 - }, - "_enabled": true, - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "77ddd38e-c771-4d3d-b287-9a69ccb1ea49" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_state": 0, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 46 - }, - "_enabled": true, - "alignMode": 1, - "_target": null, - "_alignFlags": 4, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": -2.5, - "_verticalCenter": 0, - "_horizontalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 0, - "_originalHeight": 0, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "f353cb4a-ce95-42aa-90df-fefb96f58cf5" - }, - "fileId": "58y3ctR9xKd6rMg2Ko8ITD", - "sync": false - }, { "__type__": "cc.Node", "_name": "bar_count_pop", @@ -1858,11 +950,11 @@ "_level": 2, "_components": [ { - "__id__": 54 + "__id__": 28 } ], "_prefab": { - "__id__": 55 + "__id__": 29 }, "_opacity": 255, "_color": { @@ -1914,7 +1006,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 53 + "__id__": 27 }, "_enabled": true, "_srcBlendFactor": 770, @@ -1950,7 +1042,7 @@ }, { "__type__": "cc.Node", - "_name": "bar_count_pop", + "_name": "countLabel", "_objFlags": 0, "_parent": { "__id__": 1 @@ -1960,24 +1052,24 @@ "_level": 2, "_components": [ { - "__id__": 57 + "__id__": 31 } ], "_prefab": { - "__id__": 58 + "__id__": 32 }, "_opacity": 255, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 0, + "g": 0, + "b": 0, "a": 255 }, "_contentSize": { "__type__": "cc.Size", - "width": 91, - "height": 112 + "width": 330.15, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1986,8 +1078,8 @@ }, "_position": { "__type__": "cc.Vec3", - "x": -89, - "y": 95, + "x": 0, + "y": -210, "z": 0 }, "_scale": { @@ -2012,31 +1104,28 @@ "_id": "" }, { - "__type__": "cc.Sprite", + "__type__": "cc.Label", "_name": "", "_objFlags": 0, "node": { - "__id__": 56 + "__id__": 30 }, "_enabled": true, - "_srcBlendFactor": 770, + "_srcBlendFactor": 1, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "0016d811-a1ca-41f2-928e-713b49126c2a" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_state": 0, - "_atlas": null, + "_useOriginalSize": false, + "_string": "当前预约人数: 19999999", + "_N$string": "当前预约人数: 19999999", + "_fontSize": 30, + "_lineHeight": 40, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, "_id": "" }, { @@ -2047,211 +1136,7 @@ "asset": { "__uuid__": "f353cb4a-ce95-42aa-90df-fefb96f58cf5" }, - "fileId": "1b/RT5SBZEMJXCjfgqm4AV", - "sync": false - }, - { - "__type__": "cc.Node", - "_name": "bar_count_pop", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_level": 2, - "_components": [ - { - "__id__": 60 - } - ], - "_prefab": { - "__id__": 61 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 91, - "height": 112 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_position": { - "__type__": "cc.Vec3", - "x": 75, - "y": 95, - "z": 0 - }, - "_scale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_rotationX": 0, - "_rotationY": 0, - "_quat": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_skewX": 0, - "_skewY": 0, - "_zIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 59 - }, - "_enabled": true, - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "0016d811-a1ca-41f2-928e-713b49126c2a" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_state": 0, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "f353cb4a-ce95-42aa-90df-fefb96f58cf5" - }, - "fileId": "3b438kSKdD/aruhtJGmoyx", - "sync": false - }, - { - "__type__": "cc.Node", - "_name": "bar_count_pop", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_level": 2, - "_components": [ - { - "__id__": 63 - } - ], - "_prefab": { - "__id__": 64 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 91, - "height": 112 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_position": { - "__type__": "cc.Vec3", - "x": 237, - "y": 95, - "z": 0 - }, - "_scale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_rotationX": 0, - "_rotationY": 0, - "_quat": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_skewX": 0, - "_skewY": 0, - "_zIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 62 - }, - "_enabled": true, - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "0016d811-a1ca-41f2-928e-713b49126c2a" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_state": 0, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "f353cb4a-ce95-42aa-90df-fefb96f58cf5" - }, - "fileId": "313TCde6FLArUz1dcx7Sdg", + "fileId": "68KMSJAjdN7omC6DUMmf5j", "sync": false }, { @@ -2301,6 +1186,14 @@ "bar": { "__id__": 3 }, + "countLabel": { + "__id__": 31 + }, + "barCover": { + "__id__": 4 + }, + "popTitles": [], + "currentVal": 1000, "_id": "" }, { diff --git a/assets/resources/textures/part1/bar_cube_gole_c.png b/assets/resources/textures/part1/bar_cube_gold_c.png similarity index 100% rename from assets/resources/textures/part1/bar_cube_gole_c.png rename to assets/resources/textures/part1/bar_cube_gold_c.png diff --git a/assets/resources/textures/part1/bar_cube_gole_c.png.meta b/assets/resources/textures/part1/bar_cube_gold_c.png.meta similarity index 72% rename from assets/resources/textures/part1/bar_cube_gole_c.png.meta rename to assets/resources/textures/part1/bar_cube_gold_c.png.meta index fa51945..6237342 100644 --- a/assets/resources/textures/part1/bar_cube_gole_c.png.meta +++ b/assets/resources/textures/part1/bar_cube_gold_c.png.meta @@ -1,15 +1,15 @@ { "ver": "2.2.0", - "uuid": "688e4161-7b44-46a7-b9fd-0ca7c5c30c06", + "uuid": "edfd5e44-63cb-498b-be8a-af6fef3f6b20", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", "premultiplyAlpha": false, "subMetas": { - "bar_cube_gole_c": { + "bar_cube_gold_c": { "ver": "1.0.3", - "uuid": "5722e9c9-58ba-41bb-842e-ff125b3e03e9", - "rawTextureUuid": "688e4161-7b44-46a7-b9fd-0ca7c5c30c06", + "uuid": "3ce36265-d4e5-4a44-b01e-7df0bb0a40ff", + "rawTextureUuid": "edfd5e44-63cb-498b-be8a-af6fef3f6b20", "trimType": "auto", "trimThreshold": 1, "rotated": false, diff --git a/assets/scripts/barCountPop.js b/assets/scripts/barCountPop.js new file mode 100644 index 0000000..41a088c --- /dev/null +++ b/assets/scripts/barCountPop.js @@ -0,0 +1,22 @@ +cc.Class({ + extends: cc.Component, + + properties: { + titleLabel: { + default: null, + type: cc.Label + }, + title: '' + }, + + // LIFE-CYCLE CALLBACKS: + + onLoad () { + this.titleLabel.string = this.title; + }, + + start () { + }, + + // update (dt) {}, +}); diff --git a/assets/scripts/barCountPop.js.meta b/assets/scripts/barCountPop.js.meta new file mode 100644 index 0000000..68ac459 --- /dev/null +++ b/assets/scripts/barCountPop.js.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.0.5", + "uuid": "400a895f-1b71-4b23-9880-459aeef8bad3", + "isPlugin": false, + "loadPluginInWeb": true, + "loadPluginInNative": true, + "loadPluginInEditor": false, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/scripts/barCube.js b/assets/scripts/barCube.js index 629c409..231e7f9 100644 --- a/assets/scripts/barCube.js +++ b/assets/scripts/barCube.js @@ -2,13 +2,22 @@ cc.Class({ extends: cc.Component, properties: { - + box: { + default: null, + type: cc.Sprite + }, + type: 'wood', + status: 'c' }, // LIFE-CYCLE CALLBACKS: onLoad () { - + let url = `textures/part1/bar_cube_${this.type}_${this.status}`; + let self = this; + cc.loader.loadRes(url, cc.SpriteFrame, function (err, spriteFrame) { + self.box.spriteFrame = spriteFrame; + }); }, start () { diff --git a/assets/scripts/barLine.js b/assets/scripts/barLine.js new file mode 100644 index 0000000..e738369 --- /dev/null +++ b/assets/scripts/barLine.js @@ -0,0 +1,26 @@ +cc.Class({ + extends: cc.Component, + + properties: { + point: { + default: null, + type: cc.Sprite + }, + color: 'w' + }, + + // LIFE-CYCLE CALLBACKS: + + onLoad () { + let url = `textures/part1/bar_line_${this.color}`; + let self = this; + cc.loader.loadRes(url, cc.SpriteFrame, function (err, spriteFrame) { + self.point.spriteFrame = spriteFrame; + }); + }, + + start () { + }, + + // update (dt) {}, +}); diff --git a/assets/scripts/barLine.js.meta b/assets/scripts/barLine.js.meta new file mode 100644 index 0000000..5497395 --- /dev/null +++ b/assets/scripts/barLine.js.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.0.5", + "uuid": "875476de-853b-480c-83bb-87fdc06dd2a5", + "isPlugin": false, + "loadPluginInWeb": true, + "loadPluginInNative": true, + "loadPluginInEditor": false, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/scripts/progressBar.js b/assets/scripts/progressBar.js index cb25797..5d4c565 100644 --- a/assets/scripts/progressBar.js +++ b/assets/scripts/progressBar.js @@ -17,20 +17,65 @@ cc.Class({ bar: { default: null, type: cc.Node - } + }, + countLabel: { + default: null, + type: cc.Label + }, + barCover: { + default: null, + type: cc.Node + }, + popTitles: [], + currentVal: 1000 }, // LIFE-CYCLE CALLBACKS: onLoad () { - var point1 = cc.instantiate(this.barPointerPrefab); - this.bar.addChild(point1); - var cube = cc.instantiate(this.barCubePrefab); - this.node.addChild(cube); - cube.setPosition(cc.v2(-87, -125)); - var pop = cc.instantiate(this.barPopPrefab); - this.node.addChild(pop); - pop.setPosition(cc.v2(-235, 95)); + let margin = 170; + this.countLabel.string = '当前预约人数: ' + this.currentVal; + let width = 75; + if (this.currentVal <= 10000) { + width += margin * this.currentVal / 10000; + } else if (this.currentVal > 10000 && this.currentVal <= 30000) { + width += (margin + margin * (this.currentVal - 10000) / 20000); + } else if (this.currentVal > 30000 && this.currentVal <= 50000) { + width += (margin * 2 + margin * (this.currentVal - 30000) / 20000); + } else if (this.currentVal > 50000 && this.currentVal <= 55000) { + width += (margin * 3 + 68 * (this.currentVal - 50000) / 5000); + } else { + width = this.bar.width; + } + this.barCover.width = width; + this.popTitle = ['预约\n即送', '1w', '3w', '5w']; + let xNum = [-245, -75, 95, 265]; + let cubeTypes = ['', 'wood', 'silver', 'gold']; + let openVals = [0, 10000, 30000, 50000]; + for(let i = 0; i < 4; i++) { + var pop = cc.instantiate(this.barPopPrefab); + pop.getComponent('barCountPop').title = this.popTitle[i]; + if (i === 0) { + pop.getComponent('barCountPop').titleLabel.fontSize = 25; + } else { + pop.getComponent('barCountPop').titleLabel.fontSize = 30; + } + this.node.addChild(pop); + pop.setPosition(cc.v2(xNum[i], 95)); + var point = cc.instantiate(this.barPointerPrefab); + point.getComponent('barLine').color = (this.currentVal >= openVals[i]) ? 'w' : 'b'; + this.bar.addChild(point); + point.setPosition(cc.v2(xNum[i], 21)); + if (i > 0) { + var cube = cc.instantiate(this.barCubePrefab); + cube.getComponent('barCube').type = cubeTypes[i]; + cube.getComponent('barCube').status = (this.currentVal >= openVals[i]) ? 'o' : 'c'; + this.node.addChild(cube); + cube.setPosition(cc.v2(xNum[i], -125)); + } + } + + }, start () { diff --git a/assets/scripts/scrollContent.js b/assets/scripts/scrollContent.js index 29a73c3..c8606d5 100644 --- a/assets/scripts/scrollContent.js +++ b/assets/scripts/scrollContent.js @@ -60,6 +60,7 @@ cc.Class({ onLoad () { var processBar = cc.instantiate(this.processBarPrefab); + processBar.getComponent('progressBar').currentVal = 1024; this.part1.addChild(processBar); var puzzle = cc.instantiate(this.puzzlePrefab); this.part2.addChild(puzzle);