枚举变量大小写调整

.gitignore

@@ -5,3 +5,5 @@
 /mk_framework/assets/scene/TestScene.fire
 /mk_framework/assets/scene/TestScene.fire.meta
 /mk_framework/build
+/mk_framework/assets/scene/TestScene.ts
+/mk_framework/assets/scene/TestScene.ts.meta

mk_framework/assets/script/game/component/BtnOpenPanel.ts

@@ -1,5 +1,6 @@
 
 const { ccclass, property } = cc._decorator;
+import { OpenActionType, PanelType } from '../../mk/system/UISystem';
 /**
  * 打开指定名字的面板
  * @author 薛鸿潇
@@ -9,6 +10,12 @@ export default class BtnOpenPanel extends cc.Component {
 
     @property({ displayName: '界面名字', tooltip: '对应路径：resources/prefab/uiPanel/' })
     private panel_name = '';
+
+    @property({ displayName: '打开操作类型', tooltip: 'normal不操作，closeOther关闭其他，closeLast关闭上一个', type: cc.Enum(OpenActionType) })
+    private open_type = OpenActionType.normal;
+    @property({ displayName: '面板类型', tooltip: 'game游戏界面，module模块界面', type: cc.Enum(PanelType) })
+    private panel_type = PanelType.module;
+
     @property({ displayName: '完成回调', tooltip: "面板打开完成后触发", type: cc.Component.EventHandler })
     public onComplete: cc.Component.EventHandler = new cc.Component.EventHandler();
 
@@ -19,9 +26,9 @@ export default class BtnOpenPanel extends cc.Component {
     start() {
         this.node.on('click', this.openPanel, this);
     }
-    
+
     private async openPanel() {
-        await mk.ui.openPanel(this.panel_name);
+        await mk.ui.openPanel(this.panel_name, this.panel_type, this.open_type);
         if (this.onComplete.handler) this.onComplete.emit([])
     }
     // update (dt) {}

mk_framework/assets/script/game/component/UIBG.ts

@@ -7,13 +7,13 @@ enum BGType {
      * 无
      * @property {Number} None
      */
-    None = 0,
+    none = 0,
 
     /**
      * 半透明
      * @property {Number} Translucent
      */
-    Translucent = 1,
+    translucent = 1,
 }
 
 /**

mk_framework/assets/script/game/component/tween/RotateAround.ts

@@ -1,13 +1,13 @@
 /** 轴 */
 export enum Axis {
     /** 正 X 轴 */
-    PositiveX,
+    positiveX,
     /** 正 Y 轴 */
-    PositiveY,
+    positiveY,
     /** 负 X 轴 */
-    NegativeX,
+    negativeX,
     /** 负 Y 轴 */
-    NegativeY
+    negativeY
 }
 
 const { ccclass, property, executeInEditMode, playOnFocus } = cc._decorator;
@@ -38,7 +38,7 @@ export default class RotateAround extends cc.Component {
         tooltip: '面向目标节点的轴：\n- PositiveX：正 X 轴\n- PositiveY：正 Y 轴\n- NegativeX：负 X 轴\n- NegativeY：负 Y 轴',
         visible() { return this.faceToTarget }
     })
-    public faceAxis: Axis = Axis.NegativeY;
+    public faceAxis: Axis = Axis.negativeY;
 
     @property({ tooltip: '自动开始旋转' })
     public auto_start: boolean = false;
@@ -76,16 +76,16 @@ export default class RotateAround extends cc.Component {
         // 更新节点的角度
         if (this.faceToTarget) {
             switch (this.faceAxis) {
-                case Axis.PositiveX:
+                case Axis.positiveX:
                     this.node.angle = this.angle + 180;
                     break;
-                case Axis.PositiveY:
+                case Axis.positiveY:
                     this.node.angle = this.angle + 90;
                     break;
-                case Axis.NegativeX:
+                case Axis.negativeX:
                     this.node.angle = this.angle;
                     break;
-                case Axis.NegativeY:
+                case Axis.negativeY:
                     this.node.angle = this.angle - 90;
                     break;
             }

mk_framework/assets/script/game/component/tween/UIOpenAndClose.ts

@@ -2,10 +2,10 @@
 const { ccclass, property, executeInEditMode, playOnFocus } = cc._decorator;
 /** 效果类型 */
 enum EffectType {
-    None = 0,   //无
-    Scale = 1,  //缩放
-    ScaleToPoint = 2,    //缩放到某点
-    CenterUnfolding = 3,   //从中部展开
+    none = 0,   //无
+    scale = 1,  //缩放
+    scaleToPoint = 2,    //缩放到某点
+    centerUnfolding = 3,   //从中部展开
 }
 /**
  * 界面打开 和 关闭效果
@@ -21,12 +21,12 @@ export default class UIOpenAndClose extends cc.Component {
     private effect_par: cc.Node = null
 
     @property({ type: cc.Enum(EffectType), displayName: '打开动画节点效果', visible() { return this.effect_par } })
-    private open_effect: EffectType = EffectType.None;
+    private open_effect: EffectType = EffectType.none;
 
     @property({ type: cc.Enum(EffectType), displayName: '关闭动画节点效果', visible() { return this.effect_par } })
-    private close_effect: EffectType = EffectType.None;
+    private close_effect: EffectType = EffectType.none;
 
-    @property({ displayName: '关闭节点缩小到此节点坐标', visible() { return this.close_effect == EffectType.ScaleToPoint } })
+    @property({ displayName: '关闭节点缩小到此节点坐标', visible() { return this.close_effect == EffectType.scaleToPoint } })
     private close_toPoint: string = "";
 
     private _play_open: boolean = false;
@@ -69,15 +69,15 @@ export default class UIOpenAndClose extends cc.Component {
     private showEffect() {
         if (this.effect_par) {
             switch (this.open_effect) {
-                case EffectType.None:
+                case EffectType.none:
                     break;
-                case EffectType.Scale:
+                case EffectType.scale:
                     this.effect_par.scale = 0;
                     cc.tween(this.effect_par)
                         .to(0.15, { scale: 1 })
                         .start()
                     break;
-                case EffectType.CenterUnfolding:
+                case EffectType.centerUnfolding:
                     this.effect_par.scaleX = 0;
                     cc.tween(this.effect_par)
                         .to(0.15, { scaleX: 1 })
@@ -94,10 +94,10 @@ export default class UIOpenAndClose extends cc.Component {
     public hideEffect(cb: Function = null) {
         if (this.effect_par) {
             switch (this.close_effect) {
-                case EffectType.None:
+                case EffectType.none:
                     cb && cb();
                     break;
-                case EffectType.Scale:
+                case EffectType.scale:
                     cc.tween(this.effect_par)
                         .to(0.15, { scale: 0 })
                         .call(() => {
@@ -105,7 +105,7 @@ export default class UIOpenAndClose extends cc.Component {
                         })
                         .start()
                     break;
-                case EffectType.ScaleToPoint:
+                case EffectType.scaleToPoint:
                     if (this.close_toPoint == "") {
                         console.error('需要配置缩小到终点节点路径')
                     } else {

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

@@ -141,10 +141,10 @@ export default class UISystem extends cc.Component {
     getUrlByPanelType(pannelName: string, panelType: PanelType): string {
         let url: string = "";
         switch (panelType) {
-            case PanelType.Game:
+            case PanelType.game:
                 url = `${this.gamePanelbUrl}/${pannelName}`
                 break;
-            case PanelType.Module:
+            case PanelType.module:
                 url = `${this.modulPanelUrl}/${pannelName}/${pannelName}`
                 break;
         }
@@ -165,7 +165,7 @@ export enum OpenActionType {
 /** */
 export enum PanelType {
     /**游戏界面 */
-    Game = 1,
+    game = 1,
     /**模块界面 */
-    Module = 2,
+    module = 2,
 }