diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index 85175ab0..b6356f95 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -28,17 +28,17 @@ "_active": true, "_components": [ { - "__id__": 328 + "__id__": 346 }, { - "__id__": 330 + "__id__": 348 }, { - "__id__": 332 + "__id__": 350 } ], "_prefab": { - "__id__": 334 + "__id__": 352 }, "_lpos": { "__type__": "cc.Vec3", @@ -197,17 +197,17 @@ "_active": true, "_components": [ { - "__id__": 321 + "__id__": 339 }, { - "__id__": 323 + "__id__": 341 }, { - "__id__": 325 + "__id__": 343 } ], "_prefab": { - "__id__": 327 + "__id__": 345 }, "_lpos": { "__type__": "cc.Vec3", @@ -251,23 +251,23 @@ "__id__": 8 }, { - "__id__": 302 + "__id__": 320 }, { - "__id__": 306 + "__id__": 324 }, { - "__id__": 312 + "__id__": 330 } ], "_active": true, "_components": [ { - "__id__": 318 + "__id__": 336 } ], "_prefab": { - "__id__": 320 + "__id__": 338 }, "_lpos": { "__type__": "cc.Vec3", @@ -314,14 +314,14 @@ "_active": true, "_components": [ { - "__id__": 297 + "__id__": 315 }, { - "__id__": 299 + "__id__": 317 } ], "_prefab": { - "__id__": 301 + "__id__": 319 }, "_lpos": { "__type__": "cc.Vec3", @@ -374,23 +374,23 @@ "__id__": 274 }, { - "__id__": 280 + "__id__": 286 }, { - "__id__": 286 + "__id__": 298 } ], "_active": true, "_components": [ { - "__id__": 292 + "__id__": 310 }, { - "__id__": 294 + "__id__": 312 } ], "_prefab": { - "__id__": 296 + "__id__": 314 }, "_lpos": { "__type__": "cc.Vec3", @@ -673,6 +673,8 @@ "__id__": 0 }, "fileId": "e5YY6o685M9Z7gvdt6zJLo", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -943,6 +945,8 @@ "__id__": 0 }, "fileId": "75eW6GnNxHzIm2yg/lFojM", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1213,6 +1217,8 @@ "__id__": 0 }, "fileId": "32K1PXsh9KEK6cZ4532Yjj", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1483,6 +1489,8 @@ "__id__": 0 }, "fileId": "d6eDWtEsVDW5d1LbMnAMCY", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -5035,6 +5043,8 @@ "__id__": 0 }, "fileId": "aes7687ttO+aIrBfdZu9mr", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -5377,6 +5387,8 @@ "__id__": 0 }, "fileId": "486JO1LqxOO7ETGOfkuKJ3", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6518,24 +6530,28 @@ }, { "__type__": "cc.Node", - "_name": "BubbleFrame01_Hexagon_Bg_Blue", + "_name": "3", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 9 }, - "_children": [], + "_children": [ + { + "__id__": 275 + } + ], "_active": true, "_components": [ { - "__id__": 275 + "__id__": 281 }, { - "__id__": 277 + "__id__": 283 } ], "_prefab": { - "__id__": 279 + "__id__": 285 }, "_lpos": { "__type__": "cc.Vec3", @@ -6553,7 +6569,57 @@ "_lscale": { "__type__": "cc.Vec3", "x": 0.7, - "y": 0.7, + "y": 0.5, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 274 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 276 + }, + { + "__id__": 278 + } + ], + "_prefab": { + "__id__": 280 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 7.522, + "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, @@ -6566,6 +6632,115 @@ }, "_id": "" }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 275 + }, + "_enabled": true, + "__prefab": { + "__id__": 277 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 62.4921875, + "height": 131.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c0lpX8SOJLfryzW5Ffc42+" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 275 + }, + "_enabled": true, + "__prefab": { + "__id__": 279 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 192, + "g": 186, + "b": 186, + "a": 255 + }, + "_string": "3", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 80, + "_fontSize": 80, + "_fontFamily": "Arial", + "_lineHeight": 90, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 82, + "g": 82, + "b": 82, + "a": 255 + }, + "_outlineWidth": 9, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fcZAy/xgRCzLPKKzqymU3e" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b4gynsEN5BBrkQUFc2uFUt", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -6576,7 +6751,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 282 }, "_contentSize": { "__type__": "cc.Size", @@ -6603,142 +6778,6 @@ "__id__": 274 }, "_enabled": true, - "__prefab": { - "__id__": 278 - }, - "_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@62d7f", - "__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": "8fbJU5d6tMw5dErXumn0kM" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "46fzULVGFDzbaJnmjgPD/B", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "BubbleFrame01_Hexagon_Bg_Green", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 9 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 281 - }, - { - "__id__": 283 - } - ], - "_prefab": { - "__id__": 285 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -270, - "y": 205, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.7, - "y": 0.7, - "z": 1 - }, - "_mobility": 0, - "_layer": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 280 - }, - "_enabled": true, - "__prefab": { - "__id__": 282 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 125, - "height": 122 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "29g3YRNF1Pkp3vZBGP5fLl" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 280 - }, - "_enabled": true, "__prefab": { "__id__": 284 }, @@ -6752,142 +6791,6 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@9bff3", - "__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": "0dkAUR1RZDVo8FnUkg7/T3" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "2amAPXO8dJnbCelfDSf8iM", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "BubbleFrame01_Hexagon_Bg_Yellow", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 9 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 287 - }, - { - "__id__": 289 - } - ], - "_prefab": { - "__id__": 291 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -140, - "y": 135, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.7, - "y": 0.7, - "z": 1 - }, - "_mobility": 0, - "_layer": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 286 - }, - "_enabled": true, - "__prefab": { - "__id__": 288 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 125, - "height": 122 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "13KKLVA4pLu7uqLbrXcvNS" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 286 - }, - "_enabled": true, - "__prefab": { - "__id__": 290 - }, - "_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@bd51c", "__expectedType__": "cc.SpriteFrame" @@ -6903,7 +6806,605 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": false, + "_useGrayscale": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8fbJU5d6tMw5dErXumn0kM" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "46fzULVGFDzbaJnmjgPD/B", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 9 + }, + "_children": [ + { + "__id__": 287 + } + ], + "_active": true, + "_components": [ + { + "__id__": 293 + }, + { + "__id__": 295 + } + ], + "_prefab": { + "__id__": 297 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -270, + "y": 205, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.7, + "y": 0.5, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 286 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 288 + }, + { + "__id__": 290 + } + ], + "_prefab": { + "__id__": 292 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 7.522, + "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": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 287 + }, + "_enabled": true, + "__prefab": { + "__id__": 289 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 62.4921875, + "height": 131.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "87F7tb97tOxJgH8nk54AQW" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 287 + }, + "_enabled": true, + "__prefab": { + "__id__": 291 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 192, + "g": 186, + "b": 186, + "a": 255 + }, + "_string": "2", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 80, + "_fontSize": 80, + "_fontFamily": "Arial", + "_lineHeight": 90, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 82, + "g": 82, + "b": 82, + "a": 255 + }, + "_outlineWidth": 9, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2dFBfmgyhPy5o3TPxA1GYe" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "42AuiXoxdPvZ4O/9u3ezJO", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 286 + }, + "_enabled": true, + "__prefab": { + "__id__": 294 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 125, + "height": 122 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "29g3YRNF1Pkp3vZBGP5fLl" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 286 + }, + "_enabled": true, + "__prefab": { + "__id__": 296 + }, + "_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@bd51c", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0dkAUR1RZDVo8FnUkg7/T3" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2amAPXO8dJnbCelfDSf8iM", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 9 + }, + "_children": [ + { + "__id__": 299 + } + ], + "_active": true, + "_components": [ + { + "__id__": 305 + }, + { + "__id__": 307 + } + ], + "_prefab": { + "__id__": 309 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -150, + "y": 135, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.7, + "y": 0.5, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 298 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 300 + }, + { + "__id__": 302 + } + ], + "_prefab": { + "__id__": 304 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 7.522, + "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": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 299 + }, + "_enabled": true, + "__prefab": { + "__id__": 301 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 62.4921875, + "height": 131.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ecbn9V+b9Gya4dhLsjQ1nO" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 299 + }, + "_enabled": true, + "__prefab": { + "__id__": 303 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 192, + "g": 186, + "b": 186, + "a": 255 + }, + "_string": "1", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 80, + "_fontSize": 80, + "_fontFamily": "Arial", + "_lineHeight": 90, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 82, + "g": 82, + "b": 82, + "a": 255 + }, + "_outlineWidth": 9, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "aaxZAE7K5KUpu6QXOqO0y0" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b4layO+BtN37B68VeGUia2", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 298 + }, + "_enabled": true, + "__prefab": { + "__id__": 306 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 125, + "height": 122 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "13KKLVA4pLu7uqLbrXcvNS" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 298 + }, + "_enabled": true, + "__prefab": { + "__id__": 308 + }, + "_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@bd51c", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": true, "_atlas": null, "_id": "" }, @@ -6934,7 +7435,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 311 }, "_contentSize": { "__type__": "cc.Size", @@ -6962,7 +7463,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 313 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7006,6 +7507,8 @@ "__id__": 0 }, "fileId": "6dFdGsgPxD8oVoba7hVEO3", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -7018,7 +7521,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 298 + "__id__": 316 }, "_contentSize": { "__type__": "cc.Size", @@ -7046,10 +7549,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 318 }, "bgImg": { - "__id__": 294 + "__id__": 312 }, "_id": "" }, @@ -7082,11 +7585,11 @@ "_active": true, "_components": [ { - "__id__": 303 + "__id__": 321 } ], "_prefab": { - "__id__": 305 + "__id__": 323 }, "_lpos": { "__type__": "cc.Vec3", @@ -7123,11 +7626,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 302 + "__id__": 320 }, "_enabled": true, "__prefab": { - "__id__": 304 + "__id__": 322 }, "_contentSize": { "__type__": "cc.Size", @@ -7170,14 +7673,14 @@ "_active": true, "_components": [ { - "__id__": 307 + "__id__": 325 }, { - "__id__": 309 + "__id__": 327 } ], "_prefab": { - "__id__": 311 + "__id__": 329 }, "_lpos": { "__type__": "cc.Vec3", @@ -7214,11 +7717,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 306 + "__id__": 324 }, "_enabled": true, "__prefab": { - "__id__": 308 + "__id__": 326 }, "_contentSize": { "__type__": "cc.Size", @@ -7242,11 +7745,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 306 + "__id__": 324 }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 328 }, "_id": "" }, @@ -7279,14 +7782,14 @@ "_active": true, "_components": [ { - "__id__": 313 + "__id__": 331 }, { - "__id__": 315 + "__id__": 333 } ], "_prefab": { - "__id__": 317 + "__id__": 335 }, "_lpos": { "__type__": "cc.Vec3", @@ -7323,11 +7826,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 312 + "__id__": 330 }, "_enabled": true, "__prefab": { - "__id__": 314 + "__id__": 332 }, "_contentSize": { "__type__": "cc.Size", @@ -7351,11 +7854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 312 + "__id__": 330 }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 334 }, "light": { "__uuid__": "319c7eb8-9826-48b6-81e4-82559dbf82a8", @@ -7390,7 +7893,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 319 + "__id__": 337 }, "_contentSize": { "__type__": "cc.Size", @@ -7431,7 +7934,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 340 }, "_contentSize": { "__type__": "cc.Size", @@ -7459,7 +7962,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 324 + "__id__": 342 }, "camera": { "__id__": 3 @@ -7468,16 +7971,16 @@ "__id__": 7 }, "mapLayer": { - "__id__": 299 + "__id__": 317 }, "floorLayer": { - "__id__": 302 + "__id__": 320 }, "entityLayer": { - "__id__": 309 + "__id__": 327 }, "SkillLayer": { - "__id__": 315 + "__id__": 333 }, "isFollowPlayer": true, "_id": "" @@ -7496,7 +7999,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 326 + "__id__": 344 }, "_id": "" }, @@ -7527,7 +8030,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 347 }, "_contentSize": { "__type__": "cc.Size", @@ -7555,7 +8058,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 331 + "__id__": 349 }, "_cameraComponent": { "__id__": 3 @@ -7577,7 +8080,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 333 + "__id__": 351 }, "_alignFlags": 45, "_target": null, diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 59a067cf..384bd967 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -15745,7 +15745,7 @@ "component": "", "_componentId": "0e186v7IoJEnZ9QdXVZry2W", "handler": "call_hero", - "customEventData": "0" + "customEventData": "1" }, { "__type__": "cc.PrefabInfo", @@ -17103,7 +17103,7 @@ "component": "", "_componentId": "0e186v7IoJEnZ9QdXVZry2W", "handler": "call_hero", - "customEventData": "0" + "customEventData": "2" }, { "__type__": "cc.PrefabInfo", diff --git a/assets/script/game/map/MissionHeroComp.ts b/assets/script/game/map/MissionHeroComp.ts index e58f22e1..cf594438 100644 --- a/assets/script/game/map/MissionHeroComp.ts +++ b/assets/script/game/map/MissionHeroComp.ts @@ -20,7 +20,7 @@ const { ccclass, property } = _decorator; export class MissionHeroCompComp extends CCComp { timer:Timer=new Timer(2) start_pos:any={ - 0:{pos:v3(-140,135,0),has:false}, + 0:{pos:v3(-150,135,0),has:false}, 1:{pos:v3(-270,205,0),has:false}, 2:{pos:v3(-270,65,0),has:false}, }