diff --git a/assets/resources/game/gui/card.prefab b/assets/resources/game/gui/card.prefab index 78a87be8..45648d5c 100644 --- a/assets/resources/game/gui/card.prefab +++ b/assets/resources/game/gui/card.prefab @@ -25,23 +25,23 @@ "__id__": 16 }, { - "__id__": 190 + "__id__": 202 }, { - "__id__": 208 + "__id__": 220 } ], "_active": true, "_components": [ { - "__id__": 231 + "__id__": 243 }, { - "__id__": 233 + "__id__": 245 } ], "_prefab": { - "__id__": 235 + "__id__": 247 }, "_lpos": { "__type__": "cc.Vec3", @@ -421,29 +421,29 @@ "__id__": 91 }, { - "__id__": 117 + "__id__": 123 }, { - "__id__": 143 + "__id__": 155 }, { - "__id__": 159 + "__id__": 171 }, { - "__id__": 163 + "__id__": 175 } ], "_active": true, "_components": [ { - "__id__": 185 + "__id__": 197 }, { - "__id__": 187 + "__id__": 199 } ], "_prefab": { - "__id__": 189 + "__id__": 201 }, "_lpos": { "__type__": "cc.Vec3", @@ -2143,7 +2143,7 @@ }, { "__type__": "cc.Node", - "_name": "ap", + "_name": "hp", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -2158,24 +2158,27 @@ }, { "__id__": 106 + }, + { + "__id__": 112 } ], "_active": true, "_components": [ { - "__id__": 112 + "__id__": 118 }, { - "__id__": 114 + "__id__": 120 } ], "_prefab": { - "__id__": 116 + "__id__": 122 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": -55.325, + "x": -72.5, + "y": -99.32499999999999, "z": 0 }, "_lrot": { @@ -2268,7 +2271,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 318, + "width": 120, "height": 60 }, "_anchorPoint": { @@ -2378,7 +2381,7 @@ }, { "__type__": "cc.Node", - "_name": "num", + "_name": "Icon_Heart", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -2399,8 +2402,144 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -29.076, - "y": -1.164, + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.5, + "y": 0.5, + "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__": 100 + }, + "_enabled": true, + "__prefab": { + "__id__": 102 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 105, + "height": 93 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e5CG7mUQpH4bczoJV7a2F9" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 100 + }, + "_enabled": true, + "__prefab": { + "__id__": 104 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 190 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@069d6", + "__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": "b8C2Dz5RBLFIctk6kxpjN5" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c2Q3eC4vpPg6ePedWNK32F", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "num", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 91 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 107 + }, + { + "__id__": 109 + } + ], + "_prefab": { + "__id__": 111 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -2432,11 +2571,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 100 + "__id__": 106 }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 108 }, "_contentSize": { "__type__": "cc.Size", @@ -2460,11 +2599,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 100 + "__id__": 106 }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 110 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2477,7 +2616,7 @@ "a": 255 }, "_string": "99", - "_horizontalAlign": 0, + "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 20, "_fontSize": 20, @@ -2547,14 +2686,14 @@ "_active": false, "_components": [ { - "__id__": 107 + "__id__": 113 }, { - "__id__": 109 + "__id__": 115 } ], "_prefab": { - "__id__": 111 + "__id__": 117 }, "_lpos": { "__type__": "cc.Vec3", @@ -2591,11 +2730,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 114 }, "_contentSize": { "__type__": "cc.Size", @@ -2619,11 +2758,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 106 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 110 + "__id__": 116 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2704,12 +2843,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 119 }, "_contentSize": { "__type__": "cc.Size", - "width": 159, - "height": 20 + "width": 60, + "height": 60 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2732,14 +2871,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 121 }, - "_alignFlags": 44, + "_alignFlags": 12, "_target": null, - "_left": 3, - "_right": 3, + "_left": -20, + "_right": 52.5, "_top": 0, - "_bottom": 49.675, + "_bottom": -14.325000000000003, "_horizontalCenter": -24.149, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2773,7 +2912,7 @@ }, { "__type__": "cc.Node", - "_name": "hp", + "_name": "ap", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -2781,31 +2920,34 @@ }, "_children": [ { - "__id__": 118 - }, - { - "__id__": 126 + "__id__": 124 }, { "__id__": 132 + }, + { + "__id__": 138 + }, + { + "__id__": 144 } ], "_active": true, "_components": [ { - "__id__": 138 + "__id__": 150 }, { - "__id__": 140 + "__id__": 152 } ], "_prefab": { - "__id__": 142 + "__id__": 154 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": -55.236000000000004, + "x": 72.5, + "y": -99.23599999999999, "z": 0 }, "_lrot": { @@ -2837,23 +2979,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 117 + "__id__": 123 }, "_children": [], "_active": true, "_components": [ { - "__id__": 119 + "__id__": 125 }, { - "__id__": 121 + "__id__": 127 }, { - "__id__": 123 + "__id__": 129 } ], "_prefab": { - "__id__": 125 + "__id__": 131 }, "_lpos": { "__type__": "cc.Vec3", @@ -2890,15 +3032,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 118 + "__id__": 124 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 126 }, "_contentSize": { "__type__": "cc.Size", - "width": 318, + "width": 120, "height": 60 }, "_anchorPoint": { @@ -2918,11 +3060,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 118 + "__id__": 124 }, "_enabled": false, "__prefab": { - "__id__": 122 + "__id__": 128 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2963,11 +3105,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 118 + "__id__": 124 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 130 }, "_alignFlags": 40, "_target": null, @@ -3008,28 +3150,164 @@ }, { "__type__": "cc.Node", - "_name": "num", + "_name": "SkillIcon02_3", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 117 + "__id__": 123 }, "_children": [], "_active": true, "_components": [ { - "__id__": 127 + "__id__": 133 }, { - "__id__": 129 + "__id__": 135 } ], "_prefab": { - "__id__": 131 + "__id__": 137 }, "_lpos": { "__type__": "cc.Vec3", - "x": 28.817, + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.62, + "y": 0.62, + "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__": 132 + }, + "_enabled": true, + "__prefab": { + "__id__": 134 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 82, + "height": 81 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "86+gtOZuZDhY6Q/RpJFEgU" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 132 + }, + "_enabled": true, + "__prefab": { + "__id__": 136 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 190 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@e4b0d", + "__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": "05v6DJUcdErYOqgV84NetO" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d8/zNdkZhDR6eGiMIElULn", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "num", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 123 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 139 + }, + { + "__id__": 141 + } + ], + "_prefab": { + "__id__": 143 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, "y": 0, "z": 0 }, @@ -3062,11 +3340,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 138 }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 140 }, "_contentSize": { "__type__": "cc.Size", @@ -3090,11 +3368,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 138 }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 142 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3107,7 +3385,7 @@ "a": 255 }, "_string": "99", - "_horizontalAlign": 2, + "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 20, "_fontSize": 20, @@ -3171,20 +3449,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 117 + "__id__": 123 }, "_children": [], "_active": false, "_components": [ { - "__id__": 133 + "__id__": 145 }, { - "__id__": 135 + "__id__": 147 } ], "_prefab": { - "__id__": 137 + "__id__": 149 }, "_lpos": { "__type__": "cc.Vec3", @@ -3221,11 +3499,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 134 + "__id__": 146 }, "_contentSize": { "__type__": "cc.Size", @@ -3249,11 +3527,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 132 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 136 + "__id__": 148 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3330,16 +3608,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 117 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 151 }, "_contentSize": { "__type__": "cc.Size", - "width": 159, - "height": 20 + "width": 60, + "height": 60 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3358,18 +3636,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 117 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 141 + "__id__": 153 }, - "_alignFlags": 44, + "_alignFlags": 36, "_target": null, - "_left": 3, - "_right": 3, + "_left": 52.5, + "_right": -20, "_top": 0, - "_bottom": 49.763999999999996, + "_bottom": -14.236000000000004, "_horizontalCenter": 13.053, "_verticalCenter": 0, "_isAbsLeft": true, @@ -3411,20 +3689,20 @@ }, "_children": [ { - "__id__": 144 + "__id__": 156 }, { - "__id__": 150 + "__id__": 162 } ], "_active": false, "_components": [ { - "__id__": 156 + "__id__": 168 } ], "_prefab": { - "__id__": 158 + "__id__": 170 }, "_lpos": { "__type__": "cc.Vec3", @@ -3461,20 +3739,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 143 + "__id__": 155 }, "_children": [], "_active": true, "_components": [ { - "__id__": 145 + "__id__": 157 }, { - "__id__": 147 + "__id__": 159 } ], "_prefab": { - "__id__": 149 + "__id__": 161 }, "_lpos": { "__type__": "cc.Vec3", @@ -3511,11 +3789,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 158 }, "_contentSize": { "__type__": "cc.Size", @@ -3539,11 +3817,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 148 + "__id__": 160 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3597,20 +3875,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 143 + "__id__": 155 }, "_children": [], "_active": true, "_components": [ { - "__id__": 151 + "__id__": 163 }, { - "__id__": 153 + "__id__": 165 } ], "_prefab": { - "__id__": 155 + "__id__": 167 }, "_lpos": { "__type__": "cc.Vec3", @@ -3647,11 +3925,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 162 }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 164 }, "_contentSize": { "__type__": "cc.Size", @@ -3675,11 +3953,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 162 }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 166 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3756,11 +4034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 155 }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 169 }, "_contentSize": { "__type__": "cc.Size", @@ -3803,11 +4081,11 @@ "_active": true, "_components": [ { - "__id__": 160 + "__id__": 172 } ], "_prefab": { - "__id__": 162 + "__id__": 174 }, "_lpos": { "__type__": "cc.Vec3", @@ -3844,11 +4122,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 161 + "__id__": 173 }, "_contentSize": { "__type__": "cc.Size", @@ -3888,24 +4166,24 @@ "__id__": 16 }, "_children": [ - { - "__id__": 164 - }, - { - "__id__": 170 - }, { "__id__": 176 + }, + { + "__id__": 182 + }, + { + "__id__": 188 } ], "_active": true, "_components": [ { - "__id__": 182 + "__id__": 194 } ], "_prefab": { - "__id__": 184 + "__id__": 196 }, "_lpos": { "__type__": "cc.Vec3", @@ -3942,280 +4220,8 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 163 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 165 - }, - { - "__id__": 167 - } - ], - "_prefab": { - "__id__": 169 - }, - "_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__": 164 - }, - "_enabled": true, - "__prefab": { - "__id__": 166 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 33, - "height": 36 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "29lM8ylZdNuprRQx9FSOH6" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 164 - }, - "_enabled": true, - "__prefab": { - "__id__": 168 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 82, - "g": 255, - "b": 0, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@398ce", - "__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": "d3VjZMe5ZNI4qkmCRpGSL3" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "90KCBZ4GlPjoz+X/kqLT5Q", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "war", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 163 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 171 - }, - { - "__id__": 173 - } - ], - "_prefab": { "__id__": 175 }, - "_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__": 170 - }, - "_enabled": true, - "__prefab": { - "__id__": 172 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 36, - "height": 39 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b3vD6WKqNHULnCCoQ1U6Xm" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 170 - }, - "_enabled": true, - "__prefab": { - "__id__": 174 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 0, - "b": 0, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@69993", - "__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": "7cpkrTB0tPsZfGQiYs3IV+" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "33ek4Y5wZG9ozQE54RESKf", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "mag", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 163 - }, "_children": [], "_active": false, "_components": [ @@ -4270,6 +4276,278 @@ "__prefab": { "__id__": 178 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 33, + "height": 36 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "29lM8ylZdNuprRQx9FSOH6" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 176 + }, + "_enabled": true, + "__prefab": { + "__id__": 180 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 82, + "g": 255, + "b": 0, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@398ce", + "__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": "d3VjZMe5ZNI4qkmCRpGSL3" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "90KCBZ4GlPjoz+X/kqLT5Q", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "war", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 175 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 183 + }, + { + "__id__": 185 + } + ], + "_prefab": { + "__id__": 187 + }, + "_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__": 182 + }, + "_enabled": true, + "__prefab": { + "__id__": 184 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 36, + "height": 39 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b3vD6WKqNHULnCCoQ1U6Xm" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 182 + }, + "_enabled": true, + "__prefab": { + "__id__": 186 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 0, + "b": 0, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@69993", + "__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": "7cpkrTB0tPsZfGQiYs3IV+" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "33ek4Y5wZG9ozQE54RESKf", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "mag", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 175 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 189 + }, + { + "__id__": 191 + } + ], + "_prefab": { + "__id__": 193 + }, + "_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__": 188 + }, + "_enabled": true, + "__prefab": { + "__id__": 190 + }, "_contentSize": { "__type__": "cc.Size", "width": 39, @@ -4292,11 +4570,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 176 + "__id__": 188 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 192 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4350,11 +4628,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 163 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 195 }, "_contentSize": { "__type__": "cc.Size", @@ -4395,7 +4673,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 186 + "__id__": 198 }, "_contentSize": { "__type__": "cc.Size", @@ -4423,7 +4701,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 188 + "__id__": 200 }, "_alignFlags": 45, "_target": null, @@ -4472,26 +4750,26 @@ }, "_children": [ { - "__id__": 191 + "__id__": 203 } ], "_active": true, "_components": [ { - "__id__": 199 + "__id__": 211 }, { - "__id__": 201 + "__id__": 213 }, { - "__id__": 203 + "__id__": 215 }, { - "__id__": 205 + "__id__": 217 } ], "_prefab": { - "__id__": 207 + "__id__": 219 }, "_lpos": { "__type__": "cc.Vec3", @@ -4528,23 +4806,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 190 + "__id__": 202 }, "_children": [], "_active": true, "_components": [ { - "__id__": 192 + "__id__": 204 }, { - "__id__": 194 + "__id__": 206 }, { - "__id__": 196 + "__id__": 208 } ], "_prefab": { - "__id__": 198 + "__id__": 210 }, "_lpos": { "__type__": "cc.Vec3", @@ -4581,11 +4859,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 191 + "__id__": 203 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 205 }, "_contentSize": { "__type__": "cc.Size", @@ -4609,11 +4887,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 191 + "__id__": 203 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 207 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4654,11 +4932,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 191 + "__id__": 203 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 209 }, "playOnLoad": false, "_clips": [ @@ -4696,11 +4974,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 190 + "__id__": 202 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 212 }, "_contentSize": { "__type__": "cc.Size", @@ -4724,11 +5002,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 190 + "__id__": 202 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 214 }, "_type": 0, "_inverted": false, @@ -4746,11 +5024,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 190 + "__id__": 202 }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 216 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4792,11 +5070,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 190 + "__id__": 202 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 218 }, "_alignFlags": 45, "_target": null, @@ -4845,26 +5123,26 @@ }, "_children": [ { - "__id__": 209 + "__id__": 221 }, { - "__id__": 217 + "__id__": 229 } ], "_active": true, "_components": [ { - "__id__": 223 + "__id__": 235 }, { - "__id__": 225 + "__id__": 237 }, { - "__id__": 227 + "__id__": 239 } ], "_prefab": { - "__id__": 230 + "__id__": 242 }, "_lpos": { "__type__": "cc.Vec3", @@ -4901,23 +5179,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 208 + "__id__": 220 }, "_children": [], "_active": true, "_components": [ { - "__id__": 210 + "__id__": 222 }, { - "__id__": 212 + "__id__": 224 }, { - "__id__": 214 + "__id__": 226 } ], "_prefab": { - "__id__": 216 + "__id__": 228 }, "_lpos": { "__type__": "cc.Vec3", @@ -4954,11 +5232,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 223 }, "_contentSize": { "__type__": "cc.Size", @@ -4982,11 +5260,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 225 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5027,11 +5305,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 227 }, "_alignFlags": 45, "_target": null, @@ -5076,20 +5354,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 208 + "__id__": 220 }, "_children": [], "_active": true, "_components": [ { - "__id__": 218 + "__id__": 230 }, { - "__id__": 220 + "__id__": 232 } ], "_prefab": { - "__id__": 222 + "__id__": 234 }, "_lpos": { "__type__": "cc.Vec3", @@ -5126,11 +5404,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 231 }, "_contentSize": { "__type__": "cc.Size", @@ -5154,11 +5432,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 229 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 233 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5235,11 +5513,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 208 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 236 }, "_contentSize": { "__type__": "cc.Size", @@ -5263,11 +5541,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 208 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 238 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5305,15 +5583,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 208 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 240 }, "clickEvents": [ { - "__id__": 229 + "__id__": 241 } ], "_interactable": true, @@ -5353,7 +5631,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 208 + "__id__": 220 }, "_id": "" }, @@ -5394,7 +5672,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 244 }, "_contentSize": { "__type__": "cc.Size", @@ -5422,7 +5700,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 246 }, "_id": "" }, diff --git a/assets/resources/game/heros/top.prefab b/assets/resources/game/heros/top.prefab index b4848455..8933b2a0 100644 --- a/assets/resources/game/heros/top.prefab +++ b/assets/resources/game/heros/top.prefab @@ -91,7 +91,7 @@ "__id__": 11 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 19 @@ -741,7 +741,7 @@ "__id__": 39 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 45 @@ -752,8 +752,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -23.841, - "y": -33.63, + "x": 0, + "y": -18.226, "z": 0 }, "_lrot": { @@ -765,8 +765,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.2, - "y": 1.2, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -843,8 +843,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 25, - "height": 25 + "width": 35, + "height": 35 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -979,8 +979,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 15.123046875, - "height": 29.2 + "width": 17.90380859375, + "height": 35.5 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1018,10 +1018,10 @@ "_string": "5", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 25, + "_fontSize": 25, "_fontFamily": "Arial", - "_lineHeight": 20, + "_lineHeight": 25, "_overflow": 0, "_enableWrapText": true, "_font": null, @@ -1128,7 +1128,7 @@ "__id__": 49 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 55 @@ -1142,8 +1142,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 3.852, - "y": -16.452, + "x": 0, + "y": -17.782, "z": 0 }, "_lrot": { @@ -1192,8 +1192,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -33.829, - "y": 5.074, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -1205,8 +1205,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.3, - "y": 0.3, + "x": 0.5, + "y": 0.5, "z": 1 }, "_mobility": 0, @@ -1416,7 +1416,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 35, - "y": -140, + "y": -129.839, "z": 0 }, "_lrot": { @@ -1806,7 +1806,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -35, - "y": -140, + "y": -129.839, "z": 0 }, "_lrot": { diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index b6356f95..5282c1a0 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -6541,7 +6541,7 @@ "__id__": 275 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 281 @@ -6840,7 +6840,7 @@ "__id__": 287 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 293 @@ -7139,7 +7139,7 @@ "__id__": 299 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 305 diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 674f85a7..eaec2205 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -12697,7 +12697,7 @@ "r": 255, "g": 255, "b": 255, - "a": 179 + "a": 255 }, "_spriteFrame": { "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@58cb7", @@ -12893,7 +12893,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -192.496, + "x": 0, "y": 423.026, "z": 0 }, @@ -15366,7 +15366,7 @@ "b": 255, "a": 255 }, - "_string": "9999", + "_string": "5", "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 40, @@ -16035,7 +16035,7 @@ "b": 255, "a": 255 }, - "_string": "9", + "_string": "999", "_horizontalAlign": 2, "_verticalAlign": 1, "_actualFontSize": 40, @@ -17495,7 +17495,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -148, - "y": 200, + "y": 235.382, "z": 0 }, "_lrot": { @@ -17636,7 +17636,7 @@ "_top": 0, "_bottom": 0, "_horizontalCenter": 0, - "_verticalCenter": 200, + "_verticalCenter": 235.382, "_isAbsLeft": true, "_isAbsRight": true, "_isAbsTop": true, @@ -17715,8 +17715,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.8, + "y": 0.8, "z": 1 }, "_mobility": 0, @@ -17765,7 +17765,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -233.33333333333331, + "x": 109.141, "y": 0, "z": 0 }, @@ -17808,7 +17808,7 @@ "__id__": 807 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 813 @@ -19123,8 +19123,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 2.842170943040401e-14, - "y": 0, + "x": -124.728, + "y": 150.476, "z": 0 }, "_lrot": { @@ -19166,7 +19166,7 @@ "__id__": 864 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 870 @@ -20413,7 +20413,7 @@ "_left": 0, "_right": 0, "_top": 0, - "_bottom": 0, + "_bottom": 150.476, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -20481,8 +20481,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 233.33333333333337, - "y": 0, + "x": -120.907, + "y": -110.394, "z": 0 }, "_lrot": { @@ -20524,7 +20524,7 @@ "__id__": 921 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 927 @@ -21771,7 +21771,7 @@ "_left": 0, "_right": 0, "_top": 0, - "_bottom": 0, + "_bottom": -110.39399999999999, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -21817,7 +21817,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 700, + "width": 875, "height": 100 }, "_anchorPoint": { @@ -21875,7 +21875,7 @@ "node": { "__id__": 798 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 975 }, @@ -21955,7 +21955,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -300, + "y": -350.543, "z": 0 }, "_lrot": { @@ -21994,7 +21994,7 @@ "__id__": 979 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 987 @@ -22338,7 +22338,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 2.5, + "y": 67.5, "z": 0 }, "_lrot": { @@ -22667,7 +22667,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -62.5, + "y": 2.5, "z": 0 }, "_lrot": { @@ -23015,7 +23015,7 @@ "_top": 0, "_bottom": 200, "_horizontalCenter": 0, - "_verticalCenter": -300, + "_verticalCenter": -350.543, "_isAbsLeft": true, "_isAbsRight": true, "_isAbsTop": true, diff --git a/assets/script/game/common/config/MissionSet.ts b/assets/script/game/common/config/Mission.ts similarity index 72% rename from assets/script/game/common/config/MissionSet.ts rename to assets/script/game/common/config/Mission.ts index 8c94f9af..6e527d55 100644 --- a/assets/script/game/common/config/MissionSet.ts +++ b/assets/script/game/common/config/Mission.ts @@ -11,8 +11,8 @@ export const BossList = { } } -export const MissionNum = 3 //对应关卡数MissionSet 的索引 -export const MissionSet = [ +export const MissionNum = 3 //对应关卡数MissionMons 的索引 +export const MissionMons = [ [5201,5202,5203,5204,5205,5206,5210,5211,5212], [5213,5214,5215], [5201], @@ -52,3 +52,17 @@ export const MissStatus = { choose:3, end:4, } +export enum FightSet { + ATK_TO_ATK_RATIO=0.1, + ATK_TO_HP_RATIO=0.2, + ATK_TO_SHIELD_RATIO=2, + ATK_LINES = 3, //英雄数 + MON_GOLD_ADD =2, + MON_COIN_ADD=2, + COIN_ADD=1, + DEF_RATE=0.7, + DODGE_MAX=70, + HERO_NUM=3, + AP_UPDATE_RATE=100, + AP_CHANGE_RATE=0, +} diff --git a/assets/script/game/common/config/MissionSet.ts.meta b/assets/script/game/common/config/Mission.ts.meta similarity index 70% rename from assets/script/game/common/config/MissionSet.ts.meta rename to assets/script/game/common/config/Mission.ts.meta index 77f19252..34a1919a 100644 --- a/assets/script/game/common/config/MissionSet.ts.meta +++ b/assets/script/game/common/config/Mission.ts.meta @@ -2,7 +2,7 @@ "ver": "4.0.23", "importer": "typescript", "imported": true, - "uuid": "1a81eb9e-feb4-483f-a5c0-ca5f0b358627", + "uuid": "26aee2e6-ab33-4155-a0aa-221c6be8d030", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/script/game/hero/BuffComp.ts b/assets/script/game/hero/BuffComp.ts index 00a2fb4b..61a024d8 100644 --- a/assets/script/game/hero/BuffComp.ts +++ b/assets/script/game/hero/BuffComp.ts @@ -39,13 +39,19 @@ export class BuffComp extends Component { info_init(){ this.top_node = this.node.getChildByName("top"); + this.top_node.getChildByName("lv").active=(this.node.getComponent(HeroViewComp).fac == 0 ? true : false) + // this.top_node.getChildByName("hp").active=(this.node.getComponent(HeroViewComp).fac == 1 ? true : false) + this.top_node.getChildByName("sboss").active=this.node.getComponent(HeroViewComp).is_boss + this.top_node.getChildByName("lv").getChildByName("lv").getComponent(Label)!.string = this.node.getComponent(HeroViewComp).lv.toFixed(0) this.top_node.getChildByName("ihp").getChildByName("num").getComponent(Label)!.string = this.node.getComponent(HeroViewComp).hp.toFixed(0) this.top_node.getChildByName("iap").getChildByName("num").getComponent(Label)!.string = this.node.getComponent(HeroViewComp).ap.toFixed(0) + this.top_node.getChildByName("ihp").active=false + this.top_node.getChildByName("iap").active=false } update(deltaTime: number) { if(smc.mission.pause) return - // this.hp_show() + this.hp_show() if(this.wind_cd > 0 ) this.wind_cd -= deltaTime; if(this.wind_cd <= 0 && this.node.getChildByName("wind").active){ this.node.getChildByName("wind").active = false; @@ -55,25 +61,16 @@ export class BuffComp extends Component { if(this.buff_cd <= 0 && this.node.getChildByName("buff").active){ this.node.getChildByName("buff").active = false; } - this.in_speek(deltaTime) - } hp_show(){ - if(this.node.getComponent(HeroViewComp).fac == 0) { - this.top_node.getChildByName("hp").active = false; - this.update_info_hp() - }else{ - this.top_node.getChildByName("lv").active = true; - let hp=this.node.getComponent(HeroViewComp).hp; - let hp_max=this.node.getComponent(HeroViewComp).hp_max; - let hp_progress= hp/hp_max; - this.top_node.getChildByName("hp").getComponent(ProgressBar)!.progress = hp_progress; - if(this.node.getComponent(HeroViewComp).is_boss) return - this.top_node.getChildByName("hp").active = (hp == hp_max) ? false : true; - } - - + // if(this.node.getComponent(HeroViewComp).fac == 0) return + let hp=this.node.getComponent(HeroViewComp).hp; + let hp_max=this.node.getComponent(HeroViewComp).hp_max; + let hp_progress= hp/hp_max; + this.top_node.getChildByName("hp").getComponent(ProgressBar)!.progress = hp_progress; + if(this.node.getComponent(HeroViewComp).is_boss) return + this.top_node.getChildByName("hp").active = (hp == hp_max) ? false : true; } show_shield(val:boolean){ this.node.getChildByName("shielded").active=val @@ -89,7 +86,10 @@ export class BuffComp extends Component { iap_node.getChildByName("num").getComponent(Label)!.string = this.node.getComponent(HeroViewComp).ap.toFixed(0) } - + update_info_lv(){ + let lv_node = this.top_node.getChildByName("lv"); + lv_node.getChildByName("lv").getComponent(Label)!.string = this.node.getComponent(HeroViewComp).lv.toFixed(0) + } show_wind(t:number=1){ this.wind_cd = t; diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts index 2439f850..5fcf8207 100644 --- a/assets/script/game/hero/Hero.ts +++ b/assets/script/game/hero/Hero.ts @@ -53,6 +53,7 @@ export class Hero extends ecs.Entity { hv.dis = hero.dis; hv.hp= hv.hp_max =hero.hp+info.hp; hv.ap = hero.ap+info.ap; + hv.lv=info.lv+1 hv.cd = hero.a_cd hv.ap_u=hero.ap_u hv.ap_ur=hero.ap_ur diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index e34e93ba..58491c2e 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -2,7 +2,7 @@ import { Vec3, _decorator , v3,Collider2D,Contact2DType,Label ,Node,Prefab,insta import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { HeroSpine } from "./HeroSpine"; -import { BoxSet, GameSet } from "../common/config/BoxSet"; +import { BoxSet } from "../common/config/BoxSet"; import { smc } from "../common/SingletonModuleComp"; import { Skill } from "../skills/Skill"; import { Timer } from "../../../../extensions/oops-plugin-framework/assets/core/common/timer/Timer"; @@ -247,11 +247,18 @@ export class HeroViewComp extends CCComp { } do_change(){ - + this.BUFFCOMP.update_info_ap() + this.BUFFCOMP.update_info_hp() + this.BUFFCOMP.update_info_lv() } + do_update(){ - + this.BUFFCOMP.update_info_ap() + this.BUFFCOMP.update_info_hp() + this.BUFFCOMP.update_info_lv() } + + do_dead(){ } @@ -273,7 +280,7 @@ export class HeroViewComp extends CCComp { if(this.ent == null) return; this.ent.destroy(); } - this.BUFFCOMP.hp_show() + this.BUFFCOMP.update_info_hp() this.showDamage(remainingDamage, true); } } diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts index 35deb5d9..da0394d4 100644 --- a/assets/script/game/map/MissionComp.ts +++ b/assets/script/game/map/MissionComp.ts @@ -6,7 +6,7 @@ import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/O import { HeroModelComp } from "../hero/HeroModelComp"; import { BoxSet } from "../common/config/BoxSet"; import { MonModelComp } from "../hero/MonModelComp"; -import { Missions,} from "../common/config/MissionSet"; +import { Missions} from "../common/config/Mission"; import { Timer } from "../../../../extensions/oops-plugin-framework/assets/core/common/timer/Timer"; import { VictoryComp } from "./VictoryComp"; import { MSkillComp } from "./MSkillComp"; diff --git a/assets/script/game/map/MissionHeroComp.ts b/assets/script/game/map/MissionHeroComp.ts index 4f6c70b8..1f24d36f 100644 --- a/assets/script/game/map/MissionHeroComp.ts +++ b/assets/script/game/map/MissionHeroComp.ts @@ -1,7 +1,7 @@ import { _decorator, resources, Sprite, SpriteAtlas, SpriteFrame, v3, Vec3 } from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; -import { BoxSet, GameSet } from "../common/config/BoxSet"; +import { BoxSet, } from "../common/config/BoxSet"; import { HeroInfo, HeroList, HeroPos, HeroSet, HeroUpInfo } from "../common/config/heroSet"; import { Hero } from "../hero/Hero"; import { smc } from "../common/SingletonModuleComp"; @@ -11,6 +11,7 @@ import { GameEvent } from "../common/config/GameEvent"; import { HeroModelComp } from "../hero/HeroModelComp"; import { HeroViewComp } from "../hero/HeroViewComp"; import { oops } from "db://oops-framework/core/Oops"; +import { FightSet } from "../common/config/Mission"; const { ccclass, property } = _decorator; @@ -113,23 +114,34 @@ export class MissionHeroCompComp extends CCComp { for(let hero of heros){ if(hero.get(HeroViewComp).fight_pos==fight_pos){ let hv = hero.get(HeroViewComp) - let AP_UP_RATE = hv.hero_uuid === uuid ? GameSet.AP_UPDATE_RATE : GameSet.AP_CHANGE_RATE; - let heroUpData = HeroUpInfo[hv.hero_uuid] || {} - let o_ap_rate = heroUpData.ap_up_rate || 0 //被替换 升级的英雄额外被替换攻击增长比率 - let o_ap = heroUpData.ap_up || 0 //被替换 升级的英雄额外被替换攻击增长值 - let s_ap_rate = (HeroUpInfo[uuid] || {}).ap_up_rate || 0 //替换 升级的英雄额外替换攻击增长比率 - let s_ap = (HeroUpInfo[uuid] || {}).ap_up || 0 //替换 升级的英雄额外替换攻击增长值 - let o_hp_up = heroUpData.hp_up || 0 //被替换 升级的英雄额外被替换血量增长值 - let s_hp_up = (HeroUpInfo[uuid] || {}).hp_up || 0 //替换 升级的英雄额外替换血量增长值 - info.ap=Math.floor(hv.ap*(AP_UP_RATE+o_ap_rate+s_ap_rate)/100+o_ap+s_ap) - info.hp=Math.floor(o_hp_up+s_hp_up) - info.lv=hv.lv + // let AP_UP_RATE = hv.hero_uuid === uuid ? FightSet.AP_UPDATE_RATE : FightSet.AP_CHANGE_RATE; + // let heroUpData = HeroUpInfo[hv.hero_uuid] || {} + // let o_ap_rate = heroUpData.ap_up_rate || 0 //被替换 升级的英雄额外被替换攻击增长比率 + // let o_ap = heroUpData.ap_up || 0 //被替换 升级的英雄额外被替换攻击增长值 + // let s_ap_rate = (HeroUpInfo[uuid] || {}).ap_up_rate || 0 //替换 升级的英雄额外替换攻击增长比率 + // let s_ap = (HeroUpInfo[uuid] || {}).ap_up || 0 //替换 升级的英雄额外替换攻击增长值 + // let o_hp_up = heroUpData.hp_up || 0 //被替换 升级的英雄额外被替换血量增长值 + // let s_hp_up = (HeroUpInfo[uuid] || {}).hp_up || 0 //替换 升级的英雄额外替换血量增长值 + // info.ap=Math.floor(hv.ap*(AP_UP_RATE+o_ap_rate+s_ap_rate)/100+o_ap+s_ap) + // info.hp=Math.floor(o_hp_up+s_hp_up) + if(hv.hero_uuid === uuid){ + info.ap=hv.ap + info.hp=hv.hp_max + info.lv=hv.lv + }else{ + this.do_hero_change() + } + hero.destroy() return info } } return info } + do_hero_change(){ + //金币加1 + } + /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */ reset() { // this.node.destroy(); diff --git a/assets/script/game/map/MissionMonComp.ts b/assets/script/game/map/MissionMonComp.ts index 88fe100e..f1075369 100644 --- a/assets/script/game/map/MissionMonComp.ts +++ b/assets/script/game/map/MissionMonComp.ts @@ -4,7 +4,7 @@ import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/modu import { Monster } from "../hero/Mon"; import { BoxSet } from "../common/config/BoxSet"; import { HeroSet, MonSet } from "../common/config/heroSet"; -import { Missions } from "../common/config/MissionSet"; +import { Missions } from "../common/config/Mission"; import { RandomManager } from "db://oops-framework/core/common/random/RandomManager"; import { Timer } from "db://oops-framework/core/common/timer/Timer"; import { smc } from "../common/SingletonModuleComp"; diff --git a/assets/script/game/map/VictoryComp.ts b/assets/script/game/map/VictoryComp.ts index 25ae5710..7de2dc92 100644 --- a/assets/script/game/map/VictoryComp.ts +++ b/assets/script/game/map/VictoryComp.ts @@ -5,7 +5,7 @@ import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/O import { smc } from "../common/SingletonModuleComp"; import { HeroViewComp } from "../hero/HeroViewComp"; import { RandomManager } from "../../../../extensions/oops-plugin-framework/assets/core/common/random/RandomManager"; -import { MissionReward } from "../common/config/MissionSet"; +import { MissionReward } from "../common/config/Mission"; import { Items } from "../common/config/Items"; import { Item } from "./Item"; import { UIID } from "../common/config/GameUIConfig";