woso_javan 3 月之前
父節點
當前提交
60514437ed

File diff suppressed because it is too large
+ 303 - 121
assets/module_take_goblet/Prefabs/Levels/lvl_1.prefab


+ 305 - 3
assets/module_take_goblet/Prefabs/Water.prefab

@@ -20,16 +20,19 @@
     "_children": [
       {
         "__id__": 2
+      },
+      {
+        "__id__": 8
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 8
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 22
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -196,18 +199,317 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "Mark",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 9
+      }
+    ],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": {
+      "__id__": 19
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Label",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 1
+      "__id__": 9
     },
     "_enabled": true,
     "__prefab": {
+      "__id__": 11
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 11.123046875,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "110k4+jzhBsLpp82MR5xnJ"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
       "__id__": 9
     },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 13
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "?",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_enableOutline": false,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_outlineWidth": 2,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "7f7Xyg3upI17xLTYoyE1KJ"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "81tg3ZvCZCXKPrxYAl4gd2",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 16
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 80,
+      "height": 50
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "39yeqleNJDcK5FeM3wlo9P"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 18
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 41,
+      "g": 39,
+      "b": 39,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "6b81x0rcNHMKkP9COrlOIx"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "74bFe4b2JKlqkcsDodX9lH",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
+    },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 80,

+ 12 - 0
assets/module_take_goblet/Script/Manager/GameMgr.ts

@@ -0,0 +1,12 @@
+import { Node, Prefab, _decorator, assetManager, find, instantiate, sys } from 'cc';
+
+const { ccclass, property } = _decorator;
+
+@ccclass('GameManager')
+export class GameManager {
+    private static _instance: GameManager | null = null;
+    public static get instance(): GameManager {
+        if (!this._instance) this._instance = new GameManager();
+        return this._instance;
+    }
+}

+ 9 - 0
assets/module_take_goblet/Script/Manager/GameMgr.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "21404783-15a1-4b33-a84e-8a0bf2e4a43f",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 17 - 2
assets/module_take_goblet/Script/Model/LevelModel.ts

@@ -4,11 +4,12 @@ import { Tablemain_config } from "../../../module_basic/table/Tablemain_config";
 import { GlobalConfig } from "../../../start/Config/GlobalConfig";
 import { sys } from "cc";
 import { TakeGobletGlobalInstance } from "../TakeGobletGlobalInstance";
+import { Tablecolor_config } from "db://assets/module_basic/table/Tablecolor_config";
 
 /**道具类型
- * @param FillUp 补满
+ * @param FillUp  补满
  * @param MoveOut 移出
- * @param Disturb  打乱
+ * @param Disturb 打乱
 */
 export enum TYPE_ITEM {
     REVOKE = 1,
@@ -16,6 +17,19 @@ export enum TYPE_ITEM {
     Disturb = 3,
 }
 
+/**颜色定义*/
+export enum TYPE_COLOR {
+    Purple = "#D62F9C", // 紫
+    Magenta = "#EE60FE", // 紫红
+    Pink = "#FD9FD2", // 粉
+    Red = "#FF3939", // 红
+    Yellow = "#FEF344", // 黄
+    Green = "#4CF02F", // 绿
+    Cyan = "#37F5FD", // 青
+    Blue = "#317EFE", // 蓝
+    DarkBlue = "#3052A1", // 深蓝
+}
+
 export enum TYPE_GAME_STATE {
     GAME_STATE_INIT = 0, //准备阶段
     GAME_STATE_START = 1, //开始
@@ -43,6 +57,7 @@ export class LevelModel {
 
     constructor() {
         this.levelConfig = new Tablelevels_config();
+
         this.getRandomLevelList();
 
         const isDebug = GlobalConfig.isDebug;

+ 1 - 1
assets/start/Config/GlobalConfig.ts

@@ -1,5 +1,5 @@
 export const GlobalConfig = {
     isDebug: true,
     initilizeLevel: 1,//初始关卡
-    levelTotal: 20,   //最大关卡等级
+    levelTotal: 1,   //最大关卡等级
 }

Some files were not shown because too many files changed in this diff