薛鸿潇 пре 5 година
родитељ
комит
a7d9d59300

+ 233 - 7
assets/resources/module/sign/prefab/signIconItem.prefab

@@ -25,19 +25,25 @@
       },
       {
         "__id__": 32
+      },
+      {
+        "__id__": 36
+      },
+      {
+        "__id__": 39
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 42
       },
       {
-        "__id__": 37
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -202,7 +208,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -110.907,
+        -110,
         0,
         0,
         0,
@@ -438,7 +444,7 @@
       "ctor": "Float64Array",
       "array": [
         -70.406,
-        -26.883,
+        null,
         0,
         0,
         0,
@@ -840,7 +846,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -110.907,
+        -110,
         0,
         0,
         0,
@@ -1286,6 +1292,220 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "蒙版",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 37
+      }
+    ],
+    "_prefab": {
+      "__id__": 38
+    },
+    "_opacity": 120,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 170,
+      "height": 190
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -110,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 36
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "766ec3fe-904c-4a2b-a9aa-89ea186a4b9c"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "4f341905-d969-4c23-8917-f136f7f385a1"
+    },
+    "fileId": "1c+r5uDTVEjpuPCesSjlPE",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "勾",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 40
+      }
+    ],
+    "_prefab": {
+      "__id__": 41
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 95,
+      "height": 74
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -126,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 39
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "425ae522-6818-4efc-9e6e-50e9189894a8"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "4f341905-d969-4c23-8917-f136f7f385a1"
+    },
+    "fileId": "7dftTWhgdFYIRUfROws4d4",
+    "sync": false
+  },
+  {
     "__type__": "233bfi4S/FHSYKyekkgMW0Z",
     "_name": "",
     "_objFlags": 0,
@@ -1302,6 +1522,12 @@
     "lbl_day": {
       "__id__": 33
     },
+    "node_mask": {
+      "__id__": 36
+    },
+    "node_gou": {
+      "__id__": 39
+    },
     "_id": ""
   },
   {
@@ -1318,7 +1544,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 38
+        "__id__": 44
       }
     ],
     "_N$interactable": true,

+ 16 - 0
assets/script/game/data/EnumData.ts

@@ -0,0 +1,16 @@
+/**
+ * 全局枚举数据
+ * @author
+ */
+export class EnumData {
+
+    /** 奖励状态 */
+    rewardState = {
+        /** 已领取 */
+        none: 1,
+        /** 未解锁 */
+        lock: 2,
+        /** 可领取 */
+        unlock: 3
+    }
+}

+ 9 - 0
assets/script/game/data/EnumData.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "26866333-b110-4142-84eb-1bfb74eb3178",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 3 - 0
assets/script/game/data/g.ts

@@ -15,6 +15,7 @@ import { FissionData } from "./module/FissionData";
 import { LuckyBagData } from "./module/LuckyBagData";
 import { CashNormalData } from "./module/CashNormalData";
 import { CashPigData } from "./module/CashPigData";
+import { EnumData } from "./EnumData";
 
 /**
  * 数据集合全局类
@@ -32,6 +33,7 @@ class g {
     public wechatData: WechatData;
     public httpData: HttpData;
     public adData: AdData;
+    public enum: EnumData;
     public storageData: StorageData;
 
     //module
@@ -52,6 +54,7 @@ class g {
         this.wechatData = new WechatData();
         this.httpData = new HttpData();
         this.adData = new AdData();
+        this.enum = new EnumData();
         this.storageData = new StorageData();
 
         this.help = new HelpData();

+ 1 - 0
assets/script/game/data/module/SignData.ts

@@ -49,6 +49,7 @@ export class SignData {
             data.count = id;
             data.login_day = id;
             data.video_limit = 0;
+            data.state = g.enum.rewardState.lock;
             c_sign.push(data);
         }
         return c_sign;

+ 5 - 1
assets/script/game/module/module/sign/SignIconItem.ts

@@ -12,6 +12,10 @@ export default class SignIconItem extends cc.Component {
     private node_redbag: cc.Node = null!;
     @property({ displayName: '天数', type: cc.Label })
     private lbl_day: cc.Label = null!;
+    @property({ type: cc.Node, displayName: '蒙版' })
+    private node_mask: cc.Node = null!;
+    @property({ type: cc.Node, displayName: '勾' })
+    private node_gou: cc.Node = null!;
 
     /** 数据 */
     private icon_data = {
@@ -21,7 +25,7 @@ export default class SignIconItem extends cc.Component {
         login_day: 0,
         video_limit: 0,
     }
-    
+
     /**
      * 初始化数据
      */