Compare commits

..

No commits in common. "4d5be00483ba47bafeb0e0d1a26e186d60ddd10b" and "1961bc6ecd0cea2e1d36b0854ae42981f30365f3" have entirely different histories.

6 changed files with 31 additions and 44 deletions

View File

@ -806,7 +806,6 @@ export default class GameManager extends cc.Component {
} }
} }
setmonth(data) { setmonth(data) {
console.log("得到的月卡信息:", data.data.monthCardTime);
//如果给的时间戳大于当前时间hpmax=7,否则等于5 //如果给的时间戳大于当前时间hpmax=7,否则等于5
let nowTime = Math.floor(Date.now() / 1000); let nowTime = Math.floor(Date.now() / 1000);
if (data.data.monthCardTime > nowTime) { if (data.data.monthCardTime > nowTime) {

View File

@ -1696,9 +1696,6 @@ export default class MapConroler extends cc.Component {
cc.fx.AudioManager._instance.playEffect("anniu_Big", null); cc.fx.AudioManager._instance.playEffect("anniu_Big", null);
if (cc.fx.GameConfig.GM_INFO.hp < 1) { if (cc.fx.GameConfig.GM_INFO.hp < 1) {
MiniGameSdk.API.showToast("体力值不足"); MiniGameSdk.API.showToast("体力值不足");
setTimeout(() => {
this.openShop();
}, 500);
return; return;
} }
if (!this.againCanTouch) return; if (!this.againCanTouch) return;
@ -2784,7 +2781,7 @@ export default class MapConroler extends cc.Component {
// } // }
} }
else if (nomalArray.length == 1) { else if (nomalArray.length == 1) {
this.eliMinNUM = true; this.eliMinNUM = true;
nomalArray[0].getComponent("Block").eliminate(1); nomalArray[0].getComponent("Block").eliminate(1);
let time = 0; let time = 0;
if (nomalArray[0].getComponent("Block").type == 1 || nomalArray[0].getComponent("Block").type == 9) { if (nomalArray[0].getComponent("Block").type == 1 || nomalArray[0].getComponent("Block").type == 9) {
@ -2809,7 +2806,7 @@ export default class MapConroler extends cc.Component {
}, 200 + time); }, 200 + time);
} }
else { else {
this.eliMinNUM = true; this.eliMinNUM = true;
let count = 2; let count = 2;
if (this.loackArray.length != 0) { if (this.loackArray.length != 0) {
for (let i = 0; i < this.loackArray.length; i++) { for (let i = 0; i < this.loackArray.length; i++) {

View File

@ -72,7 +72,6 @@ export default class SceneManager extends cc.Component {
load3: boolean = false; load3: boolean = false;
btnName: string = ''; btnName: string = '';
callBack: any; callBack: any;
share_time: boolean = true;
// LIFE-CYCLE CALLBACKS: // LIFE-CYCLE CALLBACKS:
@ -201,7 +200,7 @@ export default class SceneManager extends cc.Component {
} }
start() { start() {
this.share_time = true;
} }
startGame() { startGame() {
@ -377,7 +376,6 @@ export default class SceneManager extends cc.Component {
//打开商店 //打开商店
openShop() { openShop() {
console.log("进入sceneManager openShop");
if (!SceneManager.cachedShopPrefab) { if (!SceneManager.cachedShopPrefab) {
cc.error('Shop prefab is not loaded yet.'); cc.error('Shop prefab is not loaded yet.');
return; return;
@ -462,21 +460,14 @@ export default class SceneManager extends cc.Component {
} }
shareFriend() { shareFriend() {
if (this.share_time) { console.log("设置分享链接");
this.share_time = false; let timeStamp = Date.now();
console.log("设置分享链接"); let otherInfo = {
let timeStamp = Date.now(); timeStamp: timeStamp,
let otherInfo = { otherLevel: (cc.fx.GameConfig.GM_INFO.level + 1),
timeStamp: timeStamp,
otherLevel: (cc.fx.GameConfig.GM_INFO.level + 1),
}
cc.fx.StorageMessage.setStorage("otherLevel", otherInfo);
MiniGameSdk.API.shareGame();
setTimeout(() => {
this.share_time = true;
}, 5000);
} }
cc.fx.StorageMessage.setStorage("otherLevel", otherInfo);
MiniGameSdk.API.shareGame();
} }
update(dt) { update(dt) {

View File

@ -222,7 +222,7 @@ export default class Utils {
// 延迟 0.5 秒执行后续逻辑 // 延迟 0.5 秒执行后续逻辑
setTimeout(() => { setTimeout(() => {
// 最大重试次数 // 最大重试次数
const maxRetries = 5; const maxRetries = 3;
let retryCount = 0; let retryCount = 0;
// 标志位,用于记录 callBack 是否已经被调用 // 标志位,用于记录 callBack 是否已经被调用
let isCallBackCalled = false; let isCallBackCalled = false;

View File

@ -163,12 +163,12 @@ export default class setUi extends cc.Component {
this.exit.getChildByName("Health").getChildByName("queding").active = true; this.exit.getChildByName("Health").getChildByName("queding").active = true;
} }
else { else {
// if (customEventData == "hp") { if (customEventData == "hp") {
// if (cc.fx.GameConfig.GM_INFO.hp <= 0) { if (cc.fx.GameConfig.GM_INFO.hp <= 0) {
// MiniGameSdk.API.showToast("体力值不足"); MiniGameSdk.API.showToast("体力值不足");
// return; return;
// } }
// } }
MapConroler._instance.againLevel(); MapConroler._instance.againLevel();
} }
} }

View File

@ -2108,7 +2108,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-2.798, -2.798,
-2158.941, -638.472,
0, 0,
0, 0,
0, 0,
@ -2345,7 +2345,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-339.058, -339.058,
-2485.25, -964.781,
0, 0,
0, 0,
0, 0,
@ -2929,7 +2929,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
12.942, 12.942,
-2485.25, -964.781,
0, 0,
0, 0,
0, 0,
@ -3513,7 +3513,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
364.942, 364.942,
-2485.25, -964.781,
0, 0,
0, 0,
0, 0,
@ -4097,7 +4097,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-339.058, -339.058,
-2979.25, -1458.781,
0, 0,
0, 0,
0, 0,
@ -4681,7 +4681,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
12.942, 12.942,
-2979.25, -1458.781,
0, 0,
0, 0,
0, 0,
@ -5265,7 +5265,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
364.942, 364.942,
-2979.25, -1458.781,
0, 0,
0, 0,
0, 0,
@ -5834,7 +5834,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0.491, 0.491,
-599.734, -1775.766,
0, 0,
0, 0,
0, 0,
@ -6056,7 +6056,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-905.205, -2085.237,
0, 0,
0, 0,
0, 0,
@ -6501,7 +6501,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-2.3, -2.3,
-1389.652, -2554.684,
0, 0,
0, 0,
0, 0,
@ -7058,7 +7058,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-1.476, -1.476,
-1861.857, -3026.889,
0, 0,
0, 0,
0, 0,
@ -7571,7 +7571,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
1128.049, -36.983,
0, 0,
0, 0,
0, 0,