Commit 54c29096 authored by haiyoucuv's avatar haiyoucuv

上传

parent 82aa9001
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
"__prefab": null, "__prefab": null,
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 110.66395568847656, "width": 96.26396179199219,
"height": 45.36 "height": 45.36
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"_string": "scores", "_string": "Score",
"_horizontalAlign": 1, "_horizontalAlign": 1,
"_verticalAlign": 1, "_verticalAlign": 1,
"_actualFontSize": 36, "_actualFontSize": 36,
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
], ],
"subMetas": {}, "subMetas": {},
"userData": { "userData": {
"maxWidth": 4096, "maxWidth": 2048,
"maxHeight": 4096, "maxHeight": 2048,
"padding": 2, "padding": 2,
"allowRotation": true, "allowRotation": true,
"forceSquared": false, "forceSquared": false,
......
...@@ -69,9 +69,14 @@ export default class GameMgr { ...@@ -69,9 +69,14 @@ export default class GameMgr {
hideWaiting(); hideWaiting();
if (!success) { if (!success) {
changeScene(HomeScene); // changeScene(HomeScene);
showPanel(NoPrizePanel, {
highest: score,
score,
isError: true,
});
return false; return false;
} }
......
...@@ -19,6 +19,10 @@ export default class NoPrizePanel extends Panel { ...@@ -19,6 +19,10 @@ export default class NoPrizePanel extends Panel {
@property(Label) scoreLabel: Label = null; @property(Label) scoreLabel: Label = null;
@property(Label) highestLabel: Label = null; @property(Label) highestLabel: Label = null;
@property(Node) box: Node = null;
@property(Node) errorTip: Node = null;
onLoad() { onLoad() {
this.closeBtn.on(Button.EventType.CLICK, this.onClose, this); this.closeBtn.on(Button.EventType.CLICK, this.onClose, this);
this.againBtn.on(Button.EventType.CLICK, this.clickAgain, this); this.againBtn.on(Button.EventType.CLICK, this.clickAgain, this);
...@@ -26,10 +30,13 @@ export default class NoPrizePanel extends Panel { ...@@ -26,10 +30,13 @@ export default class NoPrizePanel extends Panel {
} }
async start() { async start() {
const {highest, score} = this.data; const {highest, score, isError} = this.data;
this.highestLabel.string = highest; this.highestLabel.string = highest;
this.scoreLabel.string = score; this.scoreLabel.string = score;
this.box.active = !isError;
this.errorTip.active = isError;
} }
clickRank = () => { clickRank = () => {
......
...@@ -402,7 +402,7 @@ ...@@ -402,7 +402,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 113, "width": 113,
"height": 135 "height": 141
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1030,7 +1030,7 @@ ...@@ -1030,7 +1030,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 113, "width": 113,
"height": 135 "height": 141
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
......
...@@ -47,9 +47,9 @@ ...@@ -47,9 +47,9 @@
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 113, "width": 113,
"height": 135, "height": 141,
"rawWidth": 113, "rawWidth": 113,
"rawHeight": 135, "rawHeight": 141,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
...@@ -62,16 +62,16 @@ ...@@ -62,16 +62,16 @@
"vertices": { "vertices": {
"rawPosition": [ "rawPosition": [
-56.5, -56.5,
-67.5, -70.5,
0, 0,
56.5, 56.5,
-67.5, -70.5,
0, 0,
-56.5, -56.5,
67.5, 70.5,
0, 0,
56.5, 56.5,
67.5, 70.5,
0 0
], ],
"indexes": [ "indexes": [
...@@ -84,9 +84,9 @@ ...@@ -84,9 +84,9 @@
], ],
"uv": [ "uv": [
0, 0,
135, 141,
113, 113,
135, 141,
0, 0,
0, 0,
113, 113,
...@@ -104,12 +104,12 @@ ...@@ -104,12 +104,12 @@
], ],
"minPos": [ "minPos": [
-56.5, -56.5,
-67.5, -70.5,
0 0
], ],
"maxPos": [ "maxPos": [
56.5, 56.5,
67.5, 70.5,
0 0
] ]
}, },
......
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "14037985-f5f2-424b-a8ad-32376f086989",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "14037985-f5f2-424b-a8ad-32376f086989@6c48a",
"displayName": "box",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "14037985-f5f2-424b-a8ad-32376f086989",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "14037985-f5f2-424b-a8ad-32376f086989@f9941",
"displayName": "box",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 304,
"height": 244,
"rawWidth": 304,
"rawHeight": 244,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-152,
-122,
0,
152,
-122,
0,
-152,
122,
0,
152,
122,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
244,
304,
244,
0,
0,
304,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-152,
-122,
0
],
"maxPos": [
152,
122,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "14037985-f5f2-424b-a8ad-32376f086989@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "14037985-f5f2-424b-a8ad-32376f086989@6c48a"
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment