Commit 3c14ab1a authored by Nguyễn Quang Sáng's avatar Nguyễn Quang Sáng

05/09/2023 commit

parent 5d80f2eb
...@@ -2123,7 +2123,7 @@ ...@@ -2123,7 +2123,7 @@
"__id__": 49 "__id__": 49
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 3,
"_density": 1, "_density": 1,
"_sensor": true, "_sensor": true,
"_friction": 0.2, "_friction": 0.2,
......
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
"__id__": 34 "__id__": 34
}, },
{ {
"__id__": 49 "__id__": 48
}, },
{ {
"__id__": 58 "__id__": 57
}, },
{ {
"__id__": 43 "__id__": 43
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
} }
], ],
"_prefab": { "_prefab": {
"__id__": 48 "__id__": 66
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -204,6 +204,12 @@ ...@@ -204,6 +204,12 @@
}, },
{ {
"__id__": 43 "__id__": 43
},
{
"__id__": 48
},
{
"__id__": 57
} }
], ],
"_id": "" "_id": ""
...@@ -1790,17 +1796,6 @@ ...@@ -1790,17 +1796,6 @@
"fileId": "e17tQsz1hAlamNVdnHce35", "fileId": "e17tQsz1hAlamNVdnHce35",
"sync": false "sync": false
}, },
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "5dIbugedtGkbbo5t9KBiGM",
"sync": false
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Brick copy", "_name": "Brick copy",
...@@ -1810,20 +1805,20 @@ ...@@ -1810,20 +1805,20 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 50 "__id__": 49
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 55 "__id__": 54
}, },
{ {
"__id__": 56 "__id__": 55
} }
], ],
"_prefab": { "_prefab": {
"__id__": 57 "__id__": 56
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -1877,23 +1872,23 @@ ...@@ -1877,23 +1872,23 @@
"_name": "Grass", "_name": "Grass",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 49 "__id__": 48
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 51 "__id__": 50
}, },
{ {
"__id__": 52 "__id__": 51
}, },
{ {
"__id__": 53 "__id__": 52
} }
], ],
"_prefab": { "_prefab": {
"__id__": 54 "__id__": 53
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -1947,7 +1942,7 @@ ...@@ -1947,7 +1942,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 50 "__id__": 49
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1979,7 +1974,7 @@ ...@@ -1979,7 +1974,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 50 "__id__": 49
}, },
"_enabled": true, "_enabled": true,
"_type": 0, "_type": 0,
...@@ -2004,7 +1999,7 @@ ...@@ -2004,7 +1999,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 50 "__id__": 49
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -2028,7 +2023,7 @@ ...@@ -2028,7 +2023,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 49 "__id__": 48
}, },
"asset": { "asset": {
"__uuid__": "3ef9ce8f-791c-430c-b1f8-ec3703b0ae18" "__uuid__": "3ef9ce8f-791c-430c-b1f8-ec3703b0ae18"
...@@ -2041,7 +2036,7 @@ ...@@ -2041,7 +2036,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 49 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2073,7 +2068,7 @@ ...@@ -2073,7 +2068,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 49 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"_type": 0, "_type": 0,
...@@ -2096,7 +2091,7 @@ ...@@ -2096,7 +2091,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 49 "__id__": 48
}, },
"asset": { "asset": {
"__uuid__": "3ef9ce8f-791c-430c-b1f8-ec3703b0ae18" "__uuid__": "3ef9ce8f-791c-430c-b1f8-ec3703b0ae18"
...@@ -2113,20 +2108,20 @@ ...@@ -2113,20 +2108,20 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 59 "__id__": 58
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 64 "__id__": 63
}, },
{ {
"__id__": 65 "__id__": 64
} }
], ],
"_prefab": { "_prefab": {
"__id__": 66 "__id__": 65
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2180,23 +2175,23 @@ ...@@ -2180,23 +2175,23 @@
"_name": "Grass", "_name": "Grass",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 58 "__id__": 57
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 60 "__id__": 59
}, },
{ {
"__id__": 61 "__id__": 60
}, },
{ {
"__id__": 62 "__id__": 61
} }
], ],
"_prefab": { "_prefab": {
"__id__": 63 "__id__": 62
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2250,7 +2245,7 @@ ...@@ -2250,7 +2245,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 59 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2282,7 +2277,7 @@ ...@@ -2282,7 +2277,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 59 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_type": 0, "_type": 0,
...@@ -2307,7 +2302,7 @@ ...@@ -2307,7 +2302,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 59 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -2331,7 +2326,7 @@ ...@@ -2331,7 +2326,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 58 "__id__": 57
}, },
"asset": { "asset": {
"__uuid__": "3ef9ce8f-791c-430c-b1f8-ec3703b0ae18" "__uuid__": "3ef9ce8f-791c-430c-b1f8-ec3703b0ae18"
...@@ -2344,7 +2339,7 @@ ...@@ -2344,7 +2339,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 58 "__id__": 57
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2376,7 +2371,7 @@ ...@@ -2376,7 +2371,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 58 "__id__": 57
}, },
"_enabled": true, "_enabled": true,
"_type": 0, "_type": 0,
...@@ -2399,7 +2394,7 @@ ...@@ -2399,7 +2394,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 58 "__id__": 57
}, },
"asset": { "asset": {
"__uuid__": "3ef9ce8f-791c-430c-b1f8-ec3703b0ae18" "__uuid__": "3ef9ce8f-791c-430c-b1f8-ec3703b0ae18"
...@@ -2407,6 +2402,17 @@ ...@@ -2407,6 +2402,17 @@
"fileId": "99hYnjVCNLjZqo5Iy4bAKE", "fileId": "99hYnjVCNLjZqo5Iy4bAKE",
"sync": false "sync": false
}, },
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "5dIbugedtGkbbo5t9KBiGM",
"sync": false
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Spike copy", "_name": "Spike copy",
......
...@@ -129,6 +129,17 @@ export default class GamePlay extends cc.Component { ...@@ -129,6 +129,17 @@ export default class GamePlay extends cc.Component {
}, 2); }, 2);
this.currentCoin = LocalStorage.getAllCoin(); this.currentCoin = LocalStorage.getAllCoin();
this.coinLabel.getComponent(cc.Label).string = `x${this.currentCoin}`; this.coinLabel.getComponent(cc.Label).string = `x${this.currentCoin}`;
SoundController.playNoLoopSound(SoundController.instance.sounds[4]);
SoundController.playNoLoopSound(SoundController.instance.sounds[5]);
LocalStorage.setCurrentLevel((this.currentLevel += 1));
this.currentLevel = LocalStorage.getCurrentLevel();
if (this.currentLevel > 29) return cc.director.loadScene("start");
this.drew = false;
GlobalVariables.levelToLoad = this.currentLevel;
this.scheduleOnce(() => {
cc.director.loadScene("gameplay");
}, 1);
} }
if (status == "cancel") { if (status == "cancel") {
......
import { GlobalVariables } from "../Data/GlobalVariables"; import { GlobalVariables } from "../Data/GlobalVariables";
import LocalStorage from "../Data/LocalStorage"; import LocalStorage from "../Data/LocalStorage";
import StartScene from "./StartScene";
const { ccclass, property } = cc._decorator; const { ccclass, property } = cc._decorator;
......
import { GlobalVariables } from "../Data/GlobalVariables";
import LocalStorage from "../Data/LocalStorage"; import LocalStorage from "../Data/LocalStorage";
import Hive from "../Objects/Hive"; import Hive from "../Objects/Hive";
......
...@@ -99,7 +99,7 @@ export function showInterstitialAd(type: InterstitialType, name: string) { ...@@ -99,7 +99,7 @@ export function showInterstitialAd(type: InterstitialType, name: string) {
placementInfo.breakName == "earn15Coin" && placementInfo.breakName == "earn15Coin" &&
placementInfo.breakStatus == "frequencyCapped" placementInfo.breakStatus == "frequencyCapped"
) { ) {
SkinController.instance.onShowNotiAds("frequencyLimit"); SkinController.instance.onShowNotiAds("frequencyCapped");
} }
if ( if (
...@@ -127,7 +127,7 @@ export function showInterstitialAd(type: InterstitialType, name: string) { ...@@ -127,7 +127,7 @@ export function showInterstitialAd(type: InterstitialType, name: string) {
placementInfo.breakName == "doubleCoin" && placementInfo.breakName == "doubleCoin" &&
placementInfo.breakStatus == "frequencyCapped" placementInfo.breakStatus == "frequencyCapped"
) { ) {
GamePlay.instance.onShowNotiAds("frequencyLimit"); GamePlay.instance.onShowNotiAds("frequencyCapped");
} }
}, },
}); });
......
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