kaka пре 5 година
родитељ
комит
67ce61ee20
36 измењених фајлова са 478 додато и 1305 уклоњено
  1. 12 12
      assets/resources/module/blessingBag/blessingBag.prefab
  2. 36 147
      assets/resources/module/help/help.prefab
  3. 2 2
      assets/resources/module/moreGame/btnMoreGame.prefab
  4. 261 167
      assets/resources/module/redCode/redCode.prefab
  5. BIN
      assets/resources/module/redCode/texture/official_btn_copy.png
  6. 0 36
      assets/resources/module/redCode/texture/official_btn_copy.png.meta
  7. BIN
      assets/resources/module/redCode/texture/official_icon_corner.png
  8. 0 36
      assets/resources/module/redCode/texture/official_icon_corner.png.meta
  9. BIN
      assets/resources/module/redCode/texture/official_img_bg.png
  10. 0 36
      assets/resources/module/redCode/texture/official_img_bg.png.meta
  11. BIN
      assets/resources/module/redCode/texture/official_img_bgSmall.png
  12. 0 36
      assets/resources/module/redCode/texture/official_img_bgSmall.png.meta
  13. BIN
      assets/resources/module/redCode/texture/official_txt_title.png
  14. 0 36
      assets/resources/module/redCode/texture/official_txt_title.png.meta
  15. BIN
      assets/resources/module/redCode/texture/xing.png
  16. 0 36
      assets/resources/module/redCode/texture/xing.png.meta
  17. 167 434
      assets/resources/module/redeem/RedeemNode.prefab
  18. BIN
      assets/resources/module/redeem/texture/common_bg_popBgStroke.png
  19. 0 36
      assets/resources/module/redeem/texture/common_bg_popBgStroke.png.meta
  20. BIN
      assets/resources/module/redeem/texture/common_btn_bigYellow.png
  21. 0 36
      assets/resources/module/redeem/texture/common_btn_bigYellow.png.meta
  22. BIN
      assets/resources/module/redeem/texture/redeem_img_bg1.png
  23. 0 36
      assets/resources/module/redeem/texture/redeem_img_bg1.png.meta
  24. BIN
      assets/resources/module/redeem/texture/redeem_img_bg2.png
  25. 0 36
      assets/resources/module/redeem/texture/redeem_img_bg2.png.meta
  26. BIN
      assets/resources/module/redeem/texture/redeem_img_bg3.png
  27. 0 36
      assets/resources/module/redeem/texture/redeem_img_bg3.png.meta
  28. BIN
      assets/resources/module/redeem/texture/redeem_img_btnyellow.png
  29. 0 36
      assets/resources/module/redeem/texture/redeem_img_btnyellow.png.meta
  30. BIN
      assets/resources/module/redeem/texture/redeem_img_itembg.png
  31. 0 36
      assets/resources/module/redeem/texture/redeem_img_itembg.png.meta
  32. BIN
      assets/resources/module/redeem/texture/redeem_img_title.png
  33. 0 36
      assets/resources/module/redeem/texture/redeem_img_title.png.meta
  34. BIN
      assets/resources/module/redeem/texture/title.png
  35. 0 36
      assets/resources/module/redeem/texture/title.png.meta
  36. 0 3
      assets/script/game/module/redeem/RedeemNode.ts

+ 12 - 12
assets/resources/module/blessingBag/blessingBag.prefab

@@ -1174,7 +1174,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "01BtU6S/ROc6pdhCqApXXW",
+    "fileId": "72KeivuwBGNKWiHOVGdQpn",
     "sync": false
   },
   {
@@ -1283,7 +1283,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "cc9XSY77xFmYlXEre9fZaO",
+    "fileId": "3cTvTf7ohFC5Ep0jnUbkS5",
     "sync": false
   },
   {
@@ -1392,7 +1392,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "ebbB8v/+dJJYoui5FdfAbP",
+    "fileId": "aaF4jtjx9CNrWhhoDMB+3s",
     "sync": false
   },
   {
@@ -2993,7 +2993,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "066IZQD75KebfketqtiNz1",
+    "fileId": "1fV2E9EdRBr7BjMO/j6fvw",
     "sync": false
   },
   {
@@ -3123,7 +3123,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "d8vbxwxeZB7ZgyUemiPxOe",
+    "fileId": "b5v5AEkVpN67qWv9LTQDkU",
     "sync": false
   },
   {
@@ -3253,7 +3253,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "0cVSq1/KFCy7ZA9UHU6siD",
+    "fileId": "e1qsgSzA5EDbXQ+8jYzv9P",
     "sync": false
   },
   {
@@ -3383,7 +3383,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "4bSVWU3NZC+pFsPCqyR4zA",
+    "fileId": "48s3vCWKlEwZ+7eEuhmvEa",
     "sync": false
   },
   {
@@ -3513,7 +3513,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "8fY66fEvlO7LGuR3KfrCM9",
+    "fileId": "bfdXY2OsVGBrw7v7nHeRaj",
     "sync": false
   },
   {
@@ -3643,7 +3643,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "4bO5qjLblL5oXbqseO1JNc",
+    "fileId": "63M+4dGwBPnqka7X36/VSz",
     "sync": false
   },
   {
@@ -3773,7 +3773,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "c7qU8y4ClLVIPioLezvF73",
+    "fileId": "7d764MSLtL0L+dsKylsy8r",
     "sync": false
   },
   {
@@ -6762,7 +6762,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "9c8v5OCnlNppKkktnaItC+",
+    "fileId": "99aml6GDRLB78tG7+YxqVN",
     "sync": false
   },
   {
@@ -6871,7 +6871,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "77cSj6I7VGTZdT6SnNvyes",
+    "fileId": "aflfwNySlE+I12zYlJcKwH",
     "sync": false
   },
   {

+ 36 - 147
assets/resources/module/help/help.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 18
       },
       {
-        "__id__": 22
+        "__id__": 19
       },
       {
-        "__id__": 23
+        "__id__": 20
       },
       {
-        "__id__": 24
+        "__id__": 21
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 22
     },
     "_opacity": 255,
     "_color": {
@@ -105,15 +105,12 @@
       },
       {
         "__id__": 12
-      },
-      {
-        "__id__": 15
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 20
+      "__id__": 17
     },
     "_opacity": 255,
     "_color": {
@@ -189,8 +186,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 592,
-      "height": 748
+      "width": 612,
+      "height": 692
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -242,7 +239,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "c3764b6f-ea22-4c3a-a9b1-fb0c25494170"
+      "__uuid__": "5d5951b0-7033-4455-8c08-28285df66248"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -271,7 +268,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "titlebg",
+    "_name": "title",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2
@@ -290,14 +287,14 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 255,
-      "b": 255,
+      "g": 229,
+      "b": 210,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 315,
-      "height": 72
+      "width": 138,
+      "height": 53
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -309,7 +306,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        321.501,
+        296,
         0,
         0,
         0,
@@ -349,7 +346,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "e46a42a2-f5da-49fc-9e21-5fb28cb7c9f6"
+      "__uuid__": "2722f6f5-e260-46ca-8a91-e6aa86173d7d"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -373,114 +370,6 @@
     "asset": {
       "__uuid__": "60241a57-78e1-4090-aa94-5cd17ec5ebe1"
     },
-    "fileId": "1a9dtNjjtH+oiOTgSVngZh",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "title",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 2
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 10
-      }
-    ],
-    "_prefab": {
-      "__id__": 11
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 104,
-      "g": 49,
-      "b": 11,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 80,
-      "height": 50.4
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        320.3,
-        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.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 9
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_string": "帮助",
-    "_N$string": "帮助",
-    "_fontSize": 40,
-    "_lineHeight": 40,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_batchAsBitmap": false,
-    "_styleFlags": 1,
-    "_underlineHeight": 0,
-    "_N$horizontalAlign": 0,
-    "_N$verticalAlign": 0,
-    "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
-    "_N$cacheMode": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "60241a57-78e1-4090-aa94-5cd17ec5ebe1"
-    },
     "fileId": "e0Yu3MIoNGX4nTVTtDRqYe",
     "sync": false
   },
@@ -495,11 +384,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 10
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 11
     },
     "_opacity": 255,
     "_color": {
@@ -511,8 +400,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 446,
-      "height": 470
+      "width": 500,
+      "height": 527
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -524,7 +413,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        11,
+        -40,
         0,
         0,
         0,
@@ -553,7 +442,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 12
+      "__id__": 9
     },
     "_enabled": true,
     "_materials": [
@@ -603,17 +492,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 13
       },
       {
-        "__id__": 17
+        "__id__": 14
       },
       {
-        "__id__": 18
+        "__id__": 15
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 16
     },
     "_opacity": 255,
     "_color": {
@@ -625,8 +514,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 78,
-      "height": 236
+      "width": 67,
+      "height": 70
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -637,8 +526,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        266.494,
-        215.93100000000004,
+        276.494,
+        323.351,
         0,
         0,
         0,
@@ -667,7 +556,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 12
     },
     "_enabled": true,
     "_materials": [
@@ -678,7 +567,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "ca6b0d14-9d7e-42c2-adb0-07269c5df201"
+      "__uuid__": "a745272d-b658-4e0c-92b0-bf7b0eafa54a"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -699,7 +588,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 12
     },
     "_enabled": true,
     "alignMode": 1,
@@ -707,7 +596,7 @@
     "_alignFlags": 1,
     "_left": 0,
     "_right": 0,
-    "_top": -333.93100000000004,
+    "_top": -358.351,
     "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
@@ -726,7 +615,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 12
     },
     "_enabled": true,
     "node_panel": {
@@ -794,7 +683,7 @@
     },
     "_enabled": true,
     "lbl_desc": {
-      "__id__": 13
+      "__id__": 10
     },
     "_id": ""
   },

+ 2 - 2
assets/resources/module/moreGame/btnMoreGame.prefab

@@ -548,7 +548,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "labMoreGameName",
+    "_name": "labDes",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -736,7 +736,7 @@
       "__id__": 6
     },
     "lab_moregame": {
-      "__id__": 16
+      "__id__": 9
     },
     "_id": ""
   },

Разлика између датотеке није приказан због своје велике величине
+ 261 - 167
assets/resources/module/redCode/redCode.prefab


BIN
assets/resources/module/redCode/texture/official_btn_copy.png


+ 0 - 36
assets/resources/module/redCode/texture/official_btn_copy.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "4c55e4b3-2ded-43ab-85a0-e8ded575ebce",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 63,
-  "height": 33,
-  "platformSettings": {},
-  "subMetas": {
-    "official_btn_copy": {
-      "ver": "1.0.4",
-      "uuid": "711b3f8a-14fe-4787-8419-7d941eeec58c",
-      "rawTextureUuid": "4c55e4b3-2ded-43ab-85a0-e8ded575ebce",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 63,
-      "height": 33,
-      "rawWidth": 63,
-      "rawHeight": 33,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

BIN
assets/resources/module/redCode/texture/official_icon_corner.png


+ 0 - 36
assets/resources/module/redCode/texture/official_icon_corner.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "5c6b6cdc-569c-4c20-82a1-eb15af65ea86",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 55,
-  "height": 46,
-  "platformSettings": {},
-  "subMetas": {
-    "official_icon_corner": {
-      "ver": "1.0.4",
-      "uuid": "2ac16911-5cd8-4c7d-ba54-a42c47911fc7",
-      "rawTextureUuid": "5c6b6cdc-569c-4c20-82a1-eb15af65ea86",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 55,
-      "height": 46,
-      "rawWidth": 55,
-      "rawHeight": 46,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

BIN
assets/resources/module/redCode/texture/official_img_bg.png


+ 0 - 36
assets/resources/module/redCode/texture/official_img_bg.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "ce8012fa-0b39-459d-a024-e78fcde059f6",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 596,
-  "height": 291,
-  "platformSettings": {},
-  "subMetas": {
-    "official_img_bg": {
-      "ver": "1.0.4",
-      "uuid": "1287a220-8d2c-456a-ac04-4bbe1939fb07",
-      "rawTextureUuid": "ce8012fa-0b39-459d-a024-e78fcde059f6",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 596,
-      "height": 291,
-      "rawWidth": 596,
-      "rawHeight": 291,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

BIN
assets/resources/module/redCode/texture/official_img_bgSmall.png


+ 0 - 36
assets/resources/module/redCode/texture/official_img_bgSmall.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "9b20ba43-5609-495e-9162-9028fce4f589",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 596,
-  "height": 107,
-  "platformSettings": {},
-  "subMetas": {
-    "official_img_bgSmall": {
-      "ver": "1.0.4",
-      "uuid": "e2f70868-bba9-4a1e-b181-2dffafc4869c",
-      "rawTextureUuid": "9b20ba43-5609-495e-9162-9028fce4f589",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 596,
-      "height": 107,
-      "rawWidth": 596,
-      "rawHeight": 107,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

BIN
assets/resources/module/redCode/texture/official_txt_title.png


+ 0 - 36
assets/resources/module/redCode/texture/official_txt_title.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "5f9ad927-5f4f-4999-a3b8-b21046cb278e",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 141,
-  "height": 77,
-  "platformSettings": {},
-  "subMetas": {
-    "official_txt_title": {
-      "ver": "1.0.4",
-      "uuid": "2755ffb4-3bf2-4959-b262-d4fd3713d795",
-      "rawTextureUuid": "5f9ad927-5f4f-4999-a3b8-b21046cb278e",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 141,
-      "height": 77,
-      "rawWidth": 141,
-      "rawHeight": 77,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

BIN
assets/resources/module/redCode/texture/xing.png


+ 0 - 36
assets/resources/module/redCode/texture/xing.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "f9095af7-c247-4332-89db-5b50e9960fc9",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 49,
-  "height": 47,
-  "platformSettings": {},
-  "subMetas": {
-    "xing": {
-      "ver": "1.0.4",
-      "uuid": "025ff662-c83a-4c42-a6aa-0a499ab35d57",
-      "rawTextureUuid": "f9095af7-c247-4332-89db-5b50e9960fc9",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 49,
-      "height": 47,
-      "rawWidth": 49,
-      "rawHeight": 47,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

Разлика између датотеке није приказан због своје велике величине
+ 167 - 434
assets/resources/module/redeem/RedeemNode.prefab


BIN
assets/resources/module/redeem/texture/common_bg_popBgStroke.png


+ 0 - 36
assets/resources/module/redeem/texture/common_bg_popBgStroke.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "c92609fd-61a7-4bc1-a50c-95c0a3a5c69a",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 749,
-  "height": 1060,
-  "platformSettings": {},
-  "subMetas": {
-    "common_bg_popBgStroke": {
-      "ver": "1.0.4",
-      "uuid": "98d360ff-6d97-4321-b89d-e61c7635baec",
-      "rawTextureUuid": "c92609fd-61a7-4bc1-a50c-95c0a3a5c69a",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 748,
-      "height": 1060,
-      "rawWidth": 749,
-      "rawHeight": 1060,
-      "borderTop": 930,
-      "borderBottom": 72,
-      "borderLeft": 39.5,
-      "borderRight": 39.5,
-      "subMetas": {}
-    }
-  }
-}

BIN
assets/resources/module/redeem/texture/common_btn_bigYellow.png


+ 0 - 36
assets/resources/module/redeem/texture/common_btn_bigYellow.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "29c44866-645a-4583-8b0f-636987b27105",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 362,
-  "height": 115,
-  "platformSettings": {},
-  "subMetas": {
-    "common_btn_bigYellow": {
-      "ver": "1.0.4",
-      "uuid": "949fe4b0-57e1-4f82-9fac-d9e2bb2c41d1",
-      "rawTextureUuid": "29c44866-645a-4583-8b0f-636987b27105",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 362,
-      "height": 115,
-      "rawWidth": 362,
-      "rawHeight": 115,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

BIN
assets/resources/module/redeem/texture/redeem_img_bg1.png


+ 0 - 36
assets/resources/module/redeem/texture/redeem_img_bg1.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "583249e8-57e6-425b-afa4-8d04692e1023",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 633,
-  "height": 405,
-  "platformSettings": {},
-  "subMetas": {
-    "redeem_img_bg1": {
-      "ver": "1.0.4",
-      "uuid": "719b7936-294b-48ad-88da-6532a2fd96c8",
-      "rawTextureUuid": "583249e8-57e6-425b-afa4-8d04692e1023",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 633,
-      "height": 405,
-      "rawWidth": 633,
-      "rawHeight": 405,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

BIN
assets/resources/module/redeem/texture/redeem_img_bg2.png


+ 0 - 36
assets/resources/module/redeem/texture/redeem_img_bg2.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "3fc95908-82c8-42d9-b313-23fae1cabbf1",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 603,
-  "height": 260,
-  "platformSettings": {},
-  "subMetas": {
-    "redeem_img_bg2": {
-      "ver": "1.0.4",
-      "uuid": "91c8fa13-8182-4e9c-8ae1-0cb249387ea3",
-      "rawTextureUuid": "3fc95908-82c8-42d9-b313-23fae1cabbf1",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 603,
-      "height": 260,
-      "rawWidth": 603,
-      "rawHeight": 260,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

BIN
assets/resources/module/redeem/texture/redeem_img_bg3.png


+ 0 - 36
assets/resources/module/redeem/texture/redeem_img_bg3.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "2f6e35e7-4dbf-41e1-90b5-74e8cc164e22",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 335,
-  "height": 61,
-  "platformSettings": {},
-  "subMetas": {
-    "redeem_img_bg3": {
-      "ver": "1.0.4",
-      "uuid": "e3c99189-6d68-4b78-a114-d3417127780d",
-      "rawTextureUuid": "2f6e35e7-4dbf-41e1-90b5-74e8cc164e22",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 335,
-      "height": 61,
-      "rawWidth": 335,
-      "rawHeight": 61,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

BIN
assets/resources/module/redeem/texture/redeem_img_btnyellow.png


+ 0 - 36
assets/resources/module/redeem/texture/redeem_img_btnyellow.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "91a2847f-c23c-4f77-be01-ddba9b83151e",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 143,
-  "height": 62,
-  "platformSettings": {},
-  "subMetas": {
-    "redeem_img_btnyellow": {
-      "ver": "1.0.4",
-      "uuid": "1f34b6da-26a6-423e-8a75-a90992bb2ebc",
-      "rawTextureUuid": "91a2847f-c23c-4f77-be01-ddba9b83151e",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 143,
-      "height": 62,
-      "rawWidth": 143,
-      "rawHeight": 62,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

BIN
assets/resources/module/redeem/texture/redeem_img_itembg.png


+ 0 - 36
assets/resources/module/redeem/texture/redeem_img_itembg.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "352f09af-0284-416c-b977-0b3704ddf50f",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 124,
-  "height": 124,
-  "platformSettings": {},
-  "subMetas": {
-    "redeem_img_itembg": {
-      "ver": "1.0.4",
-      "uuid": "bfc71802-a76d-466f-a599-c5b2c14ffaf2",
-      "rawTextureUuid": "352f09af-0284-416c-b977-0b3704ddf50f",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 124,
-      "height": 124,
-      "rawWidth": 124,
-      "rawHeight": 124,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

BIN
assets/resources/module/redeem/texture/redeem_img_title.png


+ 0 - 36
assets/resources/module/redeem/texture/redeem_img_title.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "605a6cfb-4a2d-40f7-9aa3-3b574759aa9a",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 200,
-  "height": 66,
-  "platformSettings": {},
-  "subMetas": {
-    "redeem_img_title": {
-      "ver": "1.0.4",
-      "uuid": "1ca5e06c-9055-4deb-93f4-8c8240f11554",
-      "rawTextureUuid": "605a6cfb-4a2d-40f7-9aa3-3b574759aa9a",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0.5,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 200,
-      "height": 65,
-      "rawWidth": 200,
-      "rawHeight": 66,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

BIN
assets/resources/module/redeem/texture/title.png


+ 0 - 36
assets/resources/module/redeem/texture/title.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "222600be-6afe-412f-a366-1a915a469768",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 542,
-  "height": 61,
-  "platformSettings": {},
-  "subMetas": {
-    "title": {
-      "ver": "1.0.4",
-      "uuid": "ec496b21-e57c-4294-89f4-b6401f765833",
-      "rawTextureUuid": "222600be-6afe-412f-a366-1a915a469768",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 542,
-      "height": 61,
-      "rawWidth": 542,
-      "rawHeight": 61,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

+ 0 - 3
assets/script/game/module/redeem/RedeemNode.ts

@@ -8,8 +8,6 @@ const { ccclass, property } = cc._decorator;
 export default class RichHelpPanel extends cc.Component {
 
     @property(cc.Label)
-    txtTitle: cc.Label = null;
-    @property(cc.Label)
     txtGiftName: cc.Label = null;
 
     @property(cc.Prefab)
@@ -53,7 +51,6 @@ export default class RichHelpPanel extends cc.Component {
 
     InitData() {
         let data = gData.redeem.redeemData.redemption;
-        this.txtTitle.string = data.title;
         this.txtGiftName.string = data.title;
         this.rewardData = data.content;
         for (let n of this.rds) {

Неке датотеке нису приказане због велике количине промена