Skip to content

B
babycare_xiaoxiao
Commit 485b3e90 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

按钮放反了

parent 28894b9f
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 80 deletions
.idea/workspace.xml
View file @ 485b3e90
......@@ -3,11 +3,12 @@
<component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TaoBaoNet.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaoBaoNet.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/TaskPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/TaskPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -197,14 +198,7 @@
<workItem from="1602310896602" duration="5137000" />
<workItem from="1602322734643" duration="2339000" />
<workItem from="1602380089772" duration="7488000" />
<workItem from="1602467369737" duration="7307000" />
</task>
<task id="LOCAL-00033" summary="Success Panel Effect!">
<created>1595850578565</created>
<option name="number" value="00033" />
<option name="presentableId" value="LOCAL-00033" />
<option name="project" value="LOCAL" />
<updated>1595850578565</updated>
<workItem from="1602467369737" duration="11086000" />
</task>
<task id="LOCAL-00034" summary="Success Panel Effect!">
<created>1595854773117</created>
......@@ -542,7 +536,14 @@
<option name="project" value="LOCAL" />
<updated>1602470672813</updated>
</task>
<option name="localTasksCounter" value="82" />
<task id="LOCAL-00082" summary="按钮放反了">
<created>1602489218845</created>
<option name="number" value="00082" />
<option name="presentableId" value="LOCAL-00082" />
<option name="project" value="LOCAL" />
<updated>1602489218845</updated>
</task>
<option name="localTasksCounter" value="83" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -609,73 +610,73 @@
</state>
<state x="250" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/30.23.1890.1177@30.23.1890.1177" timestamp="1601454738211" />
<state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="560" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602470671833">
<state x="560" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602489218261">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="557" y="23" key="CommitChangelistDialog2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472142620" />
<state x="423" y="142" width="783" height="664" key="CommitChangelistDialog2/30.23.1410.877@30.23.1410.877" timestamp="1601389896862" />
<state x="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602470671833" />
<state x="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602489218261" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" />
<state x="131" y="63" width="1683" height="1037" key="DiffContextDialog" timestamp="1602321352721">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="131" y="63" width="1683" height="1037" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1602321352721" />
<state width="902" height="321" key="GridCell.Tab.0.bottom" timestamp="1602488023264">
<state width="902" height="321" key="GridCell.Tab.0.bottom" timestamp="1602502840524">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="935" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1602426830829" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="902" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602488023264" />
<state width="902" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602502840524" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state width="902" height="321" key="GridCell.Tab.0.center" timestamp="1602488023262">
<state width="902" height="321" key="GridCell.Tab.0.center" timestamp="1602502840523">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="935" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1602426830828" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="902" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602488023262" />
<state width="902" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602502840523" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" />
<state width="902" height="321" key="GridCell.Tab.0.left" timestamp="1602488023261">
<state width="902" height="321" key="GridCell.Tab.0.left" timestamp="1602502840523">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154150" />
<state width="935" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1602426830828" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="902" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602488023261" />
<state width="902" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602502840523" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" />
<state width="902" height="321" key="GridCell.Tab.0.right" timestamp="1602488023264">
<state width="902" height="321" key="GridCell.Tab.0.right" timestamp="1602502840524">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="935" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1602426830829" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="902" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602488023264" />
<state width="902" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602502840524" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="82" y="353" key="IDE.errors.dialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594777965326" />
<state x="209" y="320" key="RollbackChangesDialog" timestamp="1601453156433">
<state x="209" y="320" key="RollbackChangesDialog" timestamp="1602489213039">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="209" y="320" key="RollbackChangesDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1601453156433" />
<state x="209" y="320" key="RollbackChangesDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1602489213039" />
<state x="210" y="320" key="RollbackChangesDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594173186663" />
<state x="762" y="247" key="SettingsEditor" timestamp="1602321211804">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="762" y="247" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1602321211804" />
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1602470674551">
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1602489219936">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472144830" />
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877@30.23.1410.877" timestamp="1601389898667" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1602470674551" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1602489219936" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" />
......@@ -708,11 +709,11 @@
</state>
<state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" />
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" />
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup" timestamp="1602488009362">
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup" timestamp="1602502615917">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" />
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602488009362" />
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602502615917" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" />
<state x="249" y="530" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1602310103215">
<screen x="30" y="23" width="1890" height="1177" />
......
output.js
View file @ 485b3e90
......@@ -20889,6 +20889,9 @@ var SuccessStarGroup = (function (_super) {
var time2 = 100;
var max = 3;
var interval = 100;
if (count < 1) {
return;
}
Tween.get(this.leftStarEn)
.wait(wait)
.set({ scaleX: max, scaleY: max })
......@@ -21307,11 +21310,12 @@ var TaskItem = (function (_super) {
});
break;
case TaskType.follow:
Main_1.GDispatcher.removeAllEventListenerByType(TaoBaoNet_1.TbNetName.favorShop);
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.favorShop, {}, function (fs, fr) {
if (!fs)
return;
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.doFollowTask, { taskType: _this.data.taskType }, function (cs, cr) { return Main_1.GDispatcher.dispatchEvent(G_EVENT_1.G_EVENT.UPDATE_TASK); });
});
}, true);
break;
case TaskType.invites:
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.addStats, { type: 'invite' });
......@@ -23839,14 +23843,20 @@ var MusicBtn = (function (_super) {
if (isOn)
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMusic, { isOn: true });
Main_1.GDispatcher.addEventListener(G_EVENT_1.G_EVENT.ON_SHOW, _this.onShow, _this);
Main_1.GDispatcher.addEventListener(G_EVENT_1.G_EVENT.ON_HIDE, _this.onHide, _this);
return _this;
}
MusicBtn.prototype.onShow = function () {
if (isOn)
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMusic, { isOn: true });
};
MusicBtn.prototype.onHide = function () {
if (isOn)
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMusic, { isOn: false });
};
MusicBtn.prototype.destroy = function () {
Main_1.GDispatcher.removeEventListener(G_EVENT_1.G_EVENT.ON_SHOW, this.onShow, this);
Main_1.GDispatcher.removeEventListener(G_EVENT_1.G_EVENT.ON_HIDE, this.onHide, this);
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMusic, { isOn: false });
_super.prototype.destroy.call(this);
};
output.js.map
View file @ 485b3e90
This source diff could not be displayed because it is too large. You can view the blob instead.
src/panels/SuccessNoPrizePanel.ts
View file @ 485b3e90
......@@ -184,6 +184,9 @@ export class SuccessStarGroup extends Container {
const time2 = 100;
const max = 3;
const interval = 100;
if (count < 1) {
return;
}
Tween.get(this.leftStarEn)
.wait(wait)
.set({scaleX: max, scaleY: max})
......
src/panels/TaskPanel.ts
View file @ 485b3e90
......@@ -270,13 +270,14 @@ class TaskItem extends Item {
});
break;
case TaskType.follow:
GDispatcher.removeAllEventListenerByType(TbNetName.favorShop);
sendTbNet(TbNetName.favorShop, {},
(fs, fr) => {
if (!fs) return;
sendTbNet(TbNetName.doFollowTask, {taskType: this.data.taskType},
(cs, cr) => GDispatcher.dispatchEvent(G_EVENT.UPDATE_TASK)
);
}
}, true
);
break;
case TaskType.invites:
......
src/scene/PlayScene.ts
View file @ 485b3e90
......@@ -233,7 +233,7 @@ export class PlayScene extends Scene {
this._score = value;
FYGE.Tween.removeTweens(this.scoreProgress);
FYGE.Tween.get(this.scoreProgress, {}, null, true)
.to({ score: value }, 300)
.to({score: value}, 300)
}
//所有道具容器
......@@ -474,17 +474,17 @@ export class PlayScene extends Scene {
const [row, col] = rc;
//不用考虑0
if (!endRowNumHash[col]) {
endRowNumHash[col] = { row: row, index: i };
endRowNumHash[col] = {row: row, index: i};
}
if (row > endRowNumHash[col].row) {
endRowNumHash[col] = { row: row, index: i };
endRowNumHash[col] = {row: row, index: i};
}
//取大行数
endRowNum = Math.max(rc[0], endRowNum)
}
this.recycleIndexs = [];
for (const key in endRowNumHash) {
const { index, row } = endRowNumHash[key];
const {index, row} = endRowNumHash[key];
if (endRowNum == row) this.recycleIndexs.push(index)
}
}
......@@ -542,7 +542,7 @@ export class PlayScene extends Scene {
//冰块数据 2 3 5 6 或者51 61
const iceData = [2, 3, 5, 6, 51, 61];
if (iceData.indexOf(latticesD[i]) >= 0) {
const iceCount = (function (n) {
const iceCount = (function(n) {
if (n == 2 || n == 3) return n - 1;
if (n == 5 || n == 6) return n - 4;
return parseInt((n + "").split("")[0]) - 4;
......@@ -849,19 +849,19 @@ export class PlayScene extends Scene {
const ay = a.y;
const bx = b.x;
const by = b.y;
FYGE.Tween.get(a, { loop: true })
.to({ x: (bx - ax) / 10 + ax, y: (by - ay) / 10 + ay }, 100)
.to({ x: ax, y: ay }, 100)
FYGE.Tween.get(a, {loop: true})
.to({x: (bx - ax) / 10 + ax, y: (by - ay) / 10 + ay}, 100)
.to({x: ax, y: ay}, 100)
.wait(200)
.to({ x: (bx - ax) / 10 + ax, y: (by - ay) / 10 + ay }, 100)
.to({ x: ax, y: ay }, 100)
.to({x: (bx - ax) / 10 + ax, y: (by - ay) / 10 + ay}, 100)
.to({x: ax, y: ay}, 100)
.wait(400)
FYGE.Tween.get(b, { loop: true })
.to({ x: (ax - bx) / 10 + bx, y: (ay - by) / 10 + by }, 100)
.to({ x: bx, y: by }, 100)
FYGE.Tween.get(b, {loop: true})
.to({x: (ax - bx) / 10 + bx, y: (ay - by) / 10 + by}, 100)
.to({x: bx, y: by}, 100)
.wait(200)
.to({ x: (ax - bx) / 10 + bx, y: (ay - by) / 10 + by }, 100)
.to({ x: bx, y: by }, 100)
.to({x: (ax - bx) / 10 + bx, y: (ay - by) / 10 + by}, 100)
.to({x: bx, y: by}, 100)
.wait(400)
}
......@@ -923,7 +923,7 @@ export class PlayScene extends Scene {
this.choosed.parent.removeChild(this.choosed)
}
let fun: Function;
this.elementContainer.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, fun = function (e) {
this.elementContainer.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, fun = function(e) {
const ele = e.currentTarget.parent.parent;
if (ele instanceof Element &&
// ele.type != ElementType.ROCK &&
......@@ -1116,7 +1116,7 @@ export class PlayScene extends Scene {
private exchangeElementAni(s: Element, o: Element, callback?) {
this.enableMouseEvt(false);
FYGE.Tween.get(s)
.to({ x: o.x, y: o.y }, 166)
.to({x: o.x, y: o.y}, 166)
.call(() => {
if (callback) {
callback.bind(this)(s, o);
......@@ -1125,7 +1125,7 @@ export class PlayScene extends Scene {
}
})
FYGE.Tween.get(o)
.to({ x: s.x, y: s.y }, 166)
.to({x: s.x, y: s.y}, 166)
}
//数据交换
......@@ -1199,16 +1199,16 @@ export class PlayScene extends Scene {
if (lat.down != null) {
latDown = this.lattices[lat.down];
indexDown = lat.down;
connects.push({ index: indexDown, type: FallType.THROUGH })
connects.push({index: indexDown, type: FallType.THROUGH})
} else {
latDown = this.lattices[index + Tool.colNum]
indexDown = index + Tool.colNum;
connects.push({ index: indexDown, type: FallType.STRIGHT })
connects.push({index: indexDown, type: FallType.STRIGHT})
}
//下方有格子，并且再this.empty中
const emptyIndex = this.emptys.indexOf(indexDown);
if (emptyIndex > -1) {
anis.push({ ele: lat.element, indexs: connects });
anis.push({ele: lat.element, indexs: connects});
//去掉一个
this.emptys.splice(emptyIndex, 1);
//加上一个
......@@ -1222,7 +1222,7 @@ export class PlayScene extends Scene {
lat.isGenerate &&
!Tool.judgeFall(this.lattices[index - Tool.colNum])
) {
anis.push({ ele: null, indexs: [{ index: index, type: FallType.STRIGHT }] });
anis.push({ele: null, indexs: [{index: index, type: FallType.STRIGHT}]});
Tool.removeEle(index, this.emptys)
}
}
......@@ -1255,7 +1255,7 @@ export class PlayScene extends Scene {
if (indexs != null) {
//最后一个
const downIndex = indexs[indexs.length - 1].index;
anis.push({ ele: lat.element, indexs: indexs });
anis.push({ele: lat.element, indexs: indexs});
//去掉最后一个
// this.emptys.splice(emptyIndex, 1);
Tool.removeEle(downIndex, this.emptys)
......@@ -1327,7 +1327,7 @@ export class PlayScene extends Scene {
const anis: FallAniData[] = [];
const emptys = this.emptys;
//排序从大到小
emptys.sort(function (a, b) {
emptys.sort(function(a, b) {
return a < b ? 1 : -1
})
for (let i = 0; i < emptys.length; i++) {
......@@ -1385,7 +1385,7 @@ export class PlayScene extends Scene {
//如果latFall存在
if (latFall) {
//能掉落，记录元素动画
anis.push({ ele: latFall.element, indexs: [{ index: indexMy, type: type }] });
anis.push({ele: latFall.element, indexs: [{index: indexMy, type: type}]});
//去掉
// console.log(emptys)
// console.log(indexFall)
......@@ -1404,7 +1404,7 @@ export class PlayScene extends Scene {
//判断是否是生成口
if (lat.isGenerate) {
//是生成口，就不用管落下乐
anis.push({ ele: null, indexs: [{ index: indexMy, type: FallType.STRIGHT }] })
anis.push({ele: null, indexs: [{index: indexMy, type: FallType.STRIGHT}]})
//去掉
emptys.splice(i, 1);
//优先判断生成的，不用管掉落了，跳下一个
......@@ -1454,7 +1454,7 @@ export class PlayScene extends Scene {
mask.y = fp[1];
this.elementContainer.addChild(mask);
ele.mask = mask;
tween.to({ x: fp[0], y: fp[1] }, deltaTime)
tween.to({x: fp[0], y: fp[1]}, deltaTime)
.call(() => {
//移除遮罩
ele.mask = null;
......@@ -1462,7 +1462,7 @@ export class PlayScene extends Scene {
mask.recover()
})
} else {
tween.to({ x: fp[0], y: fp[1] }, deltaTime)
tween.to({x: fp[0], y: fp[1]}, deltaTime)
}
wait += deltaTime
} else {
......@@ -1485,11 +1485,11 @@ export class PlayScene extends Scene {
//如果上格子下面有格子, 用遮罩的写法，
if (this.lattices[indexUp + Tool.colNum]) {
EleMaskAni(ele, upPos, wait, this.elementContainer, true, deltaTime);
tween.set({ alpha: 0 })
tween.set({alpha: 0})
.wait(deltaTime)
.set({ alpha: 1 })
.set({alpha: 1})
} else {
tween.to({ x: upPos[0], y: upPos[1] + Tool.height }, deltaTime);
tween.to({x: upPos[0], y: upPos[1] + Tool.height}, deltaTime);
}
//down处的动画
//如果下格子上方有格子，用遮罩的写法
......@@ -1512,9 +1512,9 @@ export class PlayScene extends Scene {
oriRow = Tool.indexToRc(index)[0];
//动画
if (lastX != null) {
tween.set({ x: lastX, y: lastY })
tween.set({x: lastX, y: lastY})
}
tween.to({ x: p[0], y: p[1] }, delta * deltaTime)
tween.to({x: p[0], y: p[1]}, delta * deltaTime)
//累计等待时间
wait += delta * deltaTime;
lastX = null
......@@ -2158,7 +2158,7 @@ export class PlayScene extends Scene {
if (!ele) {
//以防万一还是判断一次
}
//下面带状态的要优先判断
//下面带状态的要优先判断
//有枷锁的
else if (ele.hasState(StateType.LOCK)) {
//被禁锢的解开
......@@ -2547,7 +2547,7 @@ export class PlayScene extends Scene {
const lat = this.lattices[index];
lat.element = ele;
FYGE.Tween.get(ele)
.to({ x: p[0], y: p[1] }, 500)
.to({x: p[0], y: p[1]}, 500)
.call(() => {
if (++count == countAll) {
//交换结束后,判断是否有三消
......@@ -2620,6 +2620,7 @@ export class PlayScene extends Scene {
level: this.data.chapter,
score: this.score,
stars: this.scoreProgress.starCount,
// stars: 0,
isVisitSuccess: suc,
};
showWaiting();
......@@ -2634,10 +2635,11 @@ export class PlayScene extends Scene {
prizeLevel = 120;
}
sendTbNet(TbNetName.drawLotteryPrize, {
prizeDataType: prizeLevel,
level: this.data.chapter,
stars: this.scoreProgress.starCount,
},
prizeDataType: prizeLevel,
level: this.data.chapter,
stars: this.scoreProgress.starCount,
// stars: 0,
},
(ds, dr) => {
if (!ds || !dr.data || dr.data.type == 5) {
//@ts-ignore
......@@ -2686,7 +2688,7 @@ export class PlayScene extends Scene {
*/
openRedBombPanel(callback: Function = null) {
if (this.redBombPanelMark) {
showPanel(FesRedPrizePanel, { callback: callback });
showPanel(FesRedPrizePanel, {callback: callback});
this.redBombPanelMark = false;
return true;
}
......@@ -2765,7 +2767,7 @@ export class PlayScene extends Scene {
this.passElements[type]--;
// console.log(this.elementTargets.targets[type])
//@ts-ignore
const p = this.elementTargets.targets[type].localToGlobal({ x: 40 * 0.8, y: 40 * 0.8 });
const p = this.elementTargets.targets[type].localToGlobal({x: 40 * 0.8, y: 40 * 0.8});
this.addChild(FlyTargetAni(type, fromP, [p.x, p.y - layers.stageOffsetY], () => {
this.elementTargets.targets[type].count--;
}))
......@@ -2880,7 +2882,7 @@ export class PlayScene extends Scene {
this.addChild(eleC);
/// TODO 小红包消失动画
Tween.get(eleC)
.to({ scaleX: 0, scaleY: 0 }, 270, Ease.backIn)
.to({scaleX: 0, scaleY: 0}, 270, Ease.backIn)
.call(() => {
this.removeChild(eleC);
this.festivalTarget.count--;
......@@ -2889,9 +2891,9 @@ export class PlayScene extends Scene {
//完成了，发接口，到时需要修改，对于接口没成功的不设置
if (this.festivalTargetNum <= 0) {
sendTbNet(TbNetName.drawLotteryPrize, {
level: this.chapter,
prizeDataType: 1
},
level: this.chapter,
prizeDataType: 1
},
(success, res) => {
if (success && res.data) this.redBombPanelMark = true;
}
......@@ -2976,22 +2978,28 @@ class MusicBtn extends FYGE.Sprite {
isOn = !isOn;
this.texture = RES.getRes(isOn ? "musicOn.png" : "musicOff.png");
//播放或暂停音乐接口
sendTbNet(TbNetName.openMusic, { isOn: isOn })
sendTbNet(TbNetName.openMusic, {isOn: isOn})
}, this);
//默认开启
// this.isOn = true;
if (isOn) sendTbNet(TbNetName.openMusic, { isOn: true })
if (isOn) sendTbNet(TbNetName.openMusic, {isOn: true})
//添加onSHow事件
GDispatcher.addEventListener(G_EVENT.ON_SHOW, this.onShow, this)
GDispatcher.addEventListener(G_EVENT.ON_HIDE, this.onHide, this)
}
onShow() {
if (isOn) sendTbNet(TbNetName.openMusic, { isOn: true })
if (isOn) sendTbNet(TbNetName.openMusic, {isOn: true})
}
onHide() {
if (isOn) sendTbNet(TbNetName.openMusic, {isOn: false})
}
destroy() {
GDispatcher.removeEventListener(G_EVENT.ON_SHOW, this.onShow, this)
sendTbNet(TbNetName.openMusic, { isOn: false })
GDispatcher.removeEventListener(G_EVENT.ON_HIDE, this.onHide, this)
sendTbNet(TbNetName.openMusic, {isOn: false})
super.destroy()
}
......
src/scene/map/MapScene.ts
View file @ 485b3e90
......@@ -230,7 +230,7 @@ export class MapScene extends Scene {
// Tools.gameOver({
// level: 1,
// score: 666,
// stars: 2,
// stars: 0,
// isVisitSuccess: true,
// isPrizeLevel: false,
// // tool: {
......
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