diff --git a/assets/main.fire b/assets/main.fire index 30a10b3..5733d4b 100644 --- a/assets/main.fire +++ b/assets/main.fire @@ -649,6 +649,9 @@ "rulePrefab": { "__uuid__": "de027dd7-a186-4797-b332-2f6e2603d165" }, + "resultPrefab": { + "__uuid__": "50fc505c-5051-4781-84b8-6bdf8254ed17" + }, "menuContentPrefab": { "__uuid__": "6c21a659-0cc4-49e6-a4b6-9697e946aaa1" }, diff --git a/assets/resources/prefabs/info_menu.prefab b/assets/resources/prefabs/info_menu.prefab index 982edb5..f13bd3d 100644 --- a/assets/resources/prefabs/info_menu.prefab +++ b/assets/resources/prefabs/info_menu.prefab @@ -26,21 +26,21 @@ "__id__": 10 }, { - "__id__": 56 + "__id__": 57 } ], "_active": true, "_level": 1, "_components": [ { - "__id__": 67 + "__id__": 68 }, { - "__id__": 68 + "__id__": 69 } ], "_prefab": { - "__id__": 69 + "__id__": 70 }, "_opacity": 255, "_color": { @@ -353,11 +353,11 @@ "_level": 3, "_components": [ { - "__id__": 54 + "__id__": 55 } ], "_prefab": { - "__id__": 55 + "__id__": 56 }, "_opacity": 255, "_color": { @@ -1693,10 +1693,13 @@ "_components": [ { "__id__": 52 + }, + { + "__id__": 53 } ], "_prefab": { - "__id__": 53 + "__id__": 54 }, "_opacity": 255, "_color": { @@ -1891,6 +1894,59 @@ "_atlas": null, "_id": "" }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 47 + }, + "_enabled": true, + "transition": 0, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "duration": 0.1, + "zoomScale": 1.2, + "clickEvents": [], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "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__": 47 + }, + "_id": "" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1950,21 +2006,21 @@ }, "_children": [ { - "__id__": 57 + "__id__": 58 }, { - "__id__": 61 + "__id__": 62 } ], "_active": true, "_level": 3, "_components": [ { - "__id__": 65 + "__id__": 66 } ], "_prefab": { - "__id__": 66 + "__id__": 67 }, "_opacity": 255, "_color": { @@ -2016,21 +2072,21 @@ "_name": "menu_close_btn", "_objFlags": 0, "_parent": { - "__id__": 56 + "__id__": 57 }, "_children": [], "_active": true, "_level": 4, "_components": [ { - "__id__": 58 + "__id__": 59 }, { - "__id__": 59 + "__id__": 60 } ], "_prefab": { - "__id__": 60 + "__id__": 61 }, "_opacity": 255, "_color": { @@ -2082,7 +2138,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 57 + "__id__": 58 }, "_enabled": true, "_srcBlendFactor": 770, @@ -2110,7 +2166,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 57 + "__id__": 58 }, "_enabled": true, "transition": 0, @@ -2154,7 +2210,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 57 + "__id__": 58 }, "_id": "" }, @@ -2174,21 +2230,21 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 56 + "__id__": 57 }, "_children": [], "_active": true, "_level": 4, "_components": [ { - "__id__": 62 + "__id__": 63 }, { - "__id__": 63 + "__id__": 64 } ], "_prefab": { - "__id__": 64 + "__id__": 65 }, "_opacity": 255, "_color": { @@ -2240,7 +2296,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 61 + "__id__": 62 }, "_enabled": true, "_srcBlendFactor": 1, @@ -2265,7 +2321,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 61 + "__id__": 62 }, "_enabled": true, "_color": { @@ -2294,7 +2350,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 56 + "__id__": 57 }, "_enabled": true, "_srcBlendFactor": 770, @@ -2364,7 +2420,13 @@ }, "_enabled": true, "closeBtn": { - "__id__": 57 + "__id__": 58 + }, + "submitBtn": { + "__id__": 47 + }, + "resultPrefab": { + "__uuid__": "50fc505c-5051-4781-84b8-6bdf8254ed17" }, "_id": "" }, diff --git a/assets/resources/prefabs/result_view.prefab b/assets/resources/prefabs/result_view.prefab new file mode 100644 index 0000000..26a7a1b --- /dev/null +++ b/assets/resources/prefabs/result_view.prefab @@ -0,0 +1,646 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "", + "_objFlags": 0, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "asyncLoadAssets": false + }, + { + "__type__": "cc.Node", + "_name": "result_view", + "_objFlags": 0, + "_parent": null, + "_children": [ + { + "__id__": 2 + }, + { + "__id__": 7 + }, + { + "__id__": 13 + } + ], + "_active": true, + "_level": 1, + "_components": [ + { + "__id__": 17 + }, + { + "__id__": 18 + } + ], + "_prefab": { + "__id__": 19 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 750, + "height": 1624 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 375, + "y": 812, + "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": "menu_bg", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_level": 3, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 4 + }, + { + "__id__": 5 + } + ], + "_prefab": { + "__id__": 6 + }, + "_opacity": 125, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 750, + "height": 1624 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "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__": 2 + }, + "_enabled": true, + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "e984b114-8c4d-4c8f-98d0-a61a25cdc99a" + }, + "_type": 0, + "_sizeMode": 0, + "_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__": 2 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 5, + "_originalHeight": 5, + "_id": "" + }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "50fc505c-5051-4781-84b8-6bdf8254ed17" + }, + "fileId": "eaSnhQuiRCoIPc/g5HOAIc", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "result_02", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 8 + } + ], + "_active": true, + "_level": 3, + "_components": [ + { + "__id__": 11 + } + ], + "_prefab": { + "__id__": 12 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 749, + "height": 918 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "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": "New Label", + "_objFlags": 0, + "_parent": { + "__id__": 7 + }, + "_children": [], + "_active": true, + "_level": 4, + "_components": [ + { + "__id__": 9 + } + ], + "_prefab": { + "__id__": 10 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 130, + "g": 111, + "b": 79, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 193.46, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 0, + "y": -182, + "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__": 8 + }, + "_enabled": true, + "_srcBlendFactor": 1, + "_dstBlendFactor": 771, + "_useOriginalSize": false, + "_string": "QQ群号: 9281449914\n长按扫码\n或复制QQ群号加入群", + "_N$string": "QQ群号: 9281449914\n长按扫码\n或复制QQ群号加入群", + "_fontSize": 20, + "_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__": "50fc505c-5051-4781-84b8-6bdf8254ed17" + }, + "fileId": "79cGSCknBEPp6kBMV9zb6n", + "sync": false + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 7 + }, + "_enabled": true, + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "7f8893df-6432-49e4-8c65-d5b22dbebdbb" + }, + "_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__": "50fc505c-5051-4781-84b8-6bdf8254ed17" + }, + "fileId": "fe2/Zs00lIpKI9AoHEWnd1", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "menu_close_btn", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_level": 3, + "_components": [ + { + "__id__": 14 + }, + { + "__id__": 15 + } + ], + "_prefab": { + "__id__": 16 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 50, + "height": 49 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 224, + "y": 333, + "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__": 13 + }, + "_enabled": true, + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "51a67ca8-e497-47b0-94c5-7a9708ff2dc0" + }, + "_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.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 13 + }, + "_enabled": true, + "transition": 0, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "duration": 0.1, + "zoomScale": 1.2, + "clickEvents": [], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "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__": 13 + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "50fc505c-5051-4781-84b8-6bdf8254ed17" + }, + "fileId": "afKMntEdpNtqY5jZ0qPG43", + "sync": false + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_id": "" + }, + { + "__type__": "2d888rPE6ZMgqMbslgLFk3S", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1 + }, + "_enabled": true, + "closeBtn": { + "__id__": 13 + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "50fc505c-5051-4781-84b8-6bdf8254ed17" + }, + "fileId": "06/lcPu9dKpJpl1DyTylPA", + "sync": false + } +] \ No newline at end of file diff --git a/assets/resources/prefabs/result_view.prefab.meta b/assets/resources/prefabs/result_view.prefab.meta new file mode 100644 index 0000000..45e397d --- /dev/null +++ b/assets/resources/prefabs/result_view.prefab.meta @@ -0,0 +1,7 @@ +{ + "ver": "1.0.0", + "uuid": "50fc505c-5051-4781-84b8-6bdf8254ed17", + "optimizationPolicy": "AUTO", + "asyncLoadAssets": false, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/resources/textures/menu/result_02.png b/assets/resources/textures/menu/result_02.png new file mode 100644 index 0000000..ab09f20 Binary files /dev/null and b/assets/resources/textures/menu/result_02.png differ diff --git a/assets/resources/textures/menu/result_02.png.meta b/assets/resources/textures/menu/result_02.png.meta new file mode 100644 index 0000000..5fa9921 --- /dev/null +++ b/assets/resources/textures/menu/result_02.png.meta @@ -0,0 +1,31 @@ +{ + "ver": "2.2.0", + "uuid": "47946390-0911-4981-ae16-facd5d66f099", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "subMetas": { + "result_02": { + "ver": "1.0.3", + "uuid": "7f8893df-6432-49e4-8c65-d5b22dbebdbb", + "rawTextureUuid": "47946390-0911-4981-ae16-facd5d66f099", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -0.5, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 749, + "height": 918, + "rawWidth": 750, + "rawHeight": 918, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/scripts/infoMenu.js b/assets/scripts/infoMenu.js index 8b6a3a7..875dd06 100644 --- a/assets/scripts/infoMenu.js +++ b/assets/scripts/infoMenu.js @@ -5,6 +5,14 @@ cc.Class({ closeBtn: { default: null, type: cc.Node + }, + submitBtn: { + default: null, + type: cc.Node + }, + resultPrefab: { + default: null, + type: cc.Prefab } }, @@ -14,6 +22,9 @@ cc.Class({ let self = this; this.closeBtn.on('click', function () { self.node.removeFromParent(true); + }); + this.submitBtn.on('click', function () { + self.showResultView(); }) }, @@ -21,4 +32,9 @@ cc.Class({ }, // update (dt) {}, + showResultView() { + let result = cc.instantiate(this.resultPrefab); + this.top.node.addChild(result, 11); + this.node.removeFromParent(true); + } }); diff --git a/assets/scripts/main.js b/assets/scripts/main.js index 53b4267..3713057 100644 --- a/assets/scripts/main.js +++ b/assets/scripts/main.js @@ -38,6 +38,10 @@ cc.Class({ default: null, type: cc.Prefab }, + resultPrefab: { + default: null, + type: cc.Prefab + }, menuContentPrefab: { default: null, type: cc.Prefab @@ -113,6 +117,7 @@ cc.Class({ }, showInfoMenu() { let infoMenu = cc.instantiate(this.infoMenuPrefab); + infoMenu.getComponent('infoMenu').top = this; this.node.addChild(infoMenu, 11); }, showInviteMenu() { diff --git a/assets/scripts/resultView.js b/assets/scripts/resultView.js new file mode 100644 index 0000000..8b6a3a7 --- /dev/null +++ b/assets/scripts/resultView.js @@ -0,0 +1,24 @@ +cc.Class({ + extends: cc.Component, + + properties: { + closeBtn: { + default: null, + type: cc.Node + } + }, + + // LIFE-CYCLE CALLBACKS: + + onLoad () { + let self = this; + this.closeBtn.on('click', function () { + self.node.removeFromParent(true); + }) + }, + + start () { + }, + + // update (dt) {}, +}); diff --git a/assets/scripts/resultView.js.meta b/assets/scripts/resultView.js.meta new file mode 100644 index 0000000..5cacd88 --- /dev/null +++ b/assets/scripts/resultView.js.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.0.5", + "uuid": "2d888acf-13a6-4c82-a31b-b2580b164dd2", + "isPlugin": false, + "loadPluginInWeb": true, + "loadPluginInNative": true, + "loadPluginInEditor": false, + "subMetas": {} +} \ No newline at end of file