Bläddra i källkod

【修改】 修改预制体路径

Hua 1 år sedan
förälder
incheckning
d000588e72
63 ändrade filer med 118 tillägg och 1 borttagningar
  1. 7 0
      assets/resources/edt_prefab.meta
  2. 0 0
      assets/resources/edt_prefab/Bag.meta
  3. 0 0
      assets/resources/edt_prefab/Bag/BagMain.prefab
  4. 0 0
      assets/resources/edt_prefab/Bag/BagMain.prefab.meta
  5. 0 0
      assets/resources/edt_prefab/Battle.meta
  6. 0 0
      assets/resources/edt_prefab/Battle/BattleJoinRoomTip.prefab
  7. 0 0
      assets/resources/edt_prefab/Battle/BattleJoinRoomTip.prefab.meta
  8. 0 0
      assets/resources/edt_prefab/Battle/BattleMain.prefab
  9. 0 0
      assets/resources/edt_prefab/Battle/BattleMain.prefab.meta
  10. 0 0
      assets/resources/edt_prefab/Battle/BattleRoom.prefab
  11. 0 0
      assets/resources/edt_prefab/Battle/BattleRoom.prefab.meta
  12. 0 0
      assets/resources/edt_prefab/Battle/BattleRoomPlayer.prefab
  13. 0 0
      assets/resources/edt_prefab/Battle/BattleRoomPlayer.prefab.meta
  14. 0 0
      assets/resources/edt_prefab/Battle/BattleRoomPlayerIcon.prefab
  15. 0 0
      assets/resources/edt_prefab/Battle/BattleRoomPlayerIcon.prefab.meta
  16. 0 0
      assets/resources/edt_prefab/Battle/BattleRoomPreviweCell.prefab
  17. 0 0
      assets/resources/edt_prefab/Battle/BattleRoomPreviweCell.prefab.meta
  18. 0 0
      assets/resources/edt_prefab/BoxContains.meta
  19. 0 0
      assets/resources/edt_prefab/BoxContains/BoxChanceItem.prefab
  20. 0 0
      assets/resources/edt_prefab/BoxContains/BoxChanceItem.prefab.meta
  21. 0 0
      assets/resources/edt_prefab/BoxContains/BoxContainsMain.prefab
  22. 0 0
      assets/resources/edt_prefab/BoxContains/BoxContainsMain.prefab.meta
  23. 0 0
      assets/resources/edt_prefab/BoxContains/BoxItem.prefab
  24. 0 0
      assets/resources/edt_prefab/BoxContains/BoxItem.prefab.meta
  25. 0 0
      assets/resources/edt_prefab/Common.meta
  26. 0 0
      assets/resources/edt_prefab/Common/ButtonSelect1.prefab
  27. 0 0
      assets/resources/edt_prefab/Common/ButtonSelect1.prefab.meta
  28. 0 0
      assets/resources/edt_prefab/Common/HeadIcon.prefab
  29. 0 0
      assets/resources/edt_prefab/Common/HeadIcon.prefab.meta
  30. 0 0
      assets/resources/edt_prefab/Common/ItemIcon.prefab
  31. 0 0
      assets/resources/edt_prefab/Common/ItemIcon.prefab.meta
  32. 0 0
      assets/resources/edt_prefab/Dream.meta
  33. 0 0
      assets/resources/edt_prefab/Dream/DreamBrilliant.prefab
  34. 0 0
      assets/resources/edt_prefab/Dream/DreamBrilliant.prefab.meta
  35. 0 0
      assets/resources/edt_prefab/Dream/DreamBrilliantCell.prefab
  36. 0 0
      assets/resources/edt_prefab/Dream/DreamBrilliantCell.prefab.meta
  37. 0 0
      assets/resources/edt_prefab/Dream/DreamMain.prefab
  38. 0 0
      assets/resources/edt_prefab/Dream/DreamMain.prefab.meta
  39. 0 0
      assets/resources/edt_prefab/Dream/DreamPopular.prefab
  40. 0 0
      assets/resources/edt_prefab/Dream/DreamPopular.prefab.meta
  41. 0 0
      assets/resources/edt_prefab/Dream/DreamStatistics.prefab
  42. 0 0
      assets/resources/edt_prefab/Dream/DreamStatistics.prefab.meta
  43. 0 0
      assets/resources/edt_prefab/Dream/DreamStatisticsCell.prefab
  44. 0 0
      assets/resources/edt_prefab/Dream/DreamStatisticsCell.prefab.meta
  45. 0 0
      assets/resources/edt_prefab/Dream/DreamStatisticsFilter.prefab
  46. 0 0
      assets/resources/edt_prefab/Dream/DreamStatisticsFilter.prefab.meta
  47. 0 0
      assets/resources/edt_prefab/Drop.meta
  48. 0 0
      assets/resources/edt_prefab/Drop/DropPercentageItem.prefab
  49. 0 0
      assets/resources/edt_prefab/Drop/DropPercentageItem.prefab.meta
  50. 0 0
      assets/resources/edt_prefab/Drop/DropRecordMain.prefab
  51. 0 0
      assets/resources/edt_prefab/Drop/DropRecordMain.prefab.meta
  52. 0 0
      assets/resources/edt_prefab/Drop/DropWastageItem.prefab
  53. 0 0
      assets/resources/edt_prefab/Drop/DropWastageItem.prefab.meta
  54. 0 0
      assets/resources/edt_prefab/Filter.meta
  55. 0 0
      assets/resources/edt_prefab/Filter/FilterMain.prefab
  56. 0 0
      assets/resources/edt_prefab/Filter/FilterMain.prefab.meta
  57. 0 0
      assets/resources/edt_prefab/Navigation.meta
  58. 0 0
      assets/resources/edt_prefab/Navigation/NavigationMain.prefab
  59. 0 0
      assets/resources/edt_prefab/Navigation/NavigationMain.prefab.meta
  60. 4 0
      assets/script/app/AppInit.js
  61. 1 1
      assets/script/app/view/UIInfo.js
  62. 97 0
      assets/script/core/model/UIMgr.js
  63. 9 0
      assets/script/core/model/UIMgr.js.meta

+ 7 - 0
assets/resources/edt_prefab.meta

@@ -0,0 +1,7 @@
1
+{
2
+  "ver": "1.0.1",
3
+  "uuid": "e4c8c254-6bf7-4387-af29-9fedf8a3e705",
4
+  "isSubpackage": false,
5
+  "subpackageName": "",
6
+  "subMetas": {}
7
+}

assets/edt_prefab/ctrl/Bag.meta → assets/resources/edt_prefab/Bag.meta


assets/edt_prefab/ctrl/Bag/BagMain.prefab → assets/resources/edt_prefab/Bag/BagMain.prefab


assets/edt_prefab/ctrl/Bag/BagMain.prefab.meta → assets/resources/edt_prefab/Bag/BagMain.prefab.meta


assets/edt_prefab/ctrl/Battle.meta → assets/resources/edt_prefab/Battle.meta


assets/edt_prefab/ctrl/Battle/BattleJoinRoomTip.prefab → assets/resources/edt_prefab/Battle/BattleJoinRoomTip.prefab


assets/edt_prefab/ctrl/Battle/BattleJoinRoomTip.prefab.meta → assets/resources/edt_prefab/Battle/BattleJoinRoomTip.prefab.meta


assets/edt_prefab/ctrl/Battle/BattleMain.prefab → assets/resources/edt_prefab/Battle/BattleMain.prefab


assets/edt_prefab/ctrl/Battle/BattleMain.prefab.meta → assets/resources/edt_prefab/Battle/BattleMain.prefab.meta


assets/edt_prefab/ctrl/Battle/BattleRoom.prefab → assets/resources/edt_prefab/Battle/BattleRoom.prefab


assets/edt_prefab/ctrl/Battle/BattleRoom.prefab.meta → assets/resources/edt_prefab/Battle/BattleRoom.prefab.meta


assets/edt_prefab/ctrl/Battle/BattleRoomPlayer.prefab → assets/resources/edt_prefab/Battle/BattleRoomPlayer.prefab


assets/edt_prefab/ctrl/Battle/BattleRoomPlayer.prefab.meta → assets/resources/edt_prefab/Battle/BattleRoomPlayer.prefab.meta


assets/edt_prefab/ctrl/Battle/BattleRoomPlayerIcon.prefab → assets/resources/edt_prefab/Battle/BattleRoomPlayerIcon.prefab


assets/edt_prefab/ctrl/Battle/BattleRoomPlayerIcon.prefab.meta → assets/resources/edt_prefab/Battle/BattleRoomPlayerIcon.prefab.meta


assets/edt_prefab/ctrl/Battle/BattleRoomPreviweCell.prefab → assets/resources/edt_prefab/Battle/BattleRoomPreviweCell.prefab


assets/edt_prefab/ctrl/Battle/BattleRoomPreviweCell.prefab.meta → assets/resources/edt_prefab/Battle/BattleRoomPreviweCell.prefab.meta


assets/edt_prefab/ctrl/BoxContains.meta → assets/resources/edt_prefab/BoxContains.meta


assets/edt_prefab/ctrl/BoxContains/BoxChanceItem.prefab → assets/resources/edt_prefab/BoxContains/BoxChanceItem.prefab


assets/edt_prefab/ctrl/BoxContains/BoxChanceItem.prefab.meta → assets/resources/edt_prefab/BoxContains/BoxChanceItem.prefab.meta


assets/edt_prefab/ctrl/BoxContains/BoxContainsMain.prefab → assets/resources/edt_prefab/BoxContains/BoxContainsMain.prefab


assets/edt_prefab/ctrl/BoxContains/BoxContainsMain.prefab.meta → assets/resources/edt_prefab/BoxContains/BoxContainsMain.prefab.meta


assets/edt_prefab/ctrl/BoxContains/BoxItem.prefab → assets/resources/edt_prefab/BoxContains/BoxItem.prefab


assets/edt_prefab/ctrl/BoxContains/BoxItem.prefab.meta → assets/resources/edt_prefab/BoxContains/BoxItem.prefab.meta


assets/edt_prefab/ctrl/Common.meta → assets/resources/edt_prefab/Common.meta


assets/edt_prefab/ctrl/Common/ButtonSelect1.prefab → assets/resources/edt_prefab/Common/ButtonSelect1.prefab


assets/edt_prefab/ctrl/Common/ButtonSelect1.prefab.meta → assets/resources/edt_prefab/Common/ButtonSelect1.prefab.meta


assets/edt_prefab/ctrl/Common/HeadIcon.prefab → assets/resources/edt_prefab/Common/HeadIcon.prefab


assets/edt_prefab/ctrl/Common/HeadIcon.prefab.meta → assets/resources/edt_prefab/Common/HeadIcon.prefab.meta


assets/edt_prefab/ctrl/Common/ItemIcon.prefab → assets/resources/edt_prefab/Common/ItemIcon.prefab


assets/edt_prefab/ctrl/Common/ItemIcon.prefab.meta → assets/resources/edt_prefab/Common/ItemIcon.prefab.meta


assets/edt_prefab/ctrl/Dream.meta → assets/resources/edt_prefab/Dream.meta


assets/edt_prefab/ctrl/Dream/DreamBrilliant.prefab → assets/resources/edt_prefab/Dream/DreamBrilliant.prefab


assets/edt_prefab/ctrl/Dream/DreamBrilliant.prefab.meta → assets/resources/edt_prefab/Dream/DreamBrilliant.prefab.meta


assets/edt_prefab/ctrl/Dream/DreamBrilliantCell.prefab → assets/resources/edt_prefab/Dream/DreamBrilliantCell.prefab


assets/edt_prefab/ctrl/Dream/DreamBrilliantCell.prefab.meta → assets/resources/edt_prefab/Dream/DreamBrilliantCell.prefab.meta


assets/edt_prefab/ctrl/Dream/DreamMain.prefab → assets/resources/edt_prefab/Dream/DreamMain.prefab


assets/edt_prefab/ctrl/Dream/DreamMain.prefab.meta → assets/resources/edt_prefab/Dream/DreamMain.prefab.meta


assets/edt_prefab/ctrl/Dream/DreamPopular.prefab → assets/resources/edt_prefab/Dream/DreamPopular.prefab


assets/edt_prefab/ctrl/Dream/DreamPopular.prefab.meta → assets/resources/edt_prefab/Dream/DreamPopular.prefab.meta


assets/edt_prefab/ctrl/Dream/DreamStatistics.prefab → assets/resources/edt_prefab/Dream/DreamStatistics.prefab


assets/edt_prefab/ctrl/Dream/DreamStatistics.prefab.meta → assets/resources/edt_prefab/Dream/DreamStatistics.prefab.meta


assets/edt_prefab/ctrl/Dream/DreamStatisticsCell.prefab → assets/resources/edt_prefab/Dream/DreamStatisticsCell.prefab


assets/edt_prefab/ctrl/Dream/DreamStatisticsCell.prefab.meta → assets/resources/edt_prefab/Dream/DreamStatisticsCell.prefab.meta


assets/edt_prefab/ctrl/Dream/DreamStatisticsFilter.prefab → assets/resources/edt_prefab/Dream/DreamStatisticsFilter.prefab


assets/edt_prefab/ctrl/Dream/DreamStatisticsFilter.prefab.meta → assets/resources/edt_prefab/Dream/DreamStatisticsFilter.prefab.meta


assets/edt_prefab/ctrl/Drop.meta → assets/resources/edt_prefab/Drop.meta


assets/edt_prefab/ctrl/Drop/DropPercentageItem.prefab → assets/resources/edt_prefab/Drop/DropPercentageItem.prefab


assets/edt_prefab/ctrl/Drop/DropPercentageItem.prefab.meta → assets/resources/edt_prefab/Drop/DropPercentageItem.prefab.meta


assets/edt_prefab/ctrl/Drop/DropRecordMain.prefab → assets/resources/edt_prefab/Drop/DropRecordMain.prefab


assets/edt_prefab/ctrl/Drop/DropRecordMain.prefab.meta → assets/resources/edt_prefab/Drop/DropRecordMain.prefab.meta


assets/edt_prefab/ctrl/Drop/DropWastageItem.prefab → assets/resources/edt_prefab/Drop/DropWastageItem.prefab


assets/edt_prefab/ctrl/Drop/DropWastageItem.prefab.meta → assets/resources/edt_prefab/Drop/DropWastageItem.prefab.meta


assets/edt_prefab/ctrl/Filter.meta → assets/resources/edt_prefab/Filter.meta


assets/edt_prefab/ctrl/Filter/FilterMain.prefab → assets/resources/edt_prefab/Filter/FilterMain.prefab


assets/edt_prefab/ctrl/Filter/FilterMain.prefab.meta → assets/resources/edt_prefab/Filter/FilterMain.prefab.meta


assets/edt_prefab/ctrl/Navigation.meta → assets/resources/edt_prefab/Navigation.meta


assets/edt_prefab/ctrl/Navigation/NavigationMain.prefab → assets/resources/edt_prefab/Navigation/NavigationMain.prefab


assets/edt_prefab/ctrl/Navigation/NavigationMain.prefab.meta → assets/resources/edt_prefab/Navigation/NavigationMain.prefab.meta


+ 4 - 0
assets/script/app/AppInit.js

@@ -19,6 +19,7 @@ module.exports = {
19 19
         // 网络数据管理器
20 20
         ns.NetworkMgr = require('NetworkMgr');
21 21
         ns.NetworkMgr.init();
22
+
22 23
         // 弹框数据管理器
23 24
         ns.AlertMgr = require('AlertMgr');
24 25
         ns.AlertMgr.init();
@@ -37,5 +38,8 @@ module.exports = {
37 38
         // 玩家数据管理器
38 39
         ns.UserMgr = require('UserMgr');
39 40
         ns.UserMgr.init();
41
+
42
+        ns.UIMgr = require('UIMgr')
43
+        ns.UIMgr.init();
40 44
     }
41 45
 };

+ 1 - 1
assets/script/app/view/UIInfo.js

@@ -1,5 +1,5 @@
1 1
 // 当前文件为手动导出文件.请勿修改.在预制体编辑界面点击右键导出即可.
2
- window.JMC.UIEnum = {
2
+window.JMC.UIEnum = {
3 3
 		BagMain:0,
4 4
 		BattleJoinRoomTip:1,
5 5
 		BattleMain:2,

+ 97 - 0
assets/script/core/model/UIMgr.js

@@ -0,0 +1,97 @@
1
+/**
2
+ * 界面相关的工具
3
+ */
4
+
5
+require("UIInfo")
6
+
7
+
8
+/**
9
+ * 登录数据管理
10
+ */
11
+let UIMgr = {
12
+    //* ************* 初始化 ************* *//
13
+    /**
14
+     * 初始化
15
+     *
16
+     */
17
+    init () {
18
+        if (CC_EDITOR) {
19
+            return;
20
+        }
21
+    },
22
+
23
+    getUIRoot () {
24
+        return cc.director.getScene().getChildByName('Root');
25
+    },
26
+
27
+    open(type, param) {
28
+        // edt_prefab/ctrl/prefab_normal_alert
29
+        let prefabPath = 'edt_prefab/ctrl/' + window.JMC.UIPath[type];
30
+        this.showUI(prefabPath, param)
31
+    },
32
+
33
+    showUI (prefabPath, alertData, cb, cache = false) {
34
+        G.LogUtils.warn('showAlert', prefabPath);
35
+
36
+        let temp = undefined;
37
+        cc.loader.loadRes(prefabPath, cc.Prefab, (completedCount, totalCount, item)=>{
38
+            temp = G.AppUtils.getLoadProgressInfo(temp, completedCount, totalCount);
39
+            G.AppUtils.getSceneCtrl().updateLoadingProgress(temp.precent * 100, 100, item);
40
+        }, (err, prefab) => {
41
+            G.AppUtils.getSceneCtrl().updateLoadingProgress(100, 100, undefined);
42
+
43
+            if (err) {
44
+                G.AppUtils.getSceneCtrl().addToast('网络异常!');
45
+                G.LogUtils.error('[showAlert]', err);
46
+                if (cb) {
47
+                    cb(undefined, 'error', err);
48
+                }
49
+                return;
50
+            }
51
+
52
+            let node = cc.instantiate(prefab);
53
+            let alert = node.getComponent('JMAlertBase');
54
+            if (cb) {
55
+                cb(alert, 'willShow', undefined);
56
+            }
57
+
58
+            let uiRoot = this.getUIRoot();
59
+            let ret = this.pushUI(uiRoot, alert);
60
+            if (!ret) {
61
+                return;
62
+            }
63
+
64
+            // 因为reloadData如果出错会导致游戏闪屏,所以加上try catch
65
+            try {
66
+                alert.reloadData(alertData, cb);
67
+            } catch (error) {
68
+                G.LogUtils.error('AlertCtrl showAlert error:', error);
69
+            }
70
+
71
+            if (!cache) {
72
+                cc.loader.releaseRes(prefabPath);
73
+            }
74
+        });
75
+    },
76
+
77
+    /**
78
+     * 弹出指定弹框
79
+     *
80
+     * @author Pyden
81
+     * @date 2019-03-22
82
+     * @param {JMAlertBase} alert 弹框
83
+     */
84
+    pushUI (alert) {
85
+        if (!cc.isValid(alert) || !cc.isValid(uiRoot)) {
86
+            return false;
87
+        }
88
+
89
+        let zIndex = alert.alertZIndex;
90
+        uiRoot.addChild(alert.node, zIndex);
91
+
92
+        cc.game.emit('e_ui_push_alert', {alert: alert});
93
+        return true;
94
+    },
95
+}
96
+
97
+module.exports = UIMgr;

+ 9 - 0
assets/script/core/model/UIMgr.js.meta

@@ -0,0 +1,9 @@
1
+{
2
+  "ver": "1.0.8",
3
+  "uuid": "bb6c62e9-b61c-434d-a2fb-ac3c1f7581e8",
4
+  "isPlugin": false,
5
+  "loadPluginInWeb": true,
6
+  "loadPluginInNative": true,
7
+  "loadPluginInEditor": false,
8
+  "subMetas": {}
9
+}