diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index 0b72564..9e23885 100644 --- a/assets/Scene/GameScene.fire +++ b/assets/Scene/GameScene.fire @@ -17,7 +17,7 @@ "__id__": 2 }, { - "__id__": 1182 + "__id__": 1187 } ], "_active": false, @@ -84,25 +84,25 @@ "__id__": 1037 }, { - "__id__": 1159 + "__id__": 1164 }, { - "__id__": 1172 + "__id__": 1177 } ], "_active": true, "_components": [ { - "__id__": 1178 + "__id__": 1183 }, { - "__id__": 1179 + "__id__": 1184 }, { - "__id__": 1180 + "__id__": 1185 }, { - "__id__": 1181 + "__id__": 1186 } ], "_prefab": null, @@ -49113,12 +49113,15 @@ }, { "__id__": 1123 + }, + { + "__id__": 1158 } ], "_active": false, "_components": [ { - "__id__": 1158 + "__id__": 1163 } ], "_prefab": null, @@ -54879,6 +54882,217 @@ "_originalHeight": 1920, "_id": "73AcxN4iVLWadelL+ShqIS" }, + { + "__type__": "cc.Node", + "_name": "share", + "_objFlags": 0, + "_parent": { + "__id__": 1037 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1159 + }, + { + "__id__": 1160 + }, + { + "__id__": 1161 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 608, + "height": 122 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -780, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "b7ky+hHi1MC7xa7s9UZjpO" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1158 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "6b170755-619c-4323-9ec4-5ff07e004765" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "77b8GrOldKoJoB8T4Srr7+" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1158 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 32, + "_left": 485.8, + "_right": -304, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_id": "4bj20HkMtOVLODhBArim04" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1158 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.1, + "clickEvents": [ + { + "__id__": 1162 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 1158 + }, + "_id": "a0K19zgBNDpaq71mWiEama" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 2 + }, + "component": "", + "_componentId": "80998T1AYNNRZdRxsVvXR65", + "handler": "shareFriend", + "customEventData": "" + }, { "__type__": "19d952d5kVBrLSzAIGeElFK", "_name": "", @@ -54913,23 +55127,23 @@ }, "_children": [ { - "__id__": 1160 + "__id__": 1165 }, { - "__id__": 1164 + "__id__": 1169 }, { - "__id__": 1167 + "__id__": 1172 } ], "_active": false, "_components": [ { - "__id__": 1170 + "__id__": 1175 } ], "_prefab": { - "__id__": 1171 + "__id__": 1176 }, "_opacity": 255, "_color": { @@ -54983,20 +55197,20 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 1159 + "__id__": 1164 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1161 + "__id__": 1166 }, { - "__id__": 1162 + "__id__": 1167 } ], "_prefab": { - "__id__": 1163 + "__id__": 1168 }, "_opacity": 120, "_color": { @@ -55050,7 +55264,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1160 + "__id__": 1165 }, "_enabled": true, "_materials": [ @@ -55082,7 +55296,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1160 + "__id__": 1165 }, "_enabled": true, "_id": "fdcyqVHbdJ6qjXrnxAvDP2" @@ -55090,7 +55304,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1159 + "__id__": 1164 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -55103,17 +55317,17 @@ "_name": "load", "_objFlags": 0, "_parent": { - "__id__": 1159 + "__id__": 1164 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1165 + "__id__": 1170 } ], "_prefab": { - "__id__": 1166 + "__id__": 1171 }, "_opacity": 255, "_color": { @@ -55167,7 +55381,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1164 + "__id__": 1169 }, "_enabled": true, "_materials": [ @@ -55197,7 +55411,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1159 + "__id__": 1164 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -55210,17 +55424,17 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 1159 + "__id__": 1164 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1168 + "__id__": 1173 } ], "_prefab": { - "__id__": 1169 + "__id__": 1174 }, "_opacity": 255, "_color": { @@ -55274,7 +55488,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1167 + "__id__": 1172 }, "_enabled": true, "_materials": [ @@ -55305,7 +55519,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1159 + "__id__": 1164 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -55318,7 +55532,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1159 + "__id__": 1164 }, "_enabled": true, "alignMode": 1, @@ -55343,7 +55557,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1159 + "__id__": 1164 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -55360,16 +55574,16 @@ }, "_children": [ { - "__id__": 1173 + "__id__": 1178 } ], "_active": false, "_components": [ { - "__id__": 1176 + "__id__": 1181 }, { - "__id__": 1177 + "__id__": 1182 } ], "_prefab": null, @@ -55425,16 +55639,16 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 1172 + "__id__": 1177 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1174 + "__id__": 1179 }, { - "__id__": 1175 + "__id__": 1180 } ], "_prefab": null, @@ -55490,7 +55704,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1173 + "__id__": 1178 }, "_enabled": true, "_materials": [ @@ -55522,7 +55736,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1173 + "__id__": 1178 }, "_enabled": true, "_id": "4fwjz1lnFLD45L1lqUY038" @@ -55532,7 +55746,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1172 + "__id__": 1177 }, "_enabled": true, "_materials": [ @@ -55574,7 +55788,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1172 + "__id__": 1177 }, "_enabled": false, "_id": "00qpMLeBFNhYRX9r3QZvyP" @@ -55688,7 +55902,7 @@ "_active": true, "_components": [ { - "__id__": 1183 + "__id__": 1188 } ], "_prefab": null, @@ -55744,7 +55958,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1182 + "__id__": 1187 }, "_enabled": true, "_materials": [ diff --git a/assets/action_bundle/prefab/dailyQuests.prefab b/assets/action_bundle/prefab/dailyQuests.prefab index b844a45..ea125ae 100644 --- a/assets/action_bundle/prefab/dailyQuests.prefab +++ b/assets/action_bundle/prefab/dailyQuests.prefab @@ -39,29 +39,29 @@ "__id__": 236 }, { - "__id__": 241 + "__id__": 238 + }, + { + "__id__": 243 }, { "__id__": 246 }, { - "__id__": 249 - }, - { - "__id__": 262 + "__id__": 259 } ], "_active": true, "_components": [ { - "__id__": 286 + "__id__": 283 }, { - "__id__": 287 + "__id__": 284 } ], "_prefab": { - "__id__": 288 + "__id__": 285 }, "_opacity": 255, "_color": { @@ -3665,7 +3665,7 @@ 1, 1, 1, - 1 + 0 ] }, "_eulerAngles": { @@ -8881,16 +8881,9 @@ }, "_children": [], "_active": false, - "_components": [ - { - "__id__": 237 - }, - { - "__id__": 238 - } - ], + "_components": [], "_prefab": { - "__id__": 240 + "__id__": 237 }, "_opacity": 255, "_color": { @@ -8939,124 +8932,6 @@ "groupIndex": 0, "_id": "" }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 236 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "e58fcacb-1189-4c5c-a0c0-4d2ef8fe52ad" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "2e466cd1-95aa-4e3c-bb69-759c50404dd1" - }, - "_id": "" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 236 - }, - "_enabled": true, - "_normalMaterial": null, - "_grayMaterial": null, - "duration": 0.1, - "zoomScale": 1.1, - "clickEvents": [ - { - "__id__": 239 - } - ], - "_N$interactable": true, - "_N$enableAutoGrayEffect": false, - "_N$transition": 3, - "transition": 3, - "_N$normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_N$hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_N$normalSprite": null, - "_N$pressedSprite": null, - "pressedSprite": null, - "_N$hoverSprite": null, - "hoverSprite": null, - "_N$disabledSprite": null, - "_N$target": { - "__id__": 236 - }, - "_id": "" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 1 - }, - "component": "", - "_componentId": "85d4dxmxudMdYZYkFIP8dCp", - "handler": "getAllReward", - "customEventData": "" - }, { "__type__": "cc.PrefabInfo", "root": { @@ -9079,14 +8954,14 @@ "_active": true, "_components": [ { - "__id__": 242 + "__id__": 239 }, { - "__id__": 243 + "__id__": 240 } ], "_prefab": { - "__id__": 245 + "__id__": 242 }, "_opacity": 255, "_color": { @@ -9140,7 +9015,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 241 + "__id__": 238 }, "_enabled": true, "_materials": [ @@ -9174,7 +9049,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 241 + "__id__": 238 }, "_enabled": true, "_normalMaterial": null, @@ -9183,7 +9058,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 244 + "__id__": 241 } ], "_N$interactable": true, @@ -9239,7 +9114,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 241 + "__id__": 238 }, "_id": "" }, @@ -9275,11 +9150,11 @@ "_active": false, "_components": [ { - "__id__": 247 + "__id__": 244 } ], "_prefab": { - "__id__": 248 + "__id__": 245 }, "_opacity": 255, "_color": { @@ -9333,7 +9208,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 246 + "__id__": 243 }, "_enabled": true, "_materials": [ @@ -9380,23 +9255,23 @@ }, "_children": [ { - "__id__": 250 + "__id__": 247 + }, + { + "__id__": 251 }, { "__id__": 254 - }, - { - "__id__": 257 } ], "_active": false, "_components": [ { - "__id__": 260 + "__id__": 257 } ], "_prefab": { - "__id__": 261 + "__id__": 258 }, "_opacity": 255, "_color": { @@ -9450,20 +9325,20 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 249 + "__id__": 246 }, "_children": [], "_active": true, "_components": [ { - "__id__": 251 + "__id__": 248 }, { - "__id__": 252 + "__id__": 249 } ], "_prefab": { - "__id__": 253 + "__id__": 250 }, "_opacity": 120, "_color": { @@ -9517,7 +9392,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 250 + "__id__": 247 }, "_enabled": true, "_materials": [ @@ -9549,7 +9424,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 250 + "__id__": 247 }, "_enabled": true, "_id": "" @@ -9557,7 +9432,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 249 + "__id__": 246 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -9570,17 +9445,17 @@ "_name": "load", "_objFlags": 0, "_parent": { - "__id__": 249 + "__id__": 246 }, "_children": [], "_active": true, "_components": [ { - "__id__": 255 + "__id__": 252 } ], "_prefab": { - "__id__": 256 + "__id__": 253 }, "_opacity": 255, "_color": { @@ -9634,7 +9509,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 254 + "__id__": 251 }, "_enabled": true, "_materials": [ @@ -9664,7 +9539,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 249 + "__id__": 246 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -9677,17 +9552,17 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 249 + "__id__": 246 }, "_children": [], "_active": true, "_components": [ { - "__id__": 258 + "__id__": 255 } ], "_prefab": { - "__id__": 259 + "__id__": 256 }, "_opacity": 255, "_color": { @@ -9741,7 +9616,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 257 + "__id__": 254 }, "_enabled": true, "_materials": [ @@ -9772,7 +9647,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 249 + "__id__": 246 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -9785,7 +9660,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 249 + "__id__": 246 }, "_enabled": true, "alignMode": 1, @@ -9810,7 +9685,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 249 + "__id__": 246 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -9827,7 +9702,10 @@ }, "_children": [ { - "__id__": 263 + "__id__": 260 + }, + { + "__id__": 264 }, { "__id__": 267 @@ -9837,19 +9715,16 @@ }, { "__id__": 273 - }, - { - "__id__": 276 } ], "_active": false, "_components": [ { - "__id__": 284 + "__id__": 281 } ], "_prefab": { - "__id__": 285 + "__id__": 282 }, "_opacity": 255, "_color": { @@ -9903,20 +9778,20 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 262 + "__id__": 259 }, "_children": [], "_active": true, "_components": [ { - "__id__": 264 + "__id__": 261 }, { - "__id__": 265 + "__id__": 262 } ], "_prefab": { - "__id__": 266 + "__id__": 263 }, "_opacity": 120, "_color": { @@ -9970,7 +9845,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 263 + "__id__": 260 }, "_enabled": true, "_materials": [ @@ -10002,7 +9877,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 263 + "__id__": 260 }, "_enabled": true, "_id": "" @@ -10010,7 +9885,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 262 + "__id__": 259 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -10023,17 +9898,17 @@ "_name": "bg", "_objFlags": 0, "_parent": { - "__id__": 262 + "__id__": 259 }, "_children": [], "_active": true, "_components": [ { - "__id__": 268 + "__id__": 265 } ], "_prefab": { - "__id__": 269 + "__id__": 266 }, "_opacity": 255, "_color": { @@ -10087,7 +9962,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 267 + "__id__": 264 }, "_enabled": true, "_materials": [ @@ -10117,7 +9992,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 262 + "__id__": 259 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -10130,17 +10005,17 @@ "_name": "title", "_objFlags": 0, "_parent": { - "__id__": 262 + "__id__": 259 }, "_children": [], "_active": true, "_components": [ { - "__id__": 271 + "__id__": 268 } ], "_prefab": { - "__id__": 272 + "__id__": 269 }, "_opacity": 255, "_color": { @@ -10194,7 +10069,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 270 + "__id__": 267 }, "_enabled": true, "_materials": [ @@ -10225,7 +10100,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 262 + "__id__": 259 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -10238,17 +10113,17 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 262 + "__id__": 259 }, "_children": [], "_active": true, "_components": [ { - "__id__": 274 + "__id__": 271 } ], "_prefab": { - "__id__": 275 + "__id__": 272 }, "_opacity": 255, "_color": { @@ -10302,7 +10177,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 273 + "__id__": 270 }, "_enabled": true, "_materials": [ @@ -10333,7 +10208,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 262 + "__id__": 259 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -10346,24 +10221,24 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 262 + "__id__": 259 }, "_children": [ { - "__id__": 277 + "__id__": 274 } ], "_active": true, "_components": [ { - "__id__": 280 + "__id__": 277 }, { - "__id__": 281 + "__id__": 278 } ], "_prefab": { - "__id__": 283 + "__id__": 280 }, "_opacity": 255, "_color": { @@ -10417,17 +10292,17 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 276 + "__id__": 273 }, "_children": [], "_active": true, "_components": [ { - "__id__": 278 + "__id__": 275 } ], "_prefab": { - "__id__": 279 + "__id__": 276 }, "_opacity": 255, "_color": { @@ -10481,7 +10356,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 277 + "__id__": 274 }, "_enabled": true, "_materials": [ @@ -10512,7 +10387,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 262 + "__id__": 259 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -10525,7 +10400,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 276 + "__id__": 273 }, "_enabled": true, "_materials": [ @@ -10557,7 +10432,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 276 + "__id__": 273 }, "_enabled": true, "_normalMaterial": null, @@ -10566,7 +10441,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 282 + "__id__": 279 } ], "_N$interactable": true, @@ -10622,7 +10497,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 276 + "__id__": 273 }, "_id": "" }, @@ -10639,7 +10514,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 262 + "__id__": 259 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" @@ -10652,7 +10527,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 262 + "__id__": 259 }, "_enabled": true, "alignMode": 1, @@ -10677,7 +10552,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 262 + "__id__": 259 }, "asset": { "__uuid__": "9fdc6671-8422-410b-b9af-36dab20f1488" diff --git a/assets/action_bundle/script/DailyQuests.ts b/assets/action_bundle/script/DailyQuests.ts index e59da10..678792e 100644 --- a/assets/action_bundle/script/DailyQuests.ts +++ b/assets/action_bundle/script/DailyQuests.ts @@ -173,11 +173,12 @@ export default class DailyQuests extends cc.Component { //領取獎勵 openReward(name, res) { + console.log("获取奖励名称", name); let data = null; if (name == "levelPass") { data = [ { type: "coin", count: 100 }, - { type: "freeze", count: 2 } + { type: "freeze", count: 1 } ] let data2 = { id: 0, @@ -236,6 +237,7 @@ export default class DailyQuests extends cc.Component { "freeze": shuju.freeze || 0, "hammer": shuju.hammer || 0, "magic_wand": shuju.magic || 0, + "infinite_health": shuju.infinite_health || 0, "price": 0 } this.getShopProp(propData); @@ -243,6 +245,7 @@ export default class DailyQuests extends cc.Component { cc.fx.GameTool.changeCoin(shuju.coin); } if (shuju.infinite_health > 0) { + console.log("_______获得无限体力时间:", shuju.infinite_health, name); cc.fx.GameTool.setUserPowerTime(shuju.infinite_health); } @@ -357,9 +360,11 @@ export default class DailyQuests extends cc.Component { this.touchStart = false; this.reward = true; let shuju = [data]; + this.openLoad(); Utils.getDailyQuestReward(shuju, (res) => { this.touchStart = true; this.reward = false; + this.closeLoad(); if (res.code == 1) { let dataNode = null; for (let i = 0; i < this.content.children.length; i++) { @@ -385,8 +390,13 @@ export default class DailyQuests extends cc.Component { } }) setTimeout(() => { - if (this.reward == true && this.touchStart == false) { - this.touchStart = true; + if (this.node) { + this.node.getChildByName("Loading").active = true + if (this.reward == true && this.touchStart == false && this.node.getChildByName("Loading").active == true) { + this.touchStart = true; + this.closeLoad(); + MiniGameSdk.API.showToast("网络异常,领取奖励失败"); + } } }, 5000); } @@ -505,33 +515,55 @@ export default class DailyQuests extends cc.Component { //@ts-ignore if ((typeof wx !== 'undefined' && wx !== null) || (typeof tt !== 'undefined' && tt !== null)) { const num = 0; - console.log("_________道具增加的数量为:", num); + const timestamp = Date.now(); + console.log("_________道具增加的数量为:", propData); cc.fx.GameConfig.GM_INFO.freezeAmount += propData.freeze; cc.fx.GameConfig.GM_INFO.hammerAmount += propData.hammer; cc.fx.GameConfig.GM_INFO.magicAmount += propData.magic_wand; + let propInfo = cc.fx.StorageMessage.getStorage("prop"); + propInfo.hammerAmount = cc.fx.GameConfig.GM_INFO.hammerAmount; + propInfo.magicAmount = cc.fx.GameConfig.GM_INFO.magicAmount; + propInfo.freezeAmount = cc.fx.GameConfig.GM_INFO.freezeAmount; + propInfo.timestamp = timestamp; + cc.fx.StorageMessage.setStorage("prop", propInfo); cc.fx.GameTool.setUserProp(0, num, (data) => { }) - const data1 = { - change_reason: "quests", - id: 2001, - num: propData.freeze, - compensate: false + if (propData.freeze > 0) { + const data1 = { + change_reason: "quests", + id: 2001, + num: propData.freeze, + compensate: false + } + cc.fx.GameTool.shushu_Track("resource_get", data1); } - cc.fx.GameTool.shushu_Track("resource_get", data1); - const data2 = { - change_reason: "quests", - id: 2002, - num: propData.hammer, - compensate: false + else if (propData.hammer > 0) { + const data2 = { + change_reason: "quests", + id: 2002, + num: propData.hammer, + compensate: false + } + cc.fx.GameTool.shushu_Track("resource_get", data2); } - cc.fx.GameTool.shushu_Track("resource_get", data2); - const data3 = { - change_reason: "quests", - id: 2003, - num: propData.magic_wand, - compensate: false + else if (propData.magic_wand > 0) { + const data3 = { + change_reason: "quests", + id: 2003, + num: propData.magic_wand, + compensate: false + } + cc.fx.GameTool.shushu_Track("resource_get", data3); + } + else if (propData.infinite_health > 0) { + const data4 = { + change_reason: "quests", + id: 2004, + num: propData.infinite_health, + compensate: false + } + cc.fx.GameTool.shushu_Track("resource_get", data4); } - cc.fx.GameTool.shushu_Track("resource_get", data3); } }