From b9548a0777cf386ec14534393df56508fa63b695 Mon Sep 17 00:00:00 2001 From: "pan@work" Date: Mon, 25 Nov 2024 09:44:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=B1=80=E5=86=85=E7=BB=8F?= =?UTF-8?q?=E9=AA=8C=20=E8=A7=A6=E5=8F=91=E6=8A=80=E8=83=BD=E8=AE=BE?= =?UTF-8?q?=E5=AE=9A=EF=BC=8C=E6=B2=A1=E5=BF=85=E8=A6=81=E6=9C=89=E5=B1=80?= =?UTF-8?q?=E5=86=85=E6=8A=80=E8=83=BD=E8=AE=BE=E5=AE=9A=EF=BC=8C=E5=90=8E?= =?UTF-8?q?=E6=9C=9F=E5=8F=AF=E4=BB=A5=E5=8A=A0=E5=85=A5=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E8=8B=B1=E9=9B=84=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=A8=B1=E4=B9=90=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resources/gui/element/exp.prefab | 819 +++--------------- assets/resources/gui/element/mexp.prefab | 819 +++--------------- .../script/game/common/SingletonModuleComp.ts | 13 - assets/script/game/common/config/Items.ts | 24 +- assets/script/game/hero/HeroViewComp.ts | 10 +- assets/script/game/map/MIssionController.ts | 19 - 6 files changed, 270 insertions(+), 1434 deletions(-) diff --git a/assets/resources/gui/element/exp.prefab b/assets/resources/gui/element/exp.prefab index 6b6c1696..b9e9e63a 100644 --- a/assets/resources/gui/element/exp.prefab +++ b/assets/resources/gui/element/exp.prefab @@ -22,23 +22,20 @@ "__id__": 2 }, { - "__id__": 28 - }, - { - "__id__": 68 + "__id__": 42 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 82 }, { - "__id__": 110 + "__id__": 84 } ], "_prefab": { - "__id__": 112 + "__id__": 86 }, "_lpos": { "__type__": "cc.Vec3", @@ -71,7 +68,7 @@ }, { "__type__": "cc.Node", - "_name": "mskill", + "_name": "hp", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -82,589 +79,23 @@ "__id__": 3 }, { - "__id__": 19 - } - ], - "_active": true, - "_components": [ + "__id__": 9 + }, { "__id__": 25 - } - ], - "_prefab": { - "__id__": 27 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "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": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "exp", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [ + }, { - "__id__": 4 + "__id__": 33 } ], "_active": true, "_components": [ { - "__id__": 10 - }, - { - "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 + "__id__": 39 } ], "_prefab": { - "__id__": 18 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -0.558, - "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": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "Bar", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 3 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 5 - }, - { - "__id__": 7 - } - ], - "_prefab": { - "__id__": 9 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "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__": 4 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 20 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "13Mq7JaqxNprdZrdnnOrRe" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 4 - }, - "_enabled": true, - "__prefab": { - "__id__": 8 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@44c8a", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_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": "f1lmRPqANJY5q27gKHZ7OM" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "30i/Nn3nhOI5d8CxuIN5Fi", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 20 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "9bV0zmfjNHGoGq6aZqCxuw" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5304c", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_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": "efZSh9UKNAvaTD72nozHRf" - }, - { - "__type__": "cc.ProgressBar", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "_barSprite": { - "__id__": 7 - }, - "_mode": 0, - "_totalLength": 100, - "_progress": 1, - "_reverse": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "fc5O1YDTBM6agUuHvuk6XT" - }, - { - "__type__": "2a50eqI7JZNV5Sh0y/Qd9C6", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "controller": false, - "watchPath": "", - "componentName": "", - "componentProperty": "", - "refreshRate": 0.1, - "watchPathArr": [ - "data.mission.s_exp", - "data.mission.s_up_exp" - ], - "stringFormat": "", - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "22SHEwQvZKG44rV3cOwhMj" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "1fy1Ir1O1Al5PXjadniymH", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 20 - }, - { - "__id__": 22 - } - ], - "_prefab": { - "__id__": 24 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "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": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 19 - }, - "_enabled": true, - "__prefab": { - "__id__": 21 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 29, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "37872AutlChquv25Q/tzp8" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 19 - }, - "_enabled": true, - "__prefab": { - "__id__": 23 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 40, - "g": 250, - "b": 0, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@4a940", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f66yhEUgFMtIZ97OFqPR+J" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "5e0YQwccREBJlMLwtxmiWV", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 26 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 88, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d4OeofRr1GgbdSBJl/7Njy" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "0dMs0Isi5JZqXYLdloaJyd", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "hp", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [ - { - "__id__": 29 - }, - { - "__id__": 35 - }, - { - "__id__": 51 - }, - { - "__id__": 59 - } - ], - "_active": true, - "_components": [ - { - "__id__": 65 - } - ], - "_prefab": { - "__id__": 67 + "__id__": 41 }, "_lpos": { "__type__": "cc.Vec3", @@ -701,20 +132,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 2 }, "_children": [], "_active": true, "_components": [ { - "__id__": 30 + "__id__": 4 }, { - "__id__": 32 + "__id__": 6 } ], "_prefab": { - "__id__": 34 + "__id__": 8 }, "_lpos": { "__type__": "cc.Vec3", @@ -751,11 +182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 3 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 5 }, "_contentSize": { "__type__": "cc.Size", @@ -779,11 +210,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 3 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 7 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -837,30 +268,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 2 }, "_children": [ { - "__id__": 36 + "__id__": 10 } ], "_active": true, "_components": [ { - "__id__": 42 + "__id__": 16 }, { - "__id__": 44 + "__id__": 18 }, { - "__id__": 46 + "__id__": 20 }, { - "__id__": 48 + "__id__": 22 } ], "_prefab": { - "__id__": 50 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -897,20 +328,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 35 + "__id__": 9 }, "_children": [], "_active": true, "_components": [ { - "__id__": 37 + "__id__": 11 }, { - "__id__": 39 + "__id__": 13 } ], "_prefab": { - "__id__": 41 + "__id__": 15 }, "_lpos": { "__type__": "cc.Vec3", @@ -947,11 +378,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 12 }, "_contentSize": { "__type__": "cc.Size", @@ -975,11 +406,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 14 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1033,11 +464,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 9 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", @@ -1061,11 +492,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 9 }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 19 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1103,14 +534,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 9 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 21 }, "_barSprite": { - "__id__": 39 + "__id__": 13 }, "_mode": 0, "_totalLength": 100, @@ -1128,11 +559,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 9 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 23 }, "controller": false, "watchPath": "", @@ -1169,23 +600,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 2 }, "_children": [], "_active": true, "_components": [ { - "__id__": 52 + "__id__": 26 }, { - "__id__": 54 + "__id__": 28 }, { - "__id__": 56 + "__id__": 30 } ], "_prefab": { - "__id__": 58 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -1222,11 +653,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 27 }, "_contentSize": { "__type__": "cc.Size", @@ -1250,11 +681,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 29 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1318,11 +749,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 31 }, "templateMode": false, "watchPath": "data.mission.hp", @@ -1353,20 +784,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 2 }, "_children": [], "_active": true, "_components": [ { - "__id__": 60 + "__id__": 34 }, { - "__id__": 62 + "__id__": 36 } ], "_prefab": { - "__id__": 64 + "__id__": 38 }, "_lpos": { "__type__": "cc.Vec3", @@ -1403,11 +834,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -1431,11 +862,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1489,11 +920,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 40 }, "_contentSize": { "__type__": "cc.Size", @@ -1534,26 +965,26 @@ }, "_children": [ { - "__id__": 69 + "__id__": 43 }, { - "__id__": 75 + "__id__": 49 }, { - "__id__": 91 + "__id__": 65 }, { - "__id__": 99 + "__id__": 73 } ], "_active": true, "_components": [ { - "__id__": 105 + "__id__": 79 } ], "_prefab": { - "__id__": 107 + "__id__": 81 }, "_lpos": { "__type__": "cc.Vec3", @@ -1590,20 +1021,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 42 }, "_children": [], "_active": true, "_components": [ { - "__id__": 70 + "__id__": 44 }, { - "__id__": 72 + "__id__": 46 } ], "_prefab": { - "__id__": 74 + "__id__": 48 }, "_lpos": { "__type__": "cc.Vec3", @@ -1640,11 +1071,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 45 }, "_contentSize": { "__type__": "cc.Size", @@ -1668,11 +1099,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 47 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1726,30 +1157,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 42 }, "_children": [ { - "__id__": 76 + "__id__": 50 } ], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 56 }, { - "__id__": 84 + "__id__": 58 }, { - "__id__": 86 + "__id__": 60 }, { - "__id__": 88 + "__id__": 62 } ], "_prefab": { - "__id__": 90 + "__id__": 64 }, "_lpos": { "__type__": "cc.Vec3", @@ -1786,20 +1217,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 75 + "__id__": 49 }, "_children": [], "_active": true, "_components": [ { - "__id__": 77 + "__id__": 51 }, { - "__id__": 79 + "__id__": 53 } ], "_prefab": { - "__id__": 81 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -1836,11 +1267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 52 }, "_contentSize": { "__type__": "cc.Size", @@ -1864,11 +1295,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 54 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1922,11 +1353,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 57 }, "_contentSize": { "__type__": "cc.Size", @@ -1950,11 +1381,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 59 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1992,14 +1423,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 61 }, "_barSprite": { - "__id__": 79 + "__id__": 53 }, "_mode": 0, "_totalLength": 100, @@ -2017,11 +1448,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 63 }, "controller": false, "watchPath": "", @@ -2058,23 +1489,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 42 }, "_children": [], "_active": true, "_components": [ { - "__id__": 92 + "__id__": 66 }, { - "__id__": 94 + "__id__": 68 }, { - "__id__": 96 + "__id__": 70 } ], "_prefab": { - "__id__": 98 + "__id__": 72 }, "_lpos": { "__type__": "cc.Vec3", @@ -2111,11 +1542,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 67 }, "_contentSize": { "__type__": "cc.Size", @@ -2139,11 +1570,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 69 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2207,11 +1638,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 71 }, "templateMode": false, "watchPath": "data.mission.ap", @@ -2242,20 +1673,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 42 }, "_children": [], "_active": true, "_components": [ { - "__id__": 100 + "__id__": 74 }, { - "__id__": 102 + "__id__": 76 } ], "_prefab": { - "__id__": 104 + "__id__": 78 }, "_lpos": { "__type__": "cc.Vec3", @@ -2292,11 +1723,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 99 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 75 }, "_contentSize": { "__type__": "cc.Size", @@ -2320,11 +1751,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 99 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 77 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2378,11 +1809,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 80 }, "_contentSize": { "__type__": "cc.Size", @@ -2423,7 +1854,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 83 }, "_contentSize": { "__type__": "cc.Size", @@ -2451,7 +1882,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 85 }, "_alignFlags": 12, "_target": null, diff --git a/assets/resources/gui/element/mexp.prefab b/assets/resources/gui/element/mexp.prefab index 98f0a3e2..2c088bf1 100644 --- a/assets/resources/gui/element/mexp.prefab +++ b/assets/resources/gui/element/mexp.prefab @@ -22,23 +22,20 @@ "__id__": 2 }, { - "__id__": 28 - }, - { - "__id__": 68 + "__id__": 42 } ], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 82 }, { - "__id__": 110 + "__id__": 84 } ], "_prefab": { - "__id__": 112 + "__id__": 86 }, "_lpos": { "__type__": "cc.Vec3", @@ -71,7 +68,7 @@ }, { "__type__": "cc.Node", - "_name": "mskill", + "_name": "hp", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -82,589 +79,23 @@ "__id__": 3 }, { - "__id__": 19 - } - ], - "_active": true, - "_components": [ + "__id__": 9 + }, { "__id__": 25 - } - ], - "_prefab": { - "__id__": 27 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "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": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "exp", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [ + }, { - "__id__": 4 + "__id__": 33 } ], "_active": true, "_components": [ { - "__id__": 10 - }, - { - "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 + "__id__": 39 } ], "_prefab": { - "__id__": 18 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -0.558, - "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": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "Bar", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 3 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 5 - }, - { - "__id__": 7 - } - ], - "_prefab": { - "__id__": 9 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "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__": 4 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 20 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "13Mq7JaqxNprdZrdnnOrRe" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 4 - }, - "_enabled": true, - "__prefab": { - "__id__": 8 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@44c8a", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_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": "f1lmRPqANJY5q27gKHZ7OM" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "30i/Nn3nhOI5d8CxuIN5Fi", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 20 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "9bV0zmfjNHGoGq6aZqCxuw" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5304c", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_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": "efZSh9UKNAvaTD72nozHRf" - }, - { - "__type__": "cc.ProgressBar", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "_barSprite": { - "__id__": 7 - }, - "_mode": 0, - "_totalLength": 100, - "_progress": 1, - "_reverse": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "fc5O1YDTBM6agUuHvuk6XT" - }, - { - "__type__": "2a50eqI7JZNV5Sh0y/Qd9C6", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "controller": false, - "watchPath": "", - "componentName": "", - "componentProperty": "", - "refreshRate": 0.1, - "watchPathArr": [ - "data.mission.ms_exp", - "data.mission.ms_up_exp" - ], - "stringFormat": "", - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "22SHEwQvZKG44rV3cOwhMj" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "1fy1Ir1O1Al5PXjadniymH", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 20 - }, - { - "__id__": 22 - } - ], - "_prefab": { - "__id__": 24 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "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": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 19 - }, - "_enabled": true, - "__prefab": { - "__id__": 21 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 29, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "37872AutlChquv25Q/tzp8" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 19 - }, - "_enabled": true, - "__prefab": { - "__id__": 23 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 40, - "g": 250, - "b": 0, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@4a940", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f66yhEUgFMtIZ97OFqPR+J" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "5e0YQwccREBJlMLwtxmiWV", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 26 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 88, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d4OeofRr1GgbdSBJl/7Njy" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "0dMs0Isi5JZqXYLdloaJyd", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "hp", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [ - { - "__id__": 29 - }, - { - "__id__": 35 - }, - { - "__id__": 51 - }, - { - "__id__": 59 - } - ], - "_active": true, - "_components": [ - { - "__id__": 65 - } - ], - "_prefab": { - "__id__": 67 + "__id__": 41 }, "_lpos": { "__type__": "cc.Vec3", @@ -701,20 +132,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 2 }, "_children": [], "_active": true, "_components": [ { - "__id__": 30 + "__id__": 4 }, { - "__id__": 32 + "__id__": 6 } ], "_prefab": { - "__id__": 34 + "__id__": 8 }, "_lpos": { "__type__": "cc.Vec3", @@ -751,11 +182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 3 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 5 }, "_contentSize": { "__type__": "cc.Size", @@ -779,11 +210,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 3 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 7 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -837,30 +268,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 2 }, "_children": [ { - "__id__": 36 + "__id__": 10 } ], "_active": true, "_components": [ { - "__id__": 42 + "__id__": 16 }, { - "__id__": 44 + "__id__": 18 }, { - "__id__": 46 + "__id__": 20 }, { - "__id__": 48 + "__id__": 22 } ], "_prefab": { - "__id__": 50 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -897,20 +328,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 35 + "__id__": 9 }, "_children": [], "_active": true, "_components": [ { - "__id__": 37 + "__id__": 11 }, { - "__id__": 39 + "__id__": 13 } ], "_prefab": { - "__id__": 41 + "__id__": 15 }, "_lpos": { "__type__": "cc.Vec3", @@ -947,11 +378,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 12 }, "_contentSize": { "__type__": "cc.Size", @@ -975,11 +406,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 14 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1033,11 +464,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 9 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", @@ -1061,11 +492,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 9 }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 19 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1103,14 +534,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 9 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 21 }, "_barSprite": { - "__id__": 39 + "__id__": 13 }, "_mode": 0, "_totalLength": 100, @@ -1128,11 +559,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 9 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 23 }, "controller": false, "watchPath": "", @@ -1169,23 +600,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 2 }, "_children": [], "_active": true, "_components": [ { - "__id__": 52 + "__id__": 26 }, { - "__id__": 54 + "__id__": 28 }, { - "__id__": 56 + "__id__": 30 } ], "_prefab": { - "__id__": 58 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -1222,11 +653,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 27 }, "_contentSize": { "__type__": "cc.Size", @@ -1250,11 +681,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 29 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1318,11 +749,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 31 }, "templateMode": false, "watchPath": "data.mission.mhp", @@ -1353,20 +784,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 2 }, "_children": [], "_active": true, "_components": [ { - "__id__": 60 + "__id__": 34 }, { - "__id__": 62 + "__id__": 36 } ], "_prefab": { - "__id__": 64 + "__id__": 38 }, "_lpos": { "__type__": "cc.Vec3", @@ -1403,11 +834,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -1431,11 +862,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 59 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1489,11 +920,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 40 }, "_contentSize": { "__type__": "cc.Size", @@ -1534,26 +965,26 @@ }, "_children": [ { - "__id__": 69 + "__id__": 43 }, { - "__id__": 75 + "__id__": 49 }, { - "__id__": 91 + "__id__": 65 }, { - "__id__": 99 + "__id__": 73 } ], "_active": true, "_components": [ { - "__id__": 105 + "__id__": 79 } ], "_prefab": { - "__id__": 107 + "__id__": 81 }, "_lpos": { "__type__": "cc.Vec3", @@ -1590,20 +1021,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 42 }, "_children": [], "_active": true, "_components": [ { - "__id__": 70 + "__id__": 44 }, { - "__id__": 72 + "__id__": 46 } ], "_prefab": { - "__id__": 74 + "__id__": 48 }, "_lpos": { "__type__": "cc.Vec3", @@ -1640,11 +1071,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 45 }, "_contentSize": { "__type__": "cc.Size", @@ -1668,11 +1099,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 43 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 47 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1726,30 +1157,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 42 }, "_children": [ { - "__id__": 76 + "__id__": 50 } ], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 56 }, { - "__id__": 84 + "__id__": 58 }, { - "__id__": 86 + "__id__": 60 }, { - "__id__": 88 + "__id__": 62 } ], "_prefab": { - "__id__": 90 + "__id__": 64 }, "_lpos": { "__type__": "cc.Vec3", @@ -1786,20 +1217,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 75 + "__id__": 49 }, "_children": [], "_active": true, "_components": [ { - "__id__": 77 + "__id__": 51 }, { - "__id__": 79 + "__id__": 53 } ], "_prefab": { - "__id__": 81 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", @@ -1836,11 +1267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 52 }, "_contentSize": { "__type__": "cc.Size", @@ -1864,11 +1295,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 54 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1922,11 +1353,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 57 }, "_contentSize": { "__type__": "cc.Size", @@ -1950,11 +1381,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 59 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1992,14 +1423,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 61 }, "_barSprite": { - "__id__": 79 + "__id__": 53 }, "_mode": 0, "_totalLength": 100, @@ -2017,11 +1448,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 63 }, "controller": false, "watchPath": "", @@ -2058,23 +1489,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 42 }, "_children": [], "_active": true, "_components": [ { - "__id__": 92 + "__id__": 66 }, { - "__id__": 94 + "__id__": 68 }, { - "__id__": 96 + "__id__": 70 } ], "_prefab": { - "__id__": 98 + "__id__": 72 }, "_lpos": { "__type__": "cc.Vec3", @@ -2111,11 +1542,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 67 }, "_contentSize": { "__type__": "cc.Size", @@ -2139,11 +1570,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 69 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2207,11 +1638,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 65 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 71 }, "templateMode": false, "watchPath": "data.mission.ap", @@ -2242,20 +1673,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 68 + "__id__": 42 }, "_children": [], "_active": true, "_components": [ { - "__id__": 100 + "__id__": 74 }, { - "__id__": 102 + "__id__": 76 } ], "_prefab": { - "__id__": 104 + "__id__": 78 }, "_lpos": { "__type__": "cc.Vec3", @@ -2292,11 +1723,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 99 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 75 }, "_contentSize": { "__type__": "cc.Size", @@ -2320,11 +1751,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 99 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 77 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2378,11 +1809,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 80 }, "_contentSize": { "__type__": "cc.Size", @@ -2423,7 +1854,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 83 }, "_contentSize": { "__type__": "cc.Size", @@ -2451,7 +1882,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 85 }, "_alignFlags": 12, "_target": null, diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index ae9e3d74..55cc0b5f 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -79,12 +79,6 @@ export class SingletonModuleComp extends ecs.Comp { h_up_exp:10, h_up:5, //每次增加的hp量 hp:0, - s_exp:0, //场地技能经验 - s_up_exp:10, - s_up:5, - d_exp:0, //特殊经验 - d_up_exp:10, - d_up:5, ma_exp:0, //敌方攻击经验 ma_up_exp:10, ma_up:5, @@ -93,13 +87,6 @@ export class SingletonModuleComp extends ecs.Comp { mh_up_exp:10, mh_up:5, mhp:0, - ms_exp:0, //敌方场地技能经验 - ms_up_exp:10, - ms_up:5, - md_exp:0, //敌方特殊经验 - md_up_exp:10, - md_up:5, - reward_num:0, //怪物死亡数 reward_gold:0, reward_exp:0, diff --git a/assets/script/game/common/config/Items.ts b/assets/script/game/common/config/Items.ts index 1e8da490..5463089f 100644 --- a/assets/script/game/common/config/Items.ts +++ b/assets/script/game/common/config/Items.ts @@ -6,18 +6,18 @@ type: */ export const Items={ - 1001:{uuid: 1001,path: "1001",type: 1,r_num:10,name: "近战卷轴",info:"提升普通近战英雄等级", }, - 1002:{uuid: 1002,path: "1001",type: 1,r_num:10,name: "远程卷轴",info:"提升普通远程英雄等级", }, - 1003:{uuid: 1003,path: "1001",type: 1,r_num:10,name: "辅助卷轴",info:"提升普通辅助英雄等级", }, - 1004:{uuid: 1004,path: "1001",type: 1,r_num:10,name: "<传说>近战卷轴",info:"提升<传说>近战英雄等级", }, - 1005:{uuid: 1005,path: "1001",type: 1,r_num:10,name: "<传说>远程卷轴",info:"提升<传说>远程英雄等级", }, - 1006:{uuid: 1006,path: "1001",type: 1,r_num:10,name: "<传说>辅助卷轴",info:"提升<传说>辅助英雄等级", }, - 1007:{uuid: 1007,path: "1001",type: 1,r_num:1,name: "近战原石",info:"普通近战英雄升星", }, - 1008:{uuid: 1008,path: "1001",type: 1,r_num:1,name: "远程原石",info:"普通远程英雄升星", }, - 1009:{uuid: 1009,path: "1001",type: 1,r_num:1,name: "辅助原石",info:"普通辅助英雄升星", }, - 1010:{uuid: 1010,path: "1001",type: 1,r_num:1,name: "<传说>近战原石",info:"<传说>近战英雄升星", }, - 1011:{uuid: 1011,path: "1001",type: 1,r_num:1,name: "<传说>远程原石",info:"<传说>远程英雄升星", }, - 1012:{uuid: 1012,path: "1001",type: 1,r_num:1,name: "<传说>辅助原石",info:"<传说>辅助英雄升星", }, + 1001:{uuid: 1001,path: "1001",type: 1,r_num:10,name: "坦克卷轴",info:"提升普通坦克型英雄等级", }, + 1002:{uuid: 1002,path: "1001",type: 1,r_num:10,name: "远程卷轴",info:"提升普通远程型英雄等级", }, + 1003:{uuid: 1003,path: "1001",type: 1,r_num:10,name: "辅助卷轴",info:"提升普通辅助型英雄等级", }, + 1004:{uuid: 1004,path: "1001",type: 1,r_num:10,name: "<传说>坦克卷轴",info:"提升<传说>坦克型英雄等级", }, + 1005:{uuid: 1005,path: "1001",type: 1,r_num:10,name: "<传说>远程卷轴",info:"提升<传说>远程型英雄等级", }, + 1006:{uuid: 1006,path: "1001",type: 1,r_num:10,name: "<传说>辅助卷轴",info:"提升<传说>辅助型英雄等级", }, + 1007:{uuid: 1007,path: "1001",type: 1,r_num:1,name: "坦克原石",info:"普通坦克型英雄升星", }, + 1008:{uuid: 1008,path: "1001",type: 1,r_num:1,name: "远程原石",info:"普通远程型英雄升星", }, + 1009:{uuid: 1009,path: "1001",type: 1,r_num:1,name: "辅助原石",info:"普通辅助型英雄升星", }, + 1010:{uuid: 1010,path: "1001",type: 1,r_num:1,name: "<传说>坦克原石",info:"<传说>坦克型英雄升星", }, + 1011:{uuid: 1011,path: "1001",type: 1,r_num:1,name: "<传说>远程原石",info:"<传说>远程型英雄升星", }, + 1012:{uuid: 1012,path: "1001",type: 1,r_num:1,name: "<传说>辅助原石",info:"<传说>辅助型英雄升星", }, 1013:{uuid: 1013,path: "1001",type: 1,r_num:1,name: "召唤券",info:"普通召唤券，无法召唤传说英雄", }, 1014:{uuid: 1014,path: "1001",type: 1,r_num:1,name: "<高级>召唤券",info:"<高级>英雄召唤券，召唤传说英雄机率提升", }, 1015:{uuid: 1015,path: "1001",type: 1,r_num:1,name: "<传说>召唤券",info:"<传说>英雄召唤券，召唤传说英雄机率大幅提升", }, diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 6fc23955..1d2549ef 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -438,12 +438,18 @@ export class HeroViewComp extends CCComp { if(this.box_group==BoxSet.HERO){ if(this.type == 1)smc.vmdata.mission.a_exp +=exp if(this.type == 2)smc.vmdata.mission.h_exp +=exp - if(this.type == 3)smc.vmdata.mission.s_exp +=exp + if(this.type == 3){ + smc.vmdata.mission.a_exp +=exp + smc.vmdata.mission.h_exp +=exp + } } if(this.box_group==BoxSet.MONSTER){ if(this.type == 1)smc.vmdata.mission.ma_exp +=exp if(this.type == 2)smc.vmdata.mission.mh_exp +=exp - if(this.type == 3)smc.vmdata.mission.ms_exp +=exp + if(this.type == 3){ + smc.vmdata.mission.ma_exp +=exp + smc.vmdata.mission.mh_exp +=exp + } } } //使用max_skill diff --git a/assets/script/game/map/MIssionController.ts b/assets/script/game/map/MIssionController.ts index cce00a4e..14df6e0d 100644 --- a/assets/script/game/map/MIssionController.ts +++ b/assets/script/game/map/MIssionController.ts @@ -86,18 +86,14 @@ export class MissionComp extends CCComp { smc.vmdata.mission.is_defeat=false smc.vmdata.mission.a_exp=0 //近战经验 smc.vmdata.mission.h_exp=0 //远程经验 - smc.vmdata.mission.s_exp=0 //辅助经验 smc.vmdata.mission.ma_exp=0 //敌方近战经验 smc.vmdata.mission.mh_exp=0 //敌方远程经验 - smc.vmdata.mission.ms_exp=0 //敌方辅助经验 this.msk={ on :false, uuid:1001,type:1,lv: 1} this.mmsk={ on :false, uuid:1001,type:1,lv: 1} this.node.getChildByName("exp").getChildByName("ap").active = true this.node.getChildByName("exp").getChildByName("hp").active = true - this.node.getChildByName("exp").getChildByName("mskill").active = true this.node.getChildByName("mexp").getChildByName("ap").active = true this.node.getChildByName("mexp").getChildByName("hp").active = true - this.node.getChildByName("mexp").getChildByName("mskill").active = true this.mon_refresh() this.heros_call() } @@ -165,21 +161,6 @@ export class MissionComp extends CCComp { } } - select_msk(type:number){ - smc.vmdata.mission.s_exp=0 - let sk:any=RandomManager.instance.getRandomByObjectList(MSlist[type],1) - this.msk.uuid=sk[0] - let skill=ecs.getEntity(MSkill) - skill.load(BoxSet.HERO,this.msk.uuid) - } - select_mmsk(type:number){ - smc.vmdata.mission.ms_exp=0 - let sk:any=RandomManager.instance.getRandomByObjectList(MSlist[type],1) - this.mmsk.uuid=sk[0] - let mskill=ecs.getEntity(MSkill) - mskill.load(BoxSet.MONSTER,this.mmsk.uuid) - } - do_reward(){ console.log("do_reward")