yangzhao/cb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb

Browse Source 
# Conflicts:
#	assets/Scene/GameScene.fire
This commit is contained in:
computer\尼卡 2025-07-22 19:00:41 +08:00
parent 907a7cca5b 26d44a5168
commit 20ba317248
5 changed files with 11195 additions and 5386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11516
assets/Scene/GameScene.fire
View File

File diff suppressed because it is too large Load Diff

1
assets/Script/Map.ts
View File

@ -2131,6 +2131,7 @@ export default class MapConroler extends cc.Component {
if (winCOIN) { if (winCOIN) {
const wincoin = winCOIN.getComponent(SceneManager); const wincoin = winCOIN.getComponent(SceneManager);
if (wincoin) { if (wincoin) {
this.pause = true;
wincoin.openShop(); wincoin.openShop();
} else { } else {
console.log("JiaZai 组件未找到"); console.log("JiaZai 组件未找到");

1
assets/Script/SceneManager.ts
View File

@ -283,6 +283,7 @@ export default class SceneManager extends cc.Component {
closeShop() { closeShop() {
if (this.shopNode) { if (this.shopNode) {
this.shopNode.active = false; this.shopNode.active = false;
MapConroler._instance.pause = false;
} }
} }

5054
assets/prefab/Pause.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

9
assets/prefab/Pause.prefab.meta Normal file
View File

@ -0,0 +1,9 @@
{
"ver": "1.3.2",
"uuid": "d1366935-fbfb-42fb-8846-8545724468f6",
"importer": "prefab",
"optimizationPolicy": "AUTO",
"asyncLoadAssets": false,
"readonly": false,
"subMetas": {}
}