[FC]:UISystem、GameUtil、EventSystem优化相关命名

mk_framework/assets/script/game/module/cash.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "42cbe10f-5b94-498a-af86-aa0e72204c7f",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

mk_framework/assets/script/game/module/common/load.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "e1966dc0-8718-4f4d-aca0-37453fcb2788",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

mk_framework/assets/script/mk/system/EventSystem.ts

@@ -26,7 +26,7 @@ export default class EventSystem {
         let length = observers.length;
         for (let i = 0; i < length; i++) {
             let observer = observers[i];
-            if (observer.compar(target)) {
+            if (observer.compare(target)) {
                 console.warn("[EventMgr]重复添加监听,请检查事件:", name)
                 return;
             }
@@ -47,7 +47,7 @@ export default class EventSystem {
         let length = observers.length;
         for (let i = 0; i < length; i++) {
             let observer = observers[i];
-            if (observer.compar(target)) {
+            if (observer.compare(target)) {
                 observers.splice(i, 1);
                 break;
             }
@@ -61,7 +61,7 @@ export default class EventSystem {
      * 发送事件
      * @param name 事件名称
      */
-    public fire(name: string, ...args: any[]) {
+    public emit(name: string, ...args: any[]) {
 
         let observers: Observer[] = this.listeners[name];
         if (!observers) return;
@@ -103,10 +103,10 @@ class Observer {
     }
 
     /**
-     * 上下文比较
-     * @param context 上下文
+     * 脚本比较
+     * @param target 绑定的对象脚本
      */
-    compar(context: any): boolean {
-        return context == this.target;
+    compare(target: any): boolean {
+        return target == this.target;
     }
 }

mk_framework/assets/script/mk/system/UISystem.ts

@@ -21,11 +21,11 @@ export default class UISystem {
 
     /**
      * 打开panel界面
-     * @param panelName 界面名称
-     * @param callBack  打开之后的回调
+     * @param panelName  界面名称
+     * @param callBack   打开之后的回调
      * @param openAction 打开之后的操(需不需要关闭其他界面)
      */
-    onPanel(panelName: string, callBack: Function = null, openAction: OpenActionType = OpenActionType.normal) {
+    openPanel(panelName: string, callBack: Function = null, openAction: OpenActionType = OpenActionType.normal) {
 
         if (this.isPanelOpening || this.getCurOnPanel(panelName)) {
             return;
@@ -45,7 +45,7 @@ export default class UISystem {
                 return;
             }
             this.panelParent.addChild(node_panel);
-            
+
             callBack && callBack();
 
             switch (openAction) {
@@ -53,14 +53,14 @@ export default class UISystem {
                     break;
                 case OpenActionType.closeLast:
                     if (this.lastOpenPanelName) {
-                        this.offPanel(this.lastOpenPanelName);
+                        this.closePanel(this.lastOpenPanelName);
                     }
                     break;
                 case OpenActionType.closeOther:
                     let keys = Object.keys(this.curOnPanelDic).filter((key) => { key != panelName });
                     for (var i = 0; i < keys.length; i++) {
                         let key = keys[i];
-                        this.offPanel(key);
+                        this.closePanel(key);
                     }
                     break;
             }
@@ -81,7 +81,7 @@ export default class UISystem {
      * @param panelName 界面名称
      * @param callBack  关闭之后回调
      */
-    offPanel(panelName: string, callBack: Function = null) {
+    closePanel(panelName: string, callBack: Function = null) {
         if (this.isPanelClosing || !this.getCurOnPanel(panelName)) {
             return;
         }
@@ -104,3 +104,9 @@ export enum OpenActionType {
     /** 关闭上一个 */
     closeLast = 2
 }
+
+/** */
+export enum PanelType {
+    Game = 1,
+    Module = 2,
+}

mk_framework/assets/script/mk/utils/GameUtil.ts

@@ -1,7 +1,7 @@
 
 /**
  * 游戏工具类
- * @description 
+ * @description 依据引擎Api的工具类，用于操作引擎相关系统的开关、操作引擎相关的api属性，比如坐标
  * @author 冯聪
  */
 export default class GameUtil {