Commit 98e20ada authored by yu's avatar yu

7.26调整

parent f6c25c32
...@@ -1163,7 +1163,7 @@ ...@@ -1163,7 +1163,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
1057, 1057,
402.639, 144.879,
0, 0,
0, 0,
0, 0,
...@@ -1562,7 +1562,7 @@ ...@@ -1562,7 +1562,7 @@
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 402.639, "_verticalCenter": 144.879,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
"_isAbsRight": true, "_isAbsRight": true,
...@@ -1680,7 +1680,7 @@ ...@@ -1680,7 +1680,7 @@
"__id__": 34 "__id__": 34
}, },
{ {
"__id__": 44 "__id__": 36
}, },
{ {
"__id__": 46 "__id__": 46
...@@ -1747,23 +1747,117 @@ ...@@ -1747,23 +1747,117 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "diceBg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 33 "__id__": 33
}, },
"_children": [ "_children": [],
"_active": true,
"_components": [
{ {
"__id__": 35 "__id__": 35
}, }
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1914,
"height": 1920
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "1fuGgBlyVP7aErMAlqsuGK"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
},
"_enabled": true,
"_materials": [
{ {
"__id__": 38 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "e6bbf393-7172-42e0-8154-ef2c869502f4"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "6fuXQAhcdIhImxZLU4QpjY"
},
{
"__type__": "cc.Node",
"_name": "diceBg",
"_objFlags": 0,
"_parent": {
"__id__": 33
},
"_children": [
{
"__id__": 37
}, },
{ {
"__id__": 40 "__id__": 40
}, },
{ {
"__id__": 42 "__id__": 42
},
{
"__id__": 44
} }
], ],
"_active": true, "_active": true,
...@@ -1821,16 +1915,16 @@ ...@@ -1821,16 +1915,16 @@
"_name": "dice", "_name": "dice",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 36 "__id__": 38
}, },
{ {
"__id__": 37 "__id__": 39
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1886,7 +1980,7 @@ ...@@ -1886,7 +1980,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 35 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1918,7 +2012,7 @@ ...@@ -1918,7 +2012,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 35 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1986,13 +2080,13 @@ ...@@ -1986,13 +2080,13 @@
"_name": "point", "_name": "point",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 39 "__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2048,7 +2142,7 @@ ...@@ -2048,7 +2142,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 38 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2080,13 +2174,13 @@ ...@@ -2080,13 +2174,13 @@
"_name": "hat", "_name": "hat",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 41 "__id__": 43
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2142,7 +2236,7 @@ ...@@ -2142,7 +2236,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2174,13 +2268,13 @@ ...@@ -2174,13 +2268,13 @@
"_name": "hatBlink", "_name": "hatBlink",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 45
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2236,7 +2330,7 @@ ...@@ -2236,7 +2330,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2263,100 +2357,6 @@ ...@@ -2263,100 +2357,6 @@
"_atlas": null, "_atlas": null,
"_id": "eb6vqvJLlIZLmARGnJkoYq" "_id": "eb6vqvJLlIZLmARGnJkoYq"
}, },
{
"__type__": "cc.Node",
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 33
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 45
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1914,
"height": 1920
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "1fuGgBlyVP7aErMAlqsuGK"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "e6bbf393-7172-42e0-8154-ef2c869502f4"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "6fuXQAhcdIhImxZLU4QpjY"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "boardItems", "_name": "boardItems",
......
...@@ -1324,14 +1324,14 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -1324,14 +1324,14 @@ export default class SceneComponent extends MyCocosSceneComponent {
dice["cantRoll"] = true; dice["cantRoll"] = true;
cc.tween(dice) cc.tween(dice)
.by(3, { angle: 360 }, { easing: "cubicIn" }) .by(1.5, { angle: 360 }, { easing: "cubicIn" })
.to(time, { angle: targetAngle }) .to(time / 2, { angle: targetAngle })
.by(1, { angle: 360 }) .by(0.5, { angle: 360 })
.by(1, { angle: 360 }) .by(0.5, { angle: 360 })
.by(1, { angle: 360 }) .by(0.5, { angle: 360 })
.by(1, { angle: 360 }) .by(0.5, { angle: 360 })
.by((1 / 6) * num, { angle: 60 * num }) .by((1 / 6) * num / 2, { angle: 60 * num })
.by(3, { angle: 360 }, { easing: "cubicOut" }) .by(1.5, { angle: 360 }, { easing: "cubicOut" })
.call(() => { .call(() => {
dice["cantRoll"] = false; dice["cantRoll"] = false;
resolve(null); resolve(null);
......
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