Commit 0acd773d authored by 杨一航's avatar 杨一航

add

parent 6d988c90
{
"ver": "1.1.2",
"uuid": "002853b8-b2dc-4651-afb1-3c765bdbdd10",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "125f9b59-96b8-48ec-a791-45ae546aaaf5",
"downloadMode": 0,
"duration": 3.239184,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "c3b862bd-e4e7-4a45-840d-1cd2665703a9",
"downloadMode": 0,
"duration": 2.976,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "a97668f7-c0e5-4a83-89dc-2aeabafdef57",
"downloadMode": 0,
"duration": 1.959184,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "84f98c7e-680e-41c4-9933-7ec53e966cd5",
"downloadMode": 0,
"duration": 0.84,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "bd69b85e-b726-4921-9723-f6d56a6d2a0a",
"downloadMode": 0,
"duration": 7.752,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "72246b94-167e-4a13-b4b4-0ab93f556a38",
"downloadMode": 0,
"duration": 11.352,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "cf3a477b-0cbd-43e9-b045-c1a174450e50",
"downloadMode": 0,
"duration": 13.44,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "379e6082-1ade-4c00-ac06-aa2d28146c3a",
"downloadMode": 0,
"duration": 9.048,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "ffdf578e-0629-48d4-b0de-c23d30b9d1dd",
"downloadMode": 0,
"duration": 4.488,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "9df9c000-ad96-404b-bba2-9d22d8a42c07",
"downloadMode": 0,
"duration": 6.12,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "353d7440-671c-40d8-b78b-1463749f36a6",
"downloadMode": 0,
"duration": 7.344,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "c736692f-86cb-4a84-bd39-ca2786751d89",
"downloadMode": 0,
"duration": 4.848,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "402d025a-7ce0-45f4-a5b8-2238441bc5c3",
"downloadMode": 0,
"duration": 3.6,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "ac0838fe-ab35-4dee-b872-64e85696624b",
"downloadMode": 0,
"duration": 0.9428,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "c41aa3a7-b710-4d29-93e2-d8b037cc47e1",
"downloadMode": 0,
"duration": 0.697429,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.1.2",
"uuid": "e2ad6d49-a019-4537-82df-718d02c2872d",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "1186d583-e7b6-428a-8eb3-4395c278a714",
"downloadMode": 0,
"duration": 0.503188,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "bef612ef-131c-4462-a287-c382db48aaa7",
"downloadMode": 0,
"duration": 0.763813,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "0d9bbb30-52bc-4ebe-96c0-bd97065392dc",
"downloadMode": 0,
"duration": 1.024438,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "93462777-90a8-4014-8f79-766e9f1171eb",
"downloadMode": 0,
"duration": 0.842,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "6739634e-4b68-490b-bba2-9a0268beaa14",
"downloadMode": 0,
"duration": 0.824,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "57d94c1c-c834-4248-8dc6-9c3de6c9da92",
"downloadMode": 0,
"duration": 1.076563,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "04c4579c-137f-4199-9aac-4565f34577e0",
"downloadMode": 0,
"duration": 0.842,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "cb5bc344-b0b4-4bb8-8bbc-c9952a239447",
"downloadMode": 0,
"duration": 0.998375,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "029fd470-e6f8-463a-942f-5992313056a2",
"downloadMode": 0,
"duration": 1.511625,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "2c5cbd6d-6ad3-46de-9b9f-32babc96561d",
"downloadMode": 0,
"duration": 0.711688,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "6c2c3bfe-4eba-4dec-950e-c06028e19334",
"downloadMode": 0,
"duration": 1.77225,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "15ea68eb-6e32-48a6-9c82-36119f1892c3",
"downloadMode": 0,
"duration": 1.381313,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "4787b516-cfb8-4e94-9ecb-511207551bf6",
"downloadMode": 0,
"duration": 1.303125,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "53186d4b-8aee-4ffb-bbc5-bda34934e632",
"downloadMode": 0,
"duration": 1.024438,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "36a17193-9c5f-487a-9daf-f189dc25579e",
"downloadMode": 0,
"duration": 0.842,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "9691ab79-cadc-48e2-b116-89d84dce5e8d",
"downloadMode": 0,
"duration": 1.024438,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "b0b4c7f1-7e6f-4a7a-9bc0-308cd55d37aa",
"downloadMode": 0,
"duration": 3.291875,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "b7aef287-a3b7-48f0-a38d-ade5723c2500",
"downloadMode": 0,
"duration": 1.77225,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "fde4ca6b-9344-4789-a5e1-f621f95589b8",
"downloadMode": 0,
"duration": 0.6335,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "fb996871-900a-4e11-86e8-30bef375b63b",
"downloadMode": 0,
"duration": 0.94625,
"subMetas": {}
}
\ No newline at end of file
......@@ -1221,8 +1221,8 @@
0,
0,
1,
1.4,
1.4,
1,
1,
1
]
},
......@@ -1536,8 +1536,8 @@
0,
0,
1,
1.4,
1.4,
1,
1,
1
]
},
......@@ -1892,9 +1892,9 @@
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 242,
"g": 184,
"b": 32,
"r": 0,
"g": 246,
"b": 44,
"a": 255
},
"_contentSize": {
......@@ -2325,9 +2325,9 @@
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 253,
"g": 165,
"b": 10,
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
......@@ -2433,9 +2433,9 @@
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 253,
"g": 165,
"b": 10,
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
......
......@@ -22,6 +22,13 @@ export default class Keyboard extends cc.Component {
@property(cc.Node)
btnbackNode: cc.Node = null;
@property(cc.Node)
btnShowNode: cc.Node = null;
@property(cc.Node)
btnHideNode: cc.Node = null;
_wordList = [];
private _normaly: number;
private _moving: boolean;
......@@ -41,7 +48,14 @@ export default class Keyboard extends cc.Component {
this.btnOkNode.on("click", this.sendWords, this)
this.btnbackNode.on("click", this.backWord, this)
this.btnShowNode.on("click", this.showIn, this)
this.btnHideNode.on("click", this.showOut, this)
this.btnShowNode.active = false;
this.btnHideNode.active = false;
}
setNormalData(posy: number) {
this._normaly = posy;
this.node.y = posy;
......@@ -64,6 +78,9 @@ export default class Keyboard extends cc.Component {
console.log(this._wordList.join(""));
this._endCall && this._endCall(this._wordList.join(""));
this.showOut();
this.btnShowNode.active = true;
this.btnHideNode.active = false;
}
set InputEndCall(endCall: Function) {
this._endCall = endCall;
......@@ -74,10 +91,12 @@ export default class Keyboard extends cc.Component {
this._moving = true;
cc.tween(this.node).to(0.3, { y: this._normaly + this.node.height }, { easing: "sineIn" }).call(() => {
this._moving = false;
this.btnShowNode.active = false;
this.btnHideNode.active = true;
}).start();
}
showOut() {
showOut(hideMini = false) {
if (this._moving) return;
this._moving = true;
......@@ -86,5 +105,10 @@ export default class Keyboard extends cc.Component {
cc.tween(this.node).to(0.3, { y: this._normaly }, { easing: "sineOut" }).call(() => {
this._moving = false;
}).start();
if (hideMini) {
this.btnShowNode.active = false;
this.btnHideNode.active = false;
}
}
}
{
"ver": "2.3.5",
"uuid": "2787d9b8-f8a1-46d0-a948-86e1d18ccda6",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 240,
"height": 168,
"platformSettings": {},
"subMetas": {
"按钮点击可打开": {
"ver": "1.0.4",
"uuid": "5a1ecca6-36f0-44c2-b92d-7b43b5d95c01",
"rawTextureUuid": "2787d9b8-f8a1-46d0-a948-86e1d18ccda6",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 240,
"height": 168,
"rawWidth": 240,
"rawHeight": 168,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "99887d8a-7e69-435a-8d10-c7482f91f828",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 240,
"height": 168,
"platformSettings": {},
"subMetas": {
"键盘点击可收起": {
"ver": "1.0.4",
"uuid": "09ad2d81-5fa8-4c19-af99-20c2415bd434",
"rawTextureUuid": "99887d8a-7e69-435a-8d10-c7482f91f828",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 240,
"height": 168,
"rawWidth": 240,
"rawHeight": 168,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
......@@ -31,22 +31,28 @@
},
{
"__id__": 201
},
{
"__id__": 205
},
{
"__id__": 209
}
],
"_active": true,
"_components": [
{
"__id__": 205
"__id__": 213
},
{
"__id__": 206
"__id__": 214
},
{
"__id__": 207
"__id__": 215
}
],
"_prefab": {
"__id__": 208
"__id__": 216
},
"_opacity": 255,
"_color": {
......@@ -8571,6 +8577,362 @@
"fileId": "e7vPK6Ie5CSqarBSDIfW1y",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "btn_hide",
"_objFlags": 0,
"_parent": {
"__id__": 1
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 206
},
{
"__id__": 207
}
],
"_prefab": {
"__id__": 208
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 240,
"height": 168
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
952.649,
312.418,
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__": 205
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "09ad2d81-5fa8-4c19-af99-20c2415bd434"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 205
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"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": null,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "18d3333f-24df-4c35-baea-d0cc6ed1fee7"
},
"fileId": "88JuoQ0rVJBpfd3REfALBr",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "btn_show",
"_objFlags": 0,
"_parent": {
"__id__": 1
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 210
},
{
"__id__": 211
}
],
"_prefab": {
"__id__": 212
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 240,
"height": 168
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
952.649,
312.418,
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__": 209
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "5a1ecca6-36f0-44c2-b92d-7b43b5d95c01"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 209
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"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": null,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "18d3333f-24df-4c35-baea-d0cc6ed1fee7"
},
"fileId": "80uIQ9nvhF0ZjK73qmYkWs",
"sync": false
},
{
"__type__": "cc.Sprite",
"_name": "",
......@@ -8623,6 +8985,12 @@
"btnbackNode": {
"__id__": 201
},
"btnShowNode": {
"__id__": 209
},
"btnHideNode": {
"__id__": 205
},
"_id": ""
},
{
......
This diff is collapsed.
This diff is collapsed.
......@@ -59,7 +59,7 @@ export class AI {
} else {
this._startAi = true;
this._stepIndex = data.index;
this._countDelay = Math.floor(7 + Math.random() * 5);
this._countDelay = Math.floor(6 + Math.random() * 7);
}
} else if (type == MsgType.ROUND_END_EV) {
let data = msgData;
......
......@@ -173,10 +173,11 @@ export class GameServer {
}
clearInterval(this._timer)
this._senMsg({
type: MsgType.ROOM_ST,
data: this._gameData.Msg
});
// this._senMsg({
// type: MsgType.ROOM_ST,
// data: this._gameData.Msg
// });
let answerList = this._gameData.getAnswerList();
for (let i = 0; i < answerList.length; ++i) {
......@@ -185,7 +186,7 @@ export class GameServer {
this._senMsg({
type: MsgType.ROUND_END_EV,
data: { round: this._gameData.Round, reason: 2, answerList: this._round_1_cardList }
data: { round: this._gameData.Round, reason: 2, answerList: answerList }
});
this._initRound2();
......
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