Browse Source

upgradeUI

181404010226 4 months ago
parent
commit
8e90dc6789

+ 4 - 4
assets/Scenes/GameLevel.scene

@@ -19067,10 +19067,10 @@
         "__id__": 452
       },
       {
-        "__id__": 464
+        "__id__": 476
       },
       {
-        "__id__": 476
+        "__id__": 464
       },
       {
         "__id__": 488
@@ -19080,7 +19080,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "ShopUI",
+    "_name": "UpgradeUI",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -27583,7 +27583,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "UpgradeUI",
+    "_name": "ShopUI",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {

+ 1 - 1
assets/scripts/Core/EventBus.ts

@@ -33,7 +33,7 @@ export enum GameEvents {
     CLEAR_ALL_GAME_OBJECTS = 'CLEAR_ALL_GAME_OBJECTS',
     
     // UI事件
-    SHOP_UPDATED = 'SHOP_UPDATED',
+    UPGRADE_UPDATED = 'UPGRADE_UPDATED',
     RETURN_TO_MAIN_MENU = 'RETURN_TO_MAIN_MENU',
     
     // UI状态切换事件(根据游戏管理文档)

+ 2 - 2
assets/scripts/FourUI/NavBarController.ts

@@ -14,8 +14,8 @@ export class NavBarController extends Component {
     }
 
     onBattleClick ()  { this.switchTo(0); }
-    onShopClick ()    { this.switchTo(1); }
-    onUpgradeClick () { this.switchTo(2); }
+    onUpgradeClick () { this.switchTo(1); }
+    onShopClick ()    { this.switchTo(2); }
     onSkillClick ()   { 
         this.switchTo(3);
         // 注意:滚动功能现在由SkillNodeGenerator组件通过装饰器直接处理

+ 7 - 8
assets/scripts/LevelSystem/GameManager.ts

@@ -20,13 +20,12 @@ const { ccclass, property } = _decorator;
  * 区分游戏外状态和游戏内状态
  */
 export enum AppState {
-    // 游戏外状态 - 主界面相关
+    // 应用状态枚举
     MAIN_MENU = 'main_menu',           // 主界面
-    SHOP = 'shop',                     // 商店
+    UPGRADE = 'upgrade',               // 升级界面
     SKILLS = 'skills',                 // 技能界面
     SETTINGS = 'settings',             // 设置界面
-    
-    // 游戏内状态 - 战斗相关
+    // 游戏状态
     IN_GAME = 'in_game'                // 游戏进行中(包含所有游戏内子状态)
 }
 
@@ -375,7 +374,7 @@ export class GameManager extends Component {
     // === 管理器初始化 ===
     private initializeManagers() {
         this.levelManager = LevelManager.getInstance();
-        // this.shopManager = ShopManager.getInstance();
+        // this.upgradeManager = UpgradeManager.getInstance();
         this.configManager = ConfigManager.getInstance();
         this.levelConfigManager = LevelConfigManager.getInstance();
         // enemyController已通过事件系统解耦,不再需要直接初始化
@@ -614,9 +613,9 @@ export class GameManager extends Component {
     
 
     
-    private onShopClick() {
-        console.log('[GameManager] 商店按钮被点击');
-        // TODO: 实现商店逻辑
+    private onUpgradeClick() {
+        console.log('[GameManager] 升级按钮被点击');
+        // TODO: 实现升级逻辑
     }
     
     private onReviveClick() {

+ 9 - 0
assets/scripts/Test.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "bdd05762-1653-4d7c-bfb7-97a4b0e48eac",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 9 - 0
assets/scripts/UI.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "9d49cc65-7c02-40e4-a8da-5577f2a741ae",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}