From 346db058b3a00abde19c7e83a0538e7df2afcce5 Mon Sep 17 00:00:00 2001 From: "guoqing.zhu" <1521292690@qq.com> Date: Wed, 15 Jun 2022 18:13:33 +0800 Subject: [PATCH] UPDATE --- assets/LoginScene.fire | 913 ++++++++++++++++++ .../prefabs/UIPrefab/levelup_anim.prefab | 16 +- assets/scripts/game/gameConfig.js | 225 ++--- 3 files changed, 1006 insertions(+), 148 deletions(-) diff --git a/assets/LoginScene.fire b/assets/LoginScene.fire index c9cf5009..29b3fa0f 100644 --- a/assets/LoginScene.fire +++ b/assets/LoginScene.fire @@ -21,6 +21,9 @@ }, { "__id__": 454 + }, + { + "__id__": 474 } ], "_active": false, @@ -16926,5 +16929,915 @@ "__id__": 462 }, "_id": "05TaMyrQFC94fiqLqhZuUd" + }, + { + "__type__": "cc.Node", + "_name": "levelup_anim", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 475 + }, + { + "__id__": 480 + } + ], + "_active": true, + "_level": 1, + "_components": [ + { + "__id__": 499 + }, + { + "__id__": 500 + } + ], + "_prefab": { + "__id__": 501 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1024, + "height": 512 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 512, + "y": 256, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "4aM+J3rE5EbYLZ7MU2p8w+" + }, + { + "__type__": "cc.Node", + "_name": "New Sprite(Splash)", + "_objFlags": 0, + "_parent": { + "__id__": 474 + }, + "_children": [], + "_active": true, + "_level": 2, + "_components": [ + { + "__id__": 476 + }, + { + "__id__": 477 + }, + { + "__id__": 478 + } + ], + "_prefab": { + "__id__": 479 + }, + "_opacity": 80, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1024, + "height": 512 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "84BtR4oyNLSp09mWuwfbfz" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 475 + }, + "_enabled": true, + "_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, + "_state": 0, + "_atlas": null, + "_tilecount": 1, + "_tileoffx": 0, + "_tileoffy": 0, + "_id": "99rhZ3HGlHAJFTIDQzjiEF" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 475 + }, + "_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": "d6rn7kpY5NYIQ8WybY/NXs" + }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 475 + }, + "_enabled": true, + "_id": "a4IEurxSVA04VXx3KKSFDK" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 474 + }, + "asset": { + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" + }, + "fileId": "edfh6OgipKao3+xQkcUZnD", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "an_levelup", + "_objFlags": 0, + "_parent": { + "__id__": 474 + }, + "_children": [ + { + "__id__": 481 + } + ], + "_active": true, + "_level": 2, + "_components": [ + { + "__id__": 496 + }, + { + "__id__": 497 + } + ], + "_prefab": { + "__id__": 498 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "81aNeP7BlLOLx7YUEWUkve" + }, + { + "__type__": "cc.Node", + "_name": "levelup", + "_objFlags": 0, + "_parent": { + "__id__": 480 + }, + "_children": [ + { + "__id__": 482 + }, + { + "__id__": 485 + }, + { + "__id__": 488 + }, + { + "__id__": 491 + } + ], + "_active": true, + "_level": 2, + "_components": [ + { + "__id__": 494 + } + ], + "_prefab": { + "__id__": 495 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 262, + "height": 73 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "17gYjvovlAY5zZpcfYqmk5" + }, + { + "__type__": "cc.Node", + "_name": "xiaojiantou_1", + "_objFlags": 0, + "_parent": { + "__id__": 481 + }, + "_children": [], + "_active": true, + "_level": 3, + "_components": [ + { + "__id__": 483 + } + ], + "_prefab": { + "__id__": 484 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 48, + "height": 44 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 136.7, + "y": 15.5, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "b92ieXFD5E+Zap8A9lFSji" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 482 + }, + "_enabled": true, + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "4cddf1b0-817c-4a42-b104-5aa75f96e2b2" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_state": 0, + "_atlas": null, + "_tilecount": 1, + "_tileoffx": 0, + "_tileoffy": 0, + "_id": "44NZXAUgxJ0qEdBmFW9hPr" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 474 + }, + "asset": { + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" + }, + "fileId": "57/mVMgypKurxH+KF3Duft", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "xiaojiantou_2", + "_objFlags": 0, + "_parent": { + "__id__": 481 + }, + "_children": [], + "_active": true, + "_level": 3, + "_components": [ + { + "__id__": 486 + } + ], + "_prefab": { + "__id__": 487 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 48, + "height": 44 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 136.7, + "y": 4.5, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "fd2MStNP1Bf4pK3iXAnSJs" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 485 + }, + "_enabled": true, + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "4cddf1b0-817c-4a42-b104-5aa75f96e2b2" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_state": 0, + "_atlas": null, + "_tilecount": 1, + "_tileoffx": 0, + "_tileoffy": 0, + "_id": "05v5Au7jFEd6tU41aNEAvz" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 474 + }, + "asset": { + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" + }, + "fileId": "b8mtqJ9T9PA4ISsVpNOf+q", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "xiaojiantou_3", + "_objFlags": 0, + "_parent": { + "__id__": 481 + }, + "_children": [], + "_active": true, + "_level": 3, + "_components": [ + { + "__id__": 489 + } + ], + "_prefab": { + "__id__": 490 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 48, + "height": 44 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 136.7, + "y": -6.5, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "58+F9s9JhIwKylbcbaVeeo" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 488 + }, + "_enabled": true, + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "4cddf1b0-817c-4a42-b104-5aa75f96e2b2" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_state": 0, + "_atlas": null, + "_tilecount": 1, + "_tileoffx": 0, + "_tileoffy": 0, + "_id": "99bSGWlMBIM4k9Y/j/+5iN" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 474 + }, + "asset": { + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" + }, + "fileId": "20m4MMrdRK86OsYUr090St", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "xiaojiantou_4", + "_objFlags": 0, + "_parent": { + "__id__": 481 + }, + "_children": [], + "_active": true, + "_level": 3, + "_components": [ + { + "__id__": 492 + } + ], + "_prefab": { + "__id__": 493 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 48, + "height": 44 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 136.7, + "y": -17.5, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "48lU5Z7RNKtIc86MaMXwDe" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 491 + }, + "_enabled": true, + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "4cddf1b0-817c-4a42-b104-5aa75f96e2b2" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_state": 0, + "_atlas": null, + "_tilecount": 1, + "_tileoffx": 0, + "_tileoffy": 0, + "_id": "632bCCrtZAz7W/dLgTX/ls" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 474 + }, + "asset": { + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" + }, + "fileId": "b0CICZ5+FAPqlQBoX8v9gL", + "sync": false + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 481 + }, + "_enabled": true, + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "015b1137-69cb-4b52-bd72-b340203c1cac" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_state": 0, + "_atlas": null, + "_tilecount": 1, + "_tileoffx": 0, + "_tileoffy": 0, + "_id": "1bAFNqfNBA7b9tFx1+BteZ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 474 + }, + "asset": { + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" + }, + "fileId": "06SlBBOwpNBqfxqTZ0p2RM", + "sync": false + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 480 + }, + "_enabled": true, + "_defaultClip": { + "__uuid__": "d2cd24ac-cd3b-4f47-85eb-a48588d1532d" + }, + "_clips": [ + { + "__uuid__": "d2cd24ac-cd3b-4f47-85eb-a48588d1532d" + } + ], + "playOnLoad": true, + "_id": "e1h10l3o9FBbW/PSODwcf3" + }, + { + "__type__": "961ab4XGqFFqJIM0Oza3rmy", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 480 + }, + "_enabled": true, + "needfade": true, + "_id": "adM2NxAVJDtryAbdn/u28S" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 474 + }, + "asset": { + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" + }, + "fileId": "c7ChQQyBZI2rPmrs+cJ6UN", + "sync": false + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 474 + }, + "_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": 0, + "_originalHeight": 0, + "_id": "f1NIZ6k4VGG6YN7+eD0uje" + }, + { + "__type__": "5ef00R8G6RGp5cxYbUtxkNS", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 474 + }, + "_enabled": true, + "_id": "09InHVv7FA9I+fve+0sdTz" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 474 + }, + "asset": { + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" + }, + "fileId": "b8gTD6ZBNByYtiUsf6o9nu", + "sync": false } ] \ No newline at end of file diff --git a/assets/resources/prefabs/UIPrefab/levelup_anim.prefab b/assets/resources/prefabs/UIPrefab/levelup_anim.prefab index edb18664..af8c13da 100644 --- a/assets/resources/prefabs/UIPrefab/levelup_anim.prefab +++ b/assets/resources/prefabs/UIPrefab/levelup_anim.prefab @@ -222,7 +222,7 @@ "__id__": 1 }, "asset": { - "__id__": 0 + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" }, "fileId": "edfh6OgipKao3+xQkcUZnD", "sync": false @@ -470,7 +470,7 @@ "__id__": 1 }, "asset": { - "__id__": 0 + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" }, "fileId": "57/mVMgypKurxH+KF3Duft", "sync": false @@ -574,7 +574,7 @@ "__id__": 1 }, "asset": { - "__id__": 0 + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" }, "fileId": "b8mtqJ9T9PA4ISsVpNOf+q", "sync": false @@ -678,7 +678,7 @@ "__id__": 1 }, "asset": { - "__id__": 0 + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" }, "fileId": "20m4MMrdRK86OsYUr090St", "sync": false @@ -782,7 +782,7 @@ "__id__": 1 }, "asset": { - "__id__": 0 + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" }, "fileId": "b0CICZ5+FAPqlQBoX8v9gL", "sync": false @@ -824,7 +824,7 @@ "__id__": 1 }, "asset": { - "__id__": 0 + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" }, "fileId": "06SlBBOwpNBqfxqTZ0p2RM", "sync": false @@ -865,7 +865,7 @@ "__id__": 1 }, "asset": { - "__id__": 0 + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" }, "fileId": "c7ChQQyBZI2rPmrs+cJ6UN", "sync": false @@ -913,7 +913,7 @@ "__id__": 1 }, "asset": { - "__id__": 0 + "__uuid__": "bbca1d4d-3115-4f44-8156-96e20a3b5ebe" }, "fileId": "b8gTD6ZBNByYtiUsf6o9nu", "sync": false diff --git a/assets/scripts/game/gameConfig.js b/assets/scripts/game/gameConfig.js index bc36772d..f4a2d5fc 100644 --- a/assets/scripts/game/gameConfig.js +++ b/assets/scripts/game/gameConfig.js @@ -17589,7 +17589,7 @@ var DropItemConfig = { model: 'equip4_2', quality: 2, id: 30402, - def: 7, + def: 6, }, 30403: { name: 'Level 3 Vest', @@ -17680,7 +17680,7 @@ var DropItemConfig = { model: 'equip4_5', quality: 2, id: 30405, - def: 7, + def: 6, }, }; var HouseConfig = { @@ -25109,7 +25109,7 @@ var DropConfig = { }, 10000: { item_id: 10004.0, - num: 1.0, + num: 10.0, type: 1, weight: 10000.0, drop_id: 10000, @@ -25436,6 +25436,7 @@ var all_ItemConfig = { 30500: { hero_head: 50005, diamond: 0, + init_tili: 100, name: 'Miffy', gold: 50, getway: 1, @@ -25488,6 +25489,7 @@ var all_ItemConfig = { 30300: { hero_head: 50003, diamond: 0, + init_tili: 100, name: 'Aoi', gold: 50, getway: 1, @@ -25508,6 +25510,7 @@ var all_ItemConfig = { 30900: { hero_head: 50009, diamond: 0, + init_tili: 100, name: 'Lazar', gold: 50, getway: 1, @@ -25582,6 +25585,7 @@ var all_ItemConfig = { 30600: { hero_head: 50006, diamond: 0, + init_tili: 100, name: 'Canoe', gold: 50, getway: 1, @@ -25623,6 +25627,7 @@ var all_ItemConfig = { 30700: { hero_head: 50007, diamond: 0, + init_tili: 100, name: 'Mariana', gold: 50, getway: 1, @@ -25633,6 +25638,7 @@ var all_ItemConfig = { 31000: { hero_head: 50010, diamond: 0, + init_tili: 100, name: 'Kurosawa', gold: 50, getway: 1, @@ -25746,6 +25752,7 @@ var all_ItemConfig = { 30100: { hero_head: 50001, diamond: 0, + init_tili: 100, name: 'Hill', gold: 50, getway: 1, @@ -25985,7 +25992,7 @@ var all_ItemConfig = { id: 70002, relationship: 20211, attrs: '3:1:100|6:1:500|9:1:650|10:1:100|13:1:300|14:1:1000|35:2:5|37:1:200', - init_durability: 0, + init_durability: 100, getway: 1, type: 7, sub_type: 2, @@ -25998,7 +26005,7 @@ var all_ItemConfig = { id: 70003, relationship: 20311, attrs: '3:1:100|6:1:500|9:1:650|10:1:100|13:1:300|14:1:1000|35:2:5|37:1:200', - init_durability: 0, + init_durability: 100, getway: 1, type: 7, sub_type: 3, @@ -26011,7 +26018,7 @@ var all_ItemConfig = { id: 70001, relationship: 20111, attrs: '3:1:100|6:1:500|9:1:650|10:1:100|13:1:300|14:1:1000|35:2:5|37:1:200', - init_durability: 0, + init_durability: 100, getway: 1, type: 7, sub_type: 1, @@ -26024,7 +26031,7 @@ var all_ItemConfig = { id: 70006, relationship: 20511, attrs: '3:1:100|6:1:500|9:1:650|10:1:100|13:1:300|14:1:1000|35:2:5|37:1:200', - init_durability: 0, + init_durability: 100, getway: 1, type: 7, sub_type: 6, @@ -26037,7 +26044,7 @@ var all_ItemConfig = { id: 70007, relationship: 20611, attrs: '3:1:100|6:1:500|9:1:650|10:1:100|13:1:300|14:1:1000|35:2:5|37:1:200', - init_durability: 0, + init_durability: 100, getway: 1, type: 7, sub_type: 7, @@ -26050,7 +26057,7 @@ var all_ItemConfig = { id: 70004, relationship: 20711, attrs: '3:1:100|6:1:500|9:1:650|10:1:100|13:1:300|14:1:1000|35:2:5|37:1:200', - init_durability: 0, + init_durability: 100, getway: 1, type: 7, sub_type: 4, @@ -26063,7 +26070,7 @@ var all_ItemConfig = { id: 70005, relationship: 20411, attrs: '3:1:100|6:1:500|9:1:650|10:1:100|13:1:300|14:1:1000|35:2:5|37:1:200', - init_durability: 0, + init_durability: 100, getway: 1, type: 7, sub_type: 5, @@ -26072,6 +26079,7 @@ var all_ItemConfig = { 30200: { hero_head: 50002, diamond: 0, + init_tili: 100, name: 'Yamada', gold: 50, getway: 1, @@ -26158,6 +26166,7 @@ var all_ItemConfig = { 30400: { hero_head: 50004, diamond: 0, + init_tili: 100, name: 'Astral', gold: 50, getway: 1, @@ -26266,6 +26275,7 @@ var all_ItemConfig = { 30800: { hero_head: 50008, diamond: 0, + init_tili: 100, name: 'Dragonscale', gold: 50, getway: 1, @@ -32240,7 +32250,7 @@ var task = { param3: 3, param2: 1, param1: 1, - time: 1500, + time: 300, reward: 10000, type: 7, id: 76006, @@ -32269,7 +32279,7 @@ var task = { param3: 2, param2: 1, param1: 1, - time: 800, + time: 300, reward: 10000, type: 7, id: 76004, @@ -32277,33 +32287,30 @@ var task = { target: 1.0, }, 71101: { - name: 'Reach 10 Activeness week', - des: 'Reach 10 Activeness week', + name: 'Reach 30 Activeness week', + des: 'Reach 30 Activeness today', subtype: 2, target: 10.0, - reward: 10000, type: 1, id: 71101, condition: 44, icon: 'task1', }, 71102: { - name: 'Reach 30 Activeness week', - des: 'Reach 30 Activeness week', + name: 'Reach 60 Activeness week', + des: 'Reach 60 Activeness today', subtype: 2, target: 30.0, - reward: 10000, type: 1, id: 71102, condition: 44, icon: 'task1', }, 71103: { - name: 'Reach 50 Activeness week', - des: 'Reach 50 Activeness week', + name: 'Reach 90 Activeness week', + des: 'Reach 90 Activeness today', subtype: 2, target: 50.0, - reward: 10000, type: 1, id: 71103, condition: 44, @@ -32337,7 +32344,7 @@ var task = { param3: 1, param2: 1, param1: 1, - time: 400, + time: 300, reward: 10000, type: 7, id: 76002, @@ -32354,7 +32361,7 @@ var task = { param3: 2, param2: 1, param1: 1, - time: 600, + time: 300, reward: 10000, type: 7, id: 76003, @@ -32371,7 +32378,7 @@ var task = { param3: 4, param2: 1, param1: 1, - time: 3000, + time: 300, reward: 10000, type: 7, id: 76008, @@ -32388,7 +32395,7 @@ var task = { param3: 5, param2: 1, param1: 1, - time: 3600, + time: 300, reward: 10000, type: 7, id: 76009, @@ -32462,7 +32469,7 @@ var task = { param3: 5, param2: 1, param1: 1, - time: 3600, + time: 300, reward: 10000, type: 7, id: 76010, @@ -32543,7 +32550,7 @@ var task = { reward: 10000, type: 1, id: 71005, - condition: 12, + condition: 8, icon: 'task1', }, 71004: { @@ -32764,7 +32771,7 @@ var task = { param3: 3, param2: 1, param1: 1, - time: 1200, + time: 300, reward: 10000, type: 7, id: 76005, @@ -32781,7 +32788,7 @@ var task = { param3: 4, param2: 1, param1: 1, - time: 2400, + time: 300, reward: 10000, type: 7, id: 76007, @@ -33312,110 +33319,34 @@ var seasonCard = { }, }; var heroLevel = { - 11: { - diamond: 0, - gold: 103, - level: 11.0, - time: 4000.0, - quality: 1, - id: 11, - }, - 10: { - diamond: 0, - gold: 103, - level: 10.0, - time: 4000.0, - quality: 1, - id: 10, - }, - 13: { - diamond: 0, - gold: 129, - level: 13.0, - time: 5000.0, - quality: 1, - id: 13, - }, - 12: { - diamond: 0, - gold: 129, - level: 12.0, - time: 5000.0, - quality: 1, - id: 12, - }, - 15: { - diamond: 0, - gold: 154, - level: 15.0, - time: 6000.0, - quality: 1, - id: 15, - }, - 14: { - diamond: 0, - gold: 154, - level: 14.0, - time: 6000.0, - quality: 1, - id: 14, - }, - 17: { - diamond: 0, - gold: 180, - level: 17.0, - time: 7200.0, - quality: 1, - id: 17, - }, - 16: { - diamond: 0, - gold: 180, - level: 16.0, - time: 7200.0, - quality: 1, - id: 16, - }, - 19: { - diamond: 0, - gold: 206, - level: 19.0, - time: 8400.0, - quality: 1, - id: 19, - }, - 18: { - diamond: 0, - gold: 206, - level: 18.0, - time: 8400.0, - quality: 1, - id: 18, - }, - 20: { - diamond: 0, - gold: 258, - level: 20.0, - time: 10800.0, - quality: 1, - id: 20, - }, - 1: { diamond: 0, gold: 0, level: 1.0, time: '0', quality: 1, id: 1 }, - 3: { diamond: 0, gold: 25, level: 3.0, time: 1000.0, quality: 1, id: 3 }, - 2: { diamond: 0, gold: 25, level: 2.0, time: 1000.0, quality: 1, id: 2 }, - 5: { diamond: 0, gold: 38, level: 5.0, time: 1500.0, quality: 1, id: 5 }, - 4: { diamond: 0, gold: 38, level: 4.0, time: 1500.0, quality: 1, id: 4 }, - 7: { diamond: 0, gold: 51, level: 7.0, time: 2000.0, quality: 1, id: 7 }, - 6: { diamond: 0, gold: 51, level: 6.0, time: 2000.0, quality: 1, id: 6 }, - 9: { diamond: 0, gold: 77, level: 9.0, time: 3000.0, quality: 1, id: 9 }, - 8: { diamond: 0, gold: 77, level: 8.0, time: 3000.0, quality: 1, id: 8 }, + 11: { diamond: 0, gold: 103, level: 11.0, time: 4.0, quality: 1, id: 11 }, + 10: { diamond: 0, gold: 103, level: 10.0, time: 4.0, quality: 1, id: 10 }, + 13: { diamond: 0, gold: 129, level: 13.0, time: 4.0, quality: 1, id: 13 }, + 12: { diamond: 0, gold: 129, level: 12.0, time: 4.0, quality: 1, id: 12 }, + 15: { diamond: 0, gold: 154, level: 15.0, time: 4.0, quality: 1, id: 15 }, + 14: { diamond: 0, gold: 154, level: 14.0, time: 4.0, quality: 1, id: 14 }, + 17: { diamond: 0, gold: 180, level: 17.0, time: 4.0, quality: 1, id: 17 }, + 16: { diamond: 0, gold: 180, level: 16.0, time: 4.0, quality: 1, id: 16 }, + 19: { diamond: 0, gold: 206, level: 19.0, time: 4.0, quality: 1, id: 19 }, + 18: { diamond: 0, gold: 206, level: 18.0, time: 4.0, quality: 1, id: 18 }, + 20: { diamond: 0, gold: 258, level: 20.0, time: 4.0, quality: 1, id: 20 }, + 1: { diamond: 0, gold: 0, level: 1.0, time: 0.0, quality: 1, id: 1 }, + 3: { diamond: 0, gold: 25, level: 3.0, time: 4.0, quality: 1, id: 3 }, + 2: { diamond: 0, gold: 25, level: 2.0, time: 4.0, quality: 1, id: 2 }, + 5: { diamond: 0, gold: 38, level: 5.0, time: 4.0, quality: 1, id: 5 }, + 4: { diamond: 0, gold: 38, level: 4.0, time: 4.0, quality: 1, id: 4 }, + 7: { diamond: 0, gold: 51, level: 7.0, time: 4.0, quality: 1, id: 7 }, + 6: { diamond: 0, gold: 51, level: 6.0, time: 4.0, quality: 1, id: 6 }, + 9: { diamond: 0, gold: 77, level: 9.0, time: 4.0, quality: 1, id: 9 }, + 8: { diamond: 0, gold: 77, level: 8.0, time: 4.0, quality: 1, id: 8 }, }; var heroQuality = { 11: { diamond: 0, gold: 1038, lucky: 30, - time: 16000.0, + success_rate: 60, + time: 3.0, promote: 60, quality: 11.0, id: 11, @@ -33424,7 +33355,8 @@ var heroQuality = { diamond: 0, gold: 1008, lucky: 29, - time: 15000.0, + success_rate: 65, + time: 3.0, promote: 52, quality: 10.0, id: 10, @@ -33433,7 +33365,8 @@ var heroQuality = { diamond: 0, gold: 1440, lucky: 32, - time: 23000.0, + success_rate: 50, + time: 3.0, promote: 78, quality: 13.0, id: 13, @@ -33442,7 +33375,8 @@ var heroQuality = { diamond: 0, gold: 1416, lucky: 31, - time: 22000.0, + success_rate: 55, + time: 3.0, promote: 69, quality: 12.0, id: 12, @@ -33451,7 +33385,8 @@ var heroQuality = { diamond: 0, gold: 1820, lucky: 34, - time: 30000.0, + success_rate: 40, + time: 3.0, promote: 98, quality: 15.0, id: 15, @@ -33460,7 +33395,8 @@ var heroQuality = { diamond: 0, gold: 1810, lucky: 33, - time: 28000.0, + success_rate: 45, + time: 3.0, promote: 88, quality: 14.0, id: 14, @@ -33469,6 +33405,7 @@ var heroQuality = { diamond: 0, gold: 0, lucky: 20, + success_rate: 0, time: 0.0, promote: 0, quality: 1.0, @@ -33478,7 +33415,8 @@ var heroQuality = { diamond: 0, gold: 62, lucky: 22, - time: 900.0, + success_rate: 100, + time: 3.0, promote: 8, quality: 3.0, id: 3, @@ -33487,7 +33425,8 @@ var heroQuality = { diamond: 0, gold: 33, lucky: 21, - time: 480.0, + success_rate: 100, + time: 3.0, promote: 4, quality: 2.0, id: 2, @@ -33496,7 +33435,8 @@ var heroQuality = { diamond: 0, gold: 214, lucky: 24, - time: 3300.0, + success_rate: 85, + time: 3.0, promote: 18, quality: 5.0, id: 5, @@ -33505,7 +33445,8 @@ var heroQuality = { diamond: 0, gold: 172, lucky: 23, - time: 2700.0, + success_rate: 90, + time: 3.0, promote: 13, quality: 4.0, id: 4, @@ -33514,7 +33455,8 @@ var heroQuality = { diamond: 0, gold: 417, lucky: 26, - time: 6600.0, + success_rate: 80, + time: 3.0, promote: 30, quality: 7.0, id: 7, @@ -33523,7 +33465,8 @@ var heroQuality = { diamond: 0, gold: 372, lucky: 25, - time: 6000.0, + success_rate: 80, + time: 3.0, promote: 24, quality: 6.0, id: 6, @@ -33532,7 +33475,8 @@ var heroQuality = { diamond: 0, gold: 640, lucky: 28, - time: 10000.0, + success_rate: 70, + time: 3.0, promote: 44, quality: 9.0, id: 9, @@ -33541,7 +33485,8 @@ var heroQuality = { diamond: 0, gold: 604, lucky: 27, - time: 9000.0, + success_rate: 75, + time: 3.0, promote: 37, quality: 8.0, id: 8,