薛鸿潇 5 роки тому
батько
коміт
0e89bbb129

+ 4 - 157
assets/resources/game/prefab/game.prefab

@@ -40,22 +40,19 @@
       },
       },
       {
       {
         "__id__": 103
         "__id__": 103
-      },
-      {
-        "__id__": 169
       }
       }
     ],
     ],
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
       {
       {
-        "__id__": 174
+        "__id__": 169
       },
       },
       {
       {
-        "__id__": 175
+        "__id__": 170
       }
       }
     ],
     ],
     "_prefab": {
     "_prefab": {
-      "__id__": 176
+      "__id__": 171
     },
     },
     "_opacity": 255,
     "_opacity": 255,
     "_color": {
     "_color": {
@@ -5557,7 +5554,7 @@
       "__id__": 168
       "__id__": 168
     },
     },
     "_name": "游戏核心",
     "_name": "游戏核心",
-    "_active": true,
+    "_active": false,
     "_trs": {
     "_trs": {
       "__type__": "TypedArray",
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "ctor": "Float64Array",
@@ -5594,156 +5591,6 @@
     "sync": true
     "sync": true
   },
   },
   {
   {
-    "__type__": "cc.Node",
-    "_name": "New Sprite(Splash)",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 170
-      },
-      {
-        "__id__": 171
-      },
-      {
-        "__id__": 172
-      }
-    ],
-    "_prefab": {
-      "__id__": 173
-    },
-    "_opacity": 120,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 750,
-      "height": 1334
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        0,
-        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__": 169
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
-    },
-    "_type": 0,
-    "_sizeMode": 0,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 169
-    },
-    "_enabled": true,
-    "alignMode": 1,
-    "_target": null,
-    "_alignFlags": 45,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_verticalCenter": 0,
-    "_horizontalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 100,
-    "_originalHeight": 100,
-    "_id": ""
-  },
-  {
-    "__type__": "173866Ll/lFN6TBCxDmQuqC",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 169
-    },
-    "_enabled": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
-    },
-    "fileId": "bcPb2LU2dPzbat3DDe4pVw",
-    "sync": false
-  },
-  {
     "__type__": "8760dQYasROwLaLe1idTS07",
     "__type__": "8760dQYasROwLaLe1idTS07",
     "_name": "",
     "_name": "",
     "_objFlags": 0,
     "_objFlags": 0,

+ 3 - 158
assets/resources/module/login/login.prefab

@@ -25,22 +25,19 @@
       },
       },
       {
       {
         "__id__": 10
         "__id__": 10
-      },
-      {
-        "__id__": 43
       }
       }
     ],
     ],
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
       {
       {
-        "__id__": 48
+        "__id__": 43
       },
       },
       {
       {
-        "__id__": 49
+        "__id__": 44
       }
       }
     ],
     ],
     "_prefab": {
     "_prefab": {
-      "__id__": 50
+      "__id__": 45
     },
     },
     "_opacity": 255,
     "_opacity": 255,
     "_color": {
     "_color": {
@@ -1560,158 +1557,6 @@
     "sync": false
     "sync": false
   },
   },
   {
   {
-    "__type__": "cc.Node",
-    "_name": "New Sprite(Splash)",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 44
-      },
-      {
-        "__id__": 45
-      },
-      {
-        "__id__": 46
-      }
-    ],
-    "_prefab": {
-      "__id__": 47
-    },
-    "_opacity": 120,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 750,
-      "height": 1334
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        0,
-        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__": 43
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
-    },
-    "_type": 0,
-    "_sizeMode": 0,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 43
-    },
-    "_enabled": true,
-    "alignMode": 1,
-    "_target": {
-      "__id__": 1
-    },
-    "_alignFlags": 45,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 0,
-    "_verticalCenter": 0,
-    "_horizontalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 100,
-    "_originalHeight": 100,
-    "_id": ""
-  },
-  {
-    "__type__": "173866Ll/lFN6TBCxDmQuqC",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 43
-    },
-    "_enabled": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
-    },
-    "fileId": "9d84Q3ECtESYen1za0JRz1",
-    "sync": false
-  },
-  {
     "__type__": "6dba2tWf41JpYkegatfLoGC",
     "__type__": "6dba2tWf41JpYkegatfLoGC",
     "_name": "",
     "_name": "",
     "_objFlags": 0,
     "_objFlags": 0,

+ 2 - 1
assets/script/game/module/reward/Reward.ts

@@ -148,6 +148,7 @@ export default class Reward extends cc.Component {
      */
      */
     private async watchVideoCall() {
     private async watchVideoCall() {
         if (gData.reward.adData) {
         if (gData.reward.adData) {
+            // 气泡视频奖励 通关视频奖励 
             gData.reward.data = gData.reward.adData.videoRedMoney.videoRewardList;
             gData.reward.data = gData.reward.adData.videoRedMoney.videoRewardList;
         }
         }
         if (!gData.reward.data || !gData.reward.data.length) return;
         if (!gData.reward.data || !gData.reward.data.length) return;
@@ -165,7 +166,7 @@ export default class Reward extends cc.Component {
                 }
                 }
             }
             }
         }
         }
-        cc.log(gData.reward.data)
+        
         // 图标展示
         // 图标展示
         if (gData.reward.data[0].rewardType === RewardType.redBag) {
         if (gData.reward.data[0].rewardType === RewardType.redBag) {
             this.node_coin.spriteFrame = await mk.loader.load('game/texture/coin/' + RewardType.redBag, cc.SpriteFrame);
             this.node_coin.spriteFrame = await mk.loader.load('game/texture/coin/' + RewardType.redBag, cc.SpriteFrame);