zane 1 kuukausi sitten
vanhempi
commit
7068de8e38

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 276 - 136
assets/resources/prefab/family/FamilyPageHas.prefab


+ 4 - 0
assets/resources/prefab/family/FamilyPageHas.ts

@@ -17,6 +17,7 @@ import UserM from "../../scripts/api/UserM";
 import Utils from "../../scripts/utils/Utils";
 import { TipsData, TipsLayer } from "../layer/TipsLayer";
 import { GoodsId } from "../../scripts/api/GoodsId";
+import { HelpImage, HelpType } from "../layer/HelpImage";
 const { ccclass, property } = _decorator;
 
 @ccclass("FamilyPageHas")
@@ -220,6 +221,9 @@ export class FamilyPageHas extends BaseUI {
       case "btn_upgrade_family":
         this.upgradeFamily();
         break;
+      case "btn_box_family_box":
+        HelpImage.show(HelpType.FamilyBox);
+        break;
     }
   }
   async upgradeFamily() {

+ 169 - 30
assets/resources/prefab/family/FamilyPageNo.prefab

@@ -34,29 +34,29 @@
         "__id__": 148
       },
       {
-        "__id__": 186
+        "__id__": 192
       },
       {
-        "__id__": 194
+        "__id__": 200
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 198
+        "__id__": 204
       },
       {
-        "__id__": 200
+        "__id__": 206
       },
       {
-        "__id__": 202
+        "__id__": 208
       },
       {
-        "__id__": 204
+        "__id__": 210
       }
     ],
     "_prefab": {
-      "__id__": 206
+      "__id__": 212
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -3731,19 +3731,22 @@
       },
       {
         "__id__": 175
+      },
+      {
+        "__id__": 181
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 181
+        "__id__": 187
       },
       {
-        "__id__": 183
+        "__id__": 189
       }
     ],
     "_prefab": {
-      "__id__": 185
+      "__id__": 191
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4563,6 +4566,142 @@
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn_box_family_box",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 148
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 182
+      },
+      {
+        "__id__": 184
+      }
+    ],
+    "_prefab": {
+      "__id__": 186
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 276.67600000000004,
+      "y": -29.95399999999995,
+      "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__": 181
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 183
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 32,
+      "height": 32
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "5fjsktUVJFv6InylkVlrAT"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 181
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 185
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "ce185733-b027-42a7-babf-55dcb07377fc@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": "a45qKQQrNFo7S9qqd5cTqq"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "7f0414vb9Dg4Ofl4R6RR2v",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
   {
     "__type__": "cc.UITransform",
     "_name": "",
@@ -4573,7 +4712,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 182
+      "__id__": 188
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4601,7 +4740,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 184
+      "__id__": 190
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4661,17 +4800,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 187
+        "__id__": 193
       },
       {
-        "__id__": 189
+        "__id__": 195
       },
       {
-        "__id__": 191
+        "__id__": 197
       }
     ],
     "_prefab": {
-      "__id__": 193
+      "__id__": 199
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4708,11 +4847,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 186
+      "__id__": 192
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 188
+      "__id__": 194
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4736,11 +4875,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 186
+      "__id__": 192
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 190
+      "__id__": 196
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -4781,11 +4920,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 186
+      "__id__": 192
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 192
+      "__id__": 198
     },
     "_resizeMode": 1,
     "_layoutType": 2,
@@ -4838,11 +4977,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 195
+        "__id__": 201
       }
     ],
     "_prefab": {
-      "__id__": 197
+      "__id__": 203
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -4879,11 +5018,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 194
+      "__id__": 200
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 196
+      "__id__": 202
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4924,7 +5063,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 199
+      "__id__": 205
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4952,7 +5091,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 201
+      "__id__": 207
     },
     "_alignFlags": 40,
     "_target": null,
@@ -4988,7 +5127,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 203
+      "__id__": 209
     },
     "_resizeMode": 1,
     "_layoutType": 2,
@@ -5026,7 +5165,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 205
+      "__id__": 211
     },
     "_id": ""
   },

+ 4 - 1
assets/resources/prefab/family/FamilyPageNo.ts

@@ -12,6 +12,7 @@ import ShareM from "../../scripts/mgr/ShareM";
 import FamilyM from "../../scripts/api/FamilyM";
 import { EditBox } from "cc";
 import { FamilyItem } from "./FamilyItem";
+import { HelpImage, HelpType } from "../layer/HelpImage";
 const { ccclass, property } = _decorator;
 
 @ccclass("FamilyPageNo")
@@ -91,7 +92,9 @@ export class FamilyPageNo extends BaseUI {
         break;
       case "btn_create_family":
         this.createFamily();
-
+        break;
+      case "btn_box_family_box":
+        HelpImage.show(HelpType.FamilyBox);
         break;
     }
   }

+ 4 - 0
assets/resources/prefab/layer/HelpImage.ts

@@ -9,6 +9,7 @@ export enum HelpType {
   Rank = 1,
   ItemBox = 2,
   PogBox = 3,
+  FamilyBox = 4,
 }
 
 @ccclass("HelpImage")
@@ -35,6 +36,9 @@ export class HelpImage extends BaseUI {
       case HelpType.PogBox:
         path = "texture/shop/page_help_pog_box";
         break;
+      case HelpType.FamilyBox:
+        path = "texture/family/page_help_family_box";
+        break;
     }
 
     let sp = await AB.ins.loadSpriteFrame(path);

BIN
assets/resources/texture/family/page_help_family_box.png


+ 42 - 42
assets/resources/texture/wheel/wheel_main.png.meta → assets/resources/texture/family/page_help_family_box.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "45b541e7-2289-42ad-81a3-041a25d92502",
+  "uuid": "6204888f-020f-47bb-ad9d-ff890fa37a31",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "45b541e7-2289-42ad-81a3-041a25d92502@6c48a",
-      "displayName": "wheel_main",
+      "uuid": "6204888f-020f-47bb-ad9d-ff890fa37a31@6c48a",
+      "displayName": "page_help_family_box",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "45b541e7-2289-42ad-81a3-041a25d92502",
+        "imageUuidOrDatabaseUri": "6204888f-020f-47bb-ad9d-ff890fa37a31",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "45b541e7-2289-42ad-81a3-041a25d92502@f9941",
-      "displayName": "wheel_main",
+      "uuid": "6204888f-020f-47bb-ad9d-ff890fa37a31@f9941",
+      "displayName": "page_help_family_box",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -44,12 +44,12 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 14,
-        "trimY": 14,
-        "width": 484,
-        "height": 484,
-        "rawWidth": 512,
-        "rawHeight": 512,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 615,
+        "height": 404,
+        "rawWidth": 615,
+        "rawHeight": 404,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,17 +61,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -242,
-            -242,
+            -307.5,
+            -202,
             0,
-            242,
-            -242,
+            307.5,
+            -202,
             0,
-            -242,
-            242,
+            -307.5,
+            202,
             0,
-            242,
-            242,
+            307.5,
+            202,
             0
           ],
           "indexes": [
@@ -83,38 +83,38 @@
             3
           ],
           "uv": [
-            14,
-            498,
-            498,
-            498,
-            14,
-            14,
-            498,
-            14
+            0,
+            404,
+            615,
+            404,
+            0,
+            0,
+            615,
+            0
           ],
           "nuv": [
-            0.02734375,
-            0.02734375,
-            0.97265625,
-            0.02734375,
-            0.02734375,
-            0.97265625,
-            0.97265625,
-            0.97265625
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
           ],
           "minPos": [
-            -242,
-            -242,
+            -307.5,
+            -202,
             0
           ],
           "maxPos": [
-            242,
-            242,
+            307.5,
+            202,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "45b541e7-2289-42ad-81a3-041a25d92502@6c48a",
+        "imageUuidOrDatabaseUri": "6204888f-020f-47bb-ad9d-ff890fa37a31@6c48a",
         "atlasUuid": ""
       },
       "ver": "1.0.12",
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "hasAlpha": true,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "45b541e7-2289-42ad-81a3-041a25d92502@6c48a"
+    "redirect": "6204888f-020f-47bb-ad9d-ff890fa37a31@6c48a"
   }
 }

BIN
assets/resources/texture/play/wheel1.png


+ 0 - 9
assets/resources/texture/wheel.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "656a7187-80ab-4cda-a662-291c0e25c592",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

BIN
assets/resources/texture/wheel/wheel_main.png


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä