Skip to content

G
games
Commit 4ca96863 authored by 熊东起's avatar 熊东起
Browse files
Options

first

parent a7424019
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 47 deletions
output.js
View file @ 4ca96863
...@@ -7036,7 +7036,7 @@ exports.ResJson = { ...@@ -7036,7 +7036,7 @@ exports.ResJson = {
} }
} }
], ],
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1601200393/resource/" "path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1603181578/resource/"
}; };
...@@ -8733,7 +8733,7 @@ var DxqPlayScene = (function (_super) { ...@@ -8733,7 +8733,7 @@ var DxqPlayScene = (function (_super) {
parseInt(this.__score / MConst_1.MConst.disScore + "") > 0 && parseInt(this.__score / MConst_1.MConst.disScore + "") > 0 &&
parseInt(this.__score / MConst_1.MConst.disScore + "") > this.count) { parseInt(this.__score / MConst_1.MConst.disScore + "") > this.count) {
var seq = parseInt(this.__score / MConst_1.MConst.disScore + ""); var seq = parseInt(this.__score / MConst_1.MConst.disScore + "");
this.count += seq; this.count++;
this.onSubmitFirst(seq); this.onSubmitFirst(seq);
} }
}, },
...@@ -8745,7 +8745,7 @@ var DxqPlayScene = (function (_super) { ...@@ -8745,7 +8745,7 @@ var DxqPlayScene = (function (_super) {
var result; var result;
return __generator(this, function (_a) { return __generator(this, function (_a) {
switch (_a.label) { switch (_a.label) {
case 0: return [4, submitFirstGame_1.default(this.score, seq)]; case 0: return [4, submitFirstGame_1.default(MConst_1.MConst.disScore, seq)];
case 1: case 1:
result = _a.sent(); result = _a.sent();
if (!result.success) { if (!result.success) {
...@@ -8857,16 +8857,23 @@ var DxqPlayScene = (function (_super) { ...@@ -8857,16 +8857,23 @@ var DxqPlayScene = (function (_super) {
}; };
DxqPlayScene.prototype.over = function () { DxqPlayScene.prototype.over = function () {
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
var result; var result1, result;
var _this = this; var _this = this;
return __generator(this, function (_a) { return __generator(this, function (_a) {
switch (_a.label) { switch (_a.label) {
case 0: case 0:
console.log("游戏结束");
this.timer == 0; this.timer == 0;
this.gamePause(); this.gamePause();
this._car.carMc.stop(); this._car.carMc.stop();
return [4, submitGame_1.default(this.score)]; return [4, submitFirstGame_1.default(this.score - this.count * MConst_1.MConst.disScore, this.count + 1)];
case 1: case 1:
result1 = _a.sent();
if (!!result1.success) return [3, 2];
this.gameDead();
return [3, 4];
case 2: return [4, submitGame_1.default(this.score)];
case 3:
result = _a.sent(); result = _a.sent();
if (result.success) { if (result.success) {
console.log("弹出弹窗", result); console.log("弹出弹窗", result);
...@@ -8899,7 +8906,8 @@ var DxqPlayScene = (function (_super) { ...@@ -8899,7 +8906,8 @@ var DxqPlayScene = (function (_super) {
}, 3000); }, 3000);
} }
} }
return [2]; _a.label = 4;
case 4: return [2];
} }
}); });
}); });
...@@ -10243,13 +10251,13 @@ var GameAwardPanel = (function (_super) { ...@@ -10243,13 +10251,13 @@ var GameAwardPanel = (function (_super) {
bg.addChild(desc); bg.addChild(desc);
desc.y = 515; desc.y = 515;
var awardImg = new FYGE.Sprite(); var awardImg = new FYGE.Sprite();
awardImg.width = 401; awardImg.width = 180;
awardImg.height = 164; awardImg.height = 180;
awardImg.texture = FYGE.Texture.fromUrl(raw.prize.icon + ("?" + Date.now())); awardImg.texture = FYGE.Texture.fromUrl(raw.prize.icon + ("?" + Date.now()));
awardImg.texture.baseTexture.once("update", function () { awardImg.texture.baseTexture.once("update", function () {
awardImg.x = awardImg.x =
bg.width / 2 - awardImg.texture.baseTexture.source.width / 2 - 11; bg.width / 2 - 90;
awardImg.y = 560; awardImg.y = 550;
}, this); }, this);
bg.addChild(awardImg); bg.addChild(awardImg);
this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png")); this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png"));
......
output.js.map
View file @ 4ca96863
This diff is collapsed.
src/ResJson.ts
View file @ 4ca96863
...@@ -994,5 +994,5 @@ export const ResJson = { ...@@ -994,5 +994,5 @@ export const ResJson = {
} }
} }
], ],
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1601200393/resource/" "path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1603181578/resource/"
} }
\ No newline at end of file
src/game/DxqPlayScene.ts
View file @ 4ca96863
...@@ -285,13 +285,13 @@ export default class DxqPlayScene extends FYGE.Container { ...@@ -285,13 +285,13 @@ export default class DxqPlayScene extends FYGE.Container {
parseInt(this.__score / MConst.disScore + "") > this.count parseInt(this.__score / MConst.disScore + "") > this.count
) { ) {
let seq = parseInt(this.__score / MConst.disScore + ""); let seq = parseInt(this.__score / MConst.disScore + "");
this.count += seq; this.count++;
this.onSubmitFirst(seq); this.onSubmitFirst(seq);
} }
} }
private async onSubmitFirst(seq) { private async onSubmitFirst(seq) {
const result = await submitFirstGame(this.score, seq); const result = await submitFirstGame(MConst.disScore, seq);
if (!result.success) { if (!result.success) {
this.gameDead(); this.gameDead();
} }
...@@ -439,41 +439,50 @@ export default class DxqPlayScene extends FYGE.Container { ...@@ -439,41 +439,50 @@ export default class DxqPlayScene extends FYGE.Container {
} }
private async over() { private async over() {
console.log("游戏结束");
this.timer == 0; this.timer == 0;
this.gamePause(); this.gamePause();
this._car.carMc.stop(); this._car.carMc.stop();
const result = await submitGame(this.score); //先中途提交
if (result.success) { const result1 = await submitFirstGame(
console.log("弹出弹窗", result); this.score - this.count * MConst.disScore,
//弹出弹窗 -- 游戏结束 this.count + 1
if (result.data.raw.prize && result.data.raw.prize != {}) { );
showPanel(GameAwardPanel, result.data); if (!result1.success) {
GDispatcher.dispatchEvent({ type: "showBuried" }, { type: 2 }); this.gameDead();
} else {
showToast(result.data.errorMessage);
setTimeout(() => {
this.gameDead();
}, 3000);
}
} else { } else {
//弹出弹窗 -- 游戏结束 const result = await submitGame(this.score);
if (result.code == "500723") { if (result.success) {
showPanel(GameOverPanel, {finalScore: this.score,type: "500723"}); console.log("弹出弹窗", result);
} //弹出弹窗 -- 游戏结束
else if (result.code == "500724") { if (result.data.raw.prize && result.data.raw.prize != {}) {
showPanel(GameOverPanel, {finalScore: this.score,type: "500724"}); showPanel(GameAwardPanel, result.data);
} GDispatcher.dispatchEvent({ type: "showBuried" }, { type: 2 });
//再来一局 } else {
else if (result.code == "500722") { showToast(result.data.errorMessage);
// showPanel(GameAgainPanel, result.data); setTimeout(() => {
showPanel(GameAgainPanel, {finalScore: this.score}); this.gameDead();
GDispatcher.dispatchEvent({ type: "showBuried" }, { type: 1 }); }, 3000);
}
} else { } else {
showToast(result.message); //弹出弹窗 -- 游戏结束
setTimeout(() => { if (result.code == "500723") {
this.gameDead(); showPanel(GameOverPanel, { finalScore: this.score, type: "500723" });
}, 3000); } else if (result.code == "500724") {
showPanel(GameOverPanel, { finalScore: this.score, type: "500724" });
}
//再来一局
else if (result.code == "500722") {
// showPanel(GameAgainPanel, result.data);
showPanel(GameAgainPanel, { finalScore: this.score });
GDispatcher.dispatchEvent({ type: "showBuried" }, { type: 1 });
} else {
showToast(result.message);
setTimeout(() => {
this.gameDead();
}, 3000);
}
} }
} }
} }
......
src/panels/GameAwardPanel.ts
View file @ 4ca96863
...@@ -18,6 +18,12 @@ export class GameAwardPanel extends Panel { ...@@ -18,6 +18,12 @@ export class GameAwardPanel extends Panel {
centerImage(bg); centerImage(bg);
const { raw } = this.data as any; const { raw } = this.data as any;
// let raw = {
// finalScore: 99,
// prize: {
// name: "88",
// }
// }
//本局分数 //本局分数
var textures = {}; var textures = {};
...@@ -55,15 +61,16 @@ export class GameAwardPanel extends Panel { ...@@ -55,15 +61,16 @@ export class GameAwardPanel extends Panel {
//奖品图片 //奖品图片
const awardImg = new FYGE.Sprite(); const awardImg = new FYGE.Sprite();
awardImg.width = 401; awardImg.width = 180;
awardImg.height = 164; awardImg.height = 180;
// awardImg.texture = FYGE.Texture.fromUrl("//yun.duiba.com.cn/spark/assets/def91b02829adc3d995d8a0416924152bf2bf49f.png");
awardImg.texture = FYGE.Texture.fromUrl(raw.prize.icon + `?${Date.now()}`); awardImg.texture = FYGE.Texture.fromUrl(raw.prize.icon + `?${Date.now()}`);
awardImg.texture.baseTexture.once( awardImg.texture.baseTexture.once(
"update", "update",
() => { () => {
awardImg.x = awardImg.x =
bg.width / 2 - awardImg.texture.baseTexture.source.width / 2 - 11; bg.width / 2-90;
awardImg.y = 560; awardImg.y = 550;
}, },
this this
); );
......
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