Commit a4da5f70 authored by 李维's avatar 李维

dev commit

parent 5c316ffa
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "e3d39ead-9ae5-45df-a908-d9fee96d1c97", "uuid": "b861da88-b3a5-4c05-9309-630b06a36ed3",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "8b7f8e75-240d-4acb-9738-aa9bcc9e582e", "uuid": "ae2004d3-df41-42e1-8334-1e59b9e584d0",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "31e3a09b-75b0-4ed4-9962-6d74c5823986", "uuid": "ab66323e-a0ac-46ed-957b-fbda4e317d4b",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"狮子_tex": { "狮子_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "699fb9ac-13b4-40dd-a557-77fc0f4686c4", "uuid": "f73e6f3e-a59e-429b-b9e2-dcd872a75474",
"rawTextureUuid": "31e3a09b-75b0-4ed4-9962-6d74c5823986", "rawTextureUuid": "ab66323e-a0ac-46ed-957b-fbda4e317d4b",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
"array": [ "array": [
0, 0,
0, 0,
537.665603148476, 497.96460717605225,
0, 0,
0, 0,
0, 0,
...@@ -559,7 +559,7 @@ ...@@ -559,7 +559,7 @@
"_cacheMode": 0, "_cacheMode": 0,
"playTimes": -1, "playTimes": -1,
"premultipliedAlpha": false, "premultipliedAlpha": false,
"_armatureKey": "e3d39ead-9ae5-45df-a908-d9fee96d1c97#8b7f8e75-240d-4acb-9738-aa9bcc9e582e", "_armatureKey": "b861da88-b3a5-4c05-9309-630b06a36ed3#ae2004d3-df41-42e1-8334-1e59b9e584d0",
"_accTime": 0, "_accTime": 0,
"_playCount": 0, "_playCount": 0,
"_frameCache": null, "_frameCache": null,
...@@ -567,10 +567,10 @@ ...@@ -567,10 +567,10 @@
"_playing": false, "_playing": false,
"_armatureCache": null, "_armatureCache": null,
"_N$dragonAsset": { "_N$dragonAsset": {
"__uuid__": "e3d39ead-9ae5-45df-a908-d9fee96d1c97" "__uuid__": "b861da88-b3a5-4c05-9309-630b06a36ed3"
}, },
"_N$dragonAtlasAsset": { "_N$dragonAtlasAsset": {
"__uuid__": "8b7f8e75-240d-4acb-9738-aa9bcc9e582e" "__uuid__": "ae2004d3-df41-42e1-8334-1e59b9e584d0"
}, },
"_N$_defaultArmatureIndex": 0, "_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 0, "_N$_animationIndex": 0,
...@@ -1366,7 +1366,7 @@ ...@@ -1366,7 +1366,7 @@
"__id__": 27 "__id__": 27
} }
], ],
"_active": true, "_active": false,
"_components": [], "_components": [],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
...@@ -1543,8 +1543,8 @@ ...@@ -1543,8 +1543,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
2.661, 0,
2.661, 0,
0, 0,
0, 0,
0, 0,
......
...@@ -59,7 +59,7 @@ export default class GameLogic { ...@@ -59,7 +59,7 @@ export default class GameLogic {
} }
this.g_cartoon.initDragEvent() this.g_cartoon.initDragEvent()
this.enableClick("Sysyem_init"); this.enableClick("Sysyem_init");
this.hideAir(); // this.hideAir();
this.systemTick(); this.systemTick();
this.releaseBubbles() this.releaseBubbles()
} }
...@@ -380,9 +380,11 @@ export default class GameLogic { ...@@ -380,9 +380,11 @@ export default class GameLogic {
const bubbleNum = rightNum + wrongNum; const bubbleNum = rightNum + wrongNum;
const bubbleParent = this.g_cartoon.getNodeByPath(`Canvas/bubble_group`) const bubbleParent = this.g_cartoon.getNodeByPath(`Canvas/bubble_group`)
const scale = bubbleNum<=15?1:0.7;
for(let i=0; i<bubbleNum; i++) { for(let i=0; i<bubbleNum; i++) {
const bubble = cc.instantiate(this.g_systemOption.prefabs.bubble); const bubble = cc.instantiate(this.g_systemOption.prefabs.bubble);
bubble.parent = bubbleParent; bubble.parent = bubbleParent;
this.m_maxScale = scale;
let bubb = this.g_cartoon.setCartoonElement(`bubble_${i}`, bubble) let bubb = this.g_cartoon.setCartoonElement(`bubble_${i}`, bubble)
bubb.boom = () => { bubb.boom = () => {
let _p = [] let _p = []
...@@ -517,9 +519,19 @@ export default class GameLogic { ...@@ -517,9 +519,19 @@ export default class GameLogic {
{x: -280, y: 24}, {x: 0, y: 5}, {x: -172, y: -172}, {x: 34, y: -220}, {x: 235, y: -37}, {x: -280, y: 24}, {x: 0, y: 5}, {x: -172, y: -172}, {x: 34, y: -220}, {x: 235, y: -37},
{x: -119, y: 191}, {x: 287, y: 186}, {x: -320, y: 252}, {x: -486, y: -45}, {x: 452, y: 30}, {x: -119, y: 191}, {x: 287, y: 186}, {x: -320, y: 252}, {x: -486, y: -45}, {x: 452, y: 30},
{x: -380, y: -247}, {x: 87, y: 252}, {x: 258, y: -244}, {x: 505, y: 236}, {x: -500, y: 160}, {x: -380, y: -247}, {x: 87, y: 252}, {x: 258, y: -244}, {x: 505, y: 236}, {x: -500, y: 160},
],
[
{x: -328.374, y: 110.355}, {x: 216.211, y: 7.251}, {x: -121.121, y: -134.579}, {x: 119.35, y: -114.68}, {x: -37.682, y: 152.075},
{x: 0, y: -13.458}, {x: 297.835, y: 125.057}, {x: -277.234, y: -48.448}, {x: -201.869, y: 180.336}, {x: 17.41, y: -217.592},
{x: -427.963, y: 2.691}, {x: 270.477, y: -136.746}, {x: 111.701, y: 117.084}, {x: -423.925, y: 218.018}, {x: -259.738, y: -215.326},
{x: 216.778, y: 263.332}, {x: -157.458, y: 43.066}, {x: 375.715, y: -17.987}, {x: -563.888, y: -67.289}, {x: -91.514, y: 283.963},
{x: 456.774, y: 131.414}, {x: -557.159, y: 275.888}, {x: 149.026, y: -275.623}, {x: -405.084, y: -141.308}, {x: 385.252, y: 271.279},
{x: -549.084, y: 106.318}, {x: 299.425, y: -283.412}, {x: -410.468, y: -278.579}, {x: 64.598, y: 279.925}, {x: 558.494, y: 242.67},
{x: -292.038, y: 282.617}, {x: -131.889, y: -283.962}, {x: 547.368, y: 2.675},
] ]
] ]
let scaleIndex = this.m_bubblesAll.length<=15?0:1;
let startx = cc.winSize.width / 2 let startx = cc.winSize.width / 2
let starty = -cc.winSize.height / 2 let starty = -cc.winSize.height / 2
const vArr = [ const vArr = [
...@@ -533,8 +545,8 @@ export default class GameLogic { ...@@ -533,8 +545,8 @@ export default class GameLogic {
bubble.node.y = starty; bubble.node.y = starty;
bubble.node.scale = 0; bubble.node.scale = 0;
let _p = new Promise((resolve, reject) => { let _p = new Promise((resolve, reject) => {
bubble.move.x = pos[0][count].x bubble.move.x = pos[scaleIndex][count].x
bubble.move.y = pos[0][count].y bubble.move.y = pos[scaleIndex][count].y
bubble.move.vX = vArr[count%4].vX bubble.move.vX = vArr[count%4].vX
bubble.move.vY = vArr[count%4].vY bubble.move.vY = vArr[count%4].vY
count++; count++;
......
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