diff --git a/assets/resources/gui/gui2.plist b/assets/resources/gui/gui2.plist index effca495..890649b4 100644 --- a/assets/resources/gui/gui2.plist +++ b/assets/resources/gui/gui2.plist @@ -15,7 +15,7 @@ spriteSourceSize {720,148} textureRect - {{256,1},{720,148}} + {{1,256},{720,148}} textureRotated @@ -30,9 +30,9 @@ spriteSourceSize {134,279} textureRect - {{359,353},{134,279}} + {{723,256},{134,279}} textureRotated - + 6_Collection_Detail_3_Rare.png @@ -45,7 +45,7 @@ spriteSourceSize {30,30} textureRect - {{978,1},{30,30}} + {{1,1006},{30,30}} textureRotated @@ -60,7 +60,37 @@ spriteSourceSize {105,600} textureRect - {{256,151},{101,598}} + {{1,406},{101,598}} + textureRotated + + + Icon_Close02.png + + aliases + + spriteOffset + {0,0} + spriteSize + {75,75} + spriteSourceSize + {75,75} + textureRect + {{928,846},{75,75}} + textureRotated + + + Icon_Pause.png + + aliases + + spriteOffset + {0,0} + spriteSize + {61,64} + spriteSourceSize + {61,64} + textureRect + {{914,520},{61,64}} textureRotated @@ -75,9 +105,9 @@ spriteSourceSize {124,82} textureRect - {{453,868},{124,82}} + {{895,595},{124,82}} textureRotated - + UI-074.png @@ -90,7 +120,7 @@ spriteSourceSize {153,73} textureRect - {{384,952},{153,73}} + {{759,520},{153,73}} textureRotated @@ -105,7 +135,7 @@ spriteSourceSize {406,200} textureRect - {{359,151},{406,200}} + {{104,406},{406,200}} textureRotated @@ -120,7 +150,7 @@ spriteSourceSize {244,155} textureRect - {{495,353},{244,155}} + {{104,859},{244,155}} textureRotated @@ -135,7 +165,7 @@ spriteSourceSize {145,135} textureRect - {{581,647},{145,135}} + {{350,907},{145,135}} textureRotated @@ -150,7 +180,7 @@ spriteSourceSize {145,135} textureRect - {{581,784},{145,135}} + {{497,892},{145,135}} textureRotated @@ -165,7 +195,7 @@ spriteSourceSize {245,135} textureRect - {{495,510},{245,135}} + {{512,406},{245,135}} textureRotated @@ -180,7 +210,7 @@ spriteSourceSize {145,135} textureRect - {{728,726},{145,135}} + {{644,892},{145,135}} textureRotated @@ -195,9 +225,9 @@ spriteSourceSize {145,135} textureRect - {{875,726},{145,135}} + {{748,595},{145,135}} textureRotated - + frame7.png @@ -210,7 +240,7 @@ spriteSourceSize {145,135} textureRect - {{728,863},{145,135}} + {{748,732},{145,135}} textureRotated @@ -225,7 +255,7 @@ spriteSourceSize {145,135} textureRect - {{875,873},{145,135}} + {{791,869},{145,135}} textureRotated @@ -240,9 +270,9 @@ spriteSourceSize {120,123} textureRect - {{579,921},{120,123}} + {{895,721},{120,123}} textureRotated - + shop_product1.png @@ -255,9 +285,9 @@ spriteSourceSize {126,219} textureRect - {{256,751},{126,219}} + {{759,392},{126,219}} textureRotated - + shop_product2.png @@ -270,7 +300,7 @@ spriteSourceSize {126,219} textureRect - {{742,470},{126,219}} + {{512,543},{126,219}} textureRotated @@ -285,9 +315,9 @@ spriteSourceSize {126,219} textureRect - {{742,598},{126,219}} + {{492,671},{126,219}} textureRotated - + shop_product4.png @@ -300,7 +330,7 @@ spriteSourceSize {126,219} textureRect - {{453,647},{126,219}} + {{620,671},{126,219}} textureRotated @@ -315,9 +345,9 @@ spriteSourceSize {317,249} textureRect - {{767,151},{317,249}} + {{104,608},{317,249}} textureRotated - + shop_title_bg.png @@ -330,7 +360,7 @@ spriteSourceSize {297,67} textureRect - {{384,634},{297,67}} + {{423,608},{297,67}} textureRotated @@ -347,7 +377,7 @@ textureRect {{1,1},{1020,253}} textureRotated - + metadata @@ -361,9 +391,9 @@ realTextureFileName gui2.png size - {1017,1042} + {1022,1043} smartupdate - $TexturePacker:SmartUpdate:a5befcd523e49a6354108518d6fb51cc:fc1fb1e1aaa8476e539fd55c26efa2e6:02d895b6f8eccee3d27099fa0f66bd83$ + $TexturePacker:SmartUpdate:9d5bdd87c3bf91d60747faff1ea9495f:76681c0714b9b68832b7b1d9be41ac21:02d895b6f8eccee3d27099fa0f66bd83$ textureFileName gui2.png diff --git a/assets/resources/gui/gui2.plist.meta b/assets/resources/gui/gui2.plist.meta index 5e9cb36c..1f60f4d2 100644 --- a/assets/resources/gui/gui2.plist.meta +++ b/assets/resources/gui/gui2.plist.meta @@ -19,8 +19,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 256, - "trimY": 151, + "trimX": 1, + "trimY": 406, "width": 101, "height": 598, "rawWidth": 105, @@ -65,8 +65,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 453, - "trimY": 647, + "trimX": 620, + "trimY": 671, "width": 126, "height": 219, "rawWidth": 126, @@ -111,8 +111,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 875, - "trimY": 873, + "trimX": 791, + "trimY": 869, "width": 145, "height": 135, "rawWidth": 145, @@ -157,8 +157,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 256, - "trimY": 1, + "trimX": 1, + "trimY": 256, "width": 720, "height": 148, "rawWidth": 720, @@ -200,11 +200,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 359, - "trimY": 353, + "trimX": 723, + "trimY": 256, "width": 134, "height": 279, "rawWidth": 134, @@ -249,8 +249,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 978, - "trimY": 1, + "trimX": 1, + "trimY": 1006, "width": 30, "height": 30, "rawWidth": 30, @@ -283,6 +283,98 @@ ], "subMetas": {} }, + "7c79a": { + "importer": "sprite-frame", + "uuid": "8e53e122-d71b-440a-bb07-9938dd6c20d9@7c79a", + "displayName": "", + "id": "7c79a", + "name": "Icon_Close02", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 928, + "trimY": 846, + "width": 75, + "height": 75, + "rawWidth": 75, + "rawHeight": 75, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "b502af19-a87f-4a60-8218-986fe24f1d77@6c48a", + "atlasUuid": "8e53e122-d71b-440a-bb07-9938dd6c20d9" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "b4a38": { + "importer": "sprite-frame", + "uuid": "8e53e122-d71b-440a-bb07-9938dd6c20d9@b4a38", + "displayName": "", + "id": "b4a38", + "name": "Icon_Pause", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 914, + "trimY": 520, + "width": 61, + "height": 64, + "rawWidth": 61, + "rawHeight": 64, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "b502af19-a87f-4a60-8218-986fe24f1d77@6c48a", + "atlasUuid": "8e53e122-d71b-440a-bb07-9938dd6c20d9" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "c6846": { "importer": "sprite-frame", "uuid": "8e53e122-d71b-440a-bb07-9938dd6c20d9@c6846", @@ -292,11 +384,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 453, - "trimY": 868, + "trimX": 895, + "trimY": 595, "width": 124, "height": 82, "rawWidth": 124, @@ -341,8 +433,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 384, - "trimY": 952, + "trimX": 759, + "trimY": 520, "width": 153, "height": 73, "rawWidth": 153, @@ -387,8 +479,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 359, - "trimY": 151, + "trimX": 104, + "trimY": 406, "width": 406, "height": 200, "rawWidth": 406, @@ -433,8 +525,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 495, - "trimY": 353, + "trimX": 104, + "trimY": 859, "width": 244, "height": 155, "rawWidth": 244, @@ -479,8 +571,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 581, - "trimY": 647, + "trimX": 350, + "trimY": 907, "width": 145, "height": 135, "rawWidth": 145, @@ -525,8 +617,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 581, - "trimY": 784, + "trimX": 497, + "trimY": 892, "width": 145, "height": 135, "rawWidth": 145, @@ -571,8 +663,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 495, - "trimY": 510, + "trimX": 512, + "trimY": 406, "width": 245, "height": 135, "rawWidth": 245, @@ -617,8 +709,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 728, - "trimY": 726, + "trimX": 644, + "trimY": 892, "width": 145, "height": 135, "rawWidth": 145, @@ -660,11 +752,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 875, - "trimY": 726, + "trimX": 748, + "trimY": 595, "width": 145, "height": 135, "rawWidth": 145, @@ -709,8 +801,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 728, - "trimY": 863, + "trimX": 748, + "trimY": 732, "width": 145, "height": 135, "rawWidth": 145, @@ -752,11 +844,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 579, - "trimY": 921, + "trimX": 895, + "trimY": 721, "width": 120, "height": 123, "rawWidth": 120, @@ -798,11 +890,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 256, - "trimY": 751, + "trimX": 759, + "trimY": 392, "width": 126, "height": 219, "rawWidth": 126, @@ -847,8 +939,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 742, - "trimY": 470, + "trimX": 512, + "trimY": 543, "width": 126, "height": 219, "rawWidth": 126, @@ -890,11 +982,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 742, - "trimY": 598, + "trimX": 492, + "trimY": 671, "width": 126, "height": 219, "rawWidth": 126, @@ -936,11 +1028,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 767, - "trimY": 151, + "trimX": 104, + "trimY": 608, "width": 317, "height": 249, "rawWidth": 317, @@ -985,8 +1077,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 384, - "trimY": 634, + "trimX": 423, + "trimY": 608, "width": 297, "height": 67, "rawWidth": 297, @@ -1028,7 +1120,7 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, "trimX": 1, diff --git a/assets/resources/gui/gui2.png b/assets/resources/gui/gui2.png index 620d1850..0f5b7315 100644 Binary files a/assets/resources/gui/gui2.png and b/assets/resources/gui/gui2.png differ diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 4d468d90..0972914b 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -43,44 +43,44 @@ "__id__": 542 }, { - "__id__": 1017 + "__id__": 1036 }, { - "__id__": 1068 + "__id__": 1087 }, { - "__id__": 1077 + "__id__": 1096 }, { - "__id__": 1086 + "__id__": 1105 }, { - "__id__": 1090 + "__id__": 1109 }, { - "__id__": 1098 + "__id__": 1117 }, { - "__id__": 1187 + "__id__": 1206 }, { - "__id__": 1196 + "__id__": 1215 } ], "_active": true, "_components": [ { - "__id__": 1202 + "__id__": 1221 }, { - "__id__": 1204 + "__id__": 1223 }, { - "__id__": 1206 + "__id__": 1225 } ], "_prefab": { - "__id__": 1208 + "__id__": 1227 }, "_lpos": { "__type__": "cc.Vec3", @@ -12268,19 +12268,22 @@ }, { "__id__": 788 + }, + { + "__id__": 1012 } ], "_active": false, "_components": [ { - "__id__": 1012 + "__id__": 1031 }, { - "__id__": 1014 + "__id__": 1033 } ], "_prefab": { - "__id__": 1016 + "__id__": 1035 }, "_lpos": { "__type__": "cc.Vec3", @@ -23318,6 +23321,447 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "end", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 542 + }, + "_children": [ + { + "__id__": 1013 + } + ], + "_active": true, + "_components": [ + { + "__id__": 1025 + }, + { + "__id__": 1027 + } + ], + "_prefab": { + "__id__": 1030 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 271.033, + "y": 179.964, + "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": "ItemFrame02_Single_Gray", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1012 + }, + "_children": [ + { + "__id__": 1014 + } + ], + "_active": true, + "_components": [ + { + "__id__": 1020 + }, + { + "__id__": 1022 + } + ], + "_prefab": { + "__id__": 1024 + }, + "_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": "Icon_Close02", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1013 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 1015 + }, + { + "__id__": 1017 + } + ], + "_prefab": { + "__id__": 1019 + }, + "_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__": 1014 + }, + "_enabled": true, + "__prefab": { + "__id__": 1016 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 45, + "height": 45 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "37zGgMsA1FnpijiQUc0l3H" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1014 + }, + "_enabled": true, + "__prefab": { + "__id__": 1018 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "8e53e122-d71b-440a-bb07-9938dd6c20d9@7c79a", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_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": "e91ie7FU1Enorgd2r9eHXJ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2f2Kahpf9G55imJniKfEz+", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1013 + }, + "_enabled": true, + "__prefab": { + "__id__": 1021 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 60, + "height": 62 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b6C5R/U+VIyYZn9/7L7c9e" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1013 + }, + "_enabled": true, + "__prefab": { + "__id__": 1023 + }, + "_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@5eaff", + "__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": "07pX+cbipN74bANmpQDLqK" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "dbtEsaAyZBrq4EVQEtirXK", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1012 + }, + "_enabled": true, + "__prefab": { + "__id__": 1026 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "58YKxmmCxF96Y35Jx55iO9" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1012 + }, + "_enabled": true, + "__prefab": { + "__id__": 1028 + }, + "clickEvents": [ + { + "__id__": 1029 + } + ], + "_interactable": true, + "_transition": 0, + "_normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "32mUTwrfpPn5uD+LpL5Lrs" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "ee99bEQ89lEtavAHQsY2sba", + "handler": "to_mission", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "efsBvXhGNHD5mVlQm4e8aN", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -23328,7 +23772,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1013 + "__id__": 1032 }, "_contentSize": { "__type__": "cc.Size", @@ -23356,7 +23800,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1015 + "__id__": 1034 }, "_alignFlags": 16, "_target": null, @@ -23405,20 +23849,20 @@ }, "_children": [ { - "__id__": 1018 + "__id__": 1037 } ], "_active": false, "_components": [ { - "__id__": 1063 + "__id__": 1082 }, { - "__id__": 1065 + "__id__": 1084 } ], "_prefab": { - "__id__": 1067 + "__id__": 1086 }, "_lpos": { "__type__": "cc.Vec3", @@ -23455,33 +23899,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1017 + "__id__": 1036 }, "_children": [ - { - "__id__": 1019 - }, { "__id__": 1038 }, { - "__id__": 1044 + "__id__": 1057 }, { - "__id__": 1050 + "__id__": 1063 + }, + { + "__id__": 1069 } ], "_active": true, "_components": [ { - "__id__": 1058 + "__id__": 1077 }, { - "__id__": 1060 + "__id__": 1079 } ], "_prefab": { - "__id__": 1062 + "__id__": 1081 }, "_lpos": { "__type__": "cc.Vec3", @@ -23518,27 +23962,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1018 + "__id__": 1037 }, "_children": [ { - "__id__": 1020 + "__id__": 1039 }, { - "__id__": 1026 + "__id__": 1045 } ], "_active": true, "_components": [ { - "__id__": 1032 + "__id__": 1051 }, { - "__id__": 1034 + "__id__": 1053 } ], "_prefab": { - "__id__": 1037 + "__id__": 1056 }, "_lpos": { "__type__": "cc.Vec3", @@ -23575,20 +24019,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1019 + "__id__": 1038 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1021 + "__id__": 1040 }, { - "__id__": 1023 + "__id__": 1042 } ], "_prefab": { - "__id__": 1025 + "__id__": 1044 }, "_lpos": { "__type__": "cc.Vec3", @@ -23625,11 +24069,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1020 + "__id__": 1039 }, "_enabled": true, "__prefab": { - "__id__": 1022 + "__id__": 1041 }, "_contentSize": { "__type__": "cc.Size", @@ -23653,11 +24097,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1020 + "__id__": 1039 }, "_enabled": true, "__prefab": { - "__id__": 1024 + "__id__": 1043 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23711,20 +24155,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1019 + "__id__": 1038 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1027 + "__id__": 1046 }, { - "__id__": 1029 + "__id__": 1048 } ], "_prefab": { - "__id__": 1031 + "__id__": 1050 }, "_lpos": { "__type__": "cc.Vec3", @@ -23761,11 +24205,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1026 + "__id__": 1045 }, "_enabled": true, "__prefab": { - "__id__": 1028 + "__id__": 1047 }, "_contentSize": { "__type__": "cc.Size", @@ -23789,11 +24233,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1026 + "__id__": 1045 }, "_enabled": true, "__prefab": { - "__id__": 1030 + "__id__": 1049 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23870,11 +24314,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1019 + "__id__": 1038 }, "_enabled": true, "__prefab": { - "__id__": 1033 + "__id__": 1052 }, "_contentSize": { "__type__": "cc.Size", @@ -23898,15 +24342,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1019 + "__id__": 1038 }, "_enabled": true, "__prefab": { - "__id__": 1035 + "__id__": 1054 }, "clickEvents": [ { - "__id__": 1036 + "__id__": 1055 } ], "_interactable": true, @@ -23946,7 +24390,7 @@ "_duration": 0.1, "_zoomScale": 0.8, "_target": { - "__id__": 1019 + "__id__": 1038 }, "_id": "" }, @@ -23983,20 +24427,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1018 + "__id__": 1037 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1039 + "__id__": 1058 }, { - "__id__": 1041 + "__id__": 1060 } ], "_prefab": { - "__id__": 1043 + "__id__": 1062 }, "_lpos": { "__type__": "cc.Vec3", @@ -24033,11 +24477,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1038 + "__id__": 1057 }, "_enabled": true, "__prefab": { - "__id__": 1040 + "__id__": 1059 }, "_contentSize": { "__type__": "cc.Size", @@ -24061,11 +24505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1038 + "__id__": 1057 }, "_enabled": true, "__prefab": { - "__id__": 1042 + "__id__": 1061 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24119,20 +24563,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1018 + "__id__": 1037 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1045 + "__id__": 1064 }, { - "__id__": 1047 + "__id__": 1066 } ], "_prefab": { - "__id__": 1049 + "__id__": 1068 }, "_lpos": { "__type__": "cc.Vec3", @@ -24169,11 +24613,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1044 + "__id__": 1063 }, "_enabled": true, "__prefab": { - "__id__": 1046 + "__id__": 1065 }, "_contentSize": { "__type__": "cc.Size", @@ -24197,11 +24641,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1044 + "__id__": 1063 }, "_enabled": true, "__prefab": { - "__id__": 1048 + "__id__": 1067 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24255,23 +24699,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1018 + "__id__": 1037 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1051 + "__id__": 1070 }, { - "__id__": 1053 + "__id__": 1072 }, { - "__id__": 1055 + "__id__": 1074 } ], "_prefab": { - "__id__": 1057 + "__id__": 1076 }, "_lpos": { "__type__": "cc.Vec3", @@ -24308,11 +24752,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1050 + "__id__": 1069 }, "_enabled": true, "__prefab": { - "__id__": 1052 + "__id__": 1071 }, "_contentSize": { "__type__": "cc.Size", @@ -24336,11 +24780,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1050 + "__id__": 1069 }, "_enabled": true, "__prefab": { - "__id__": 1054 + "__id__": 1073 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -24404,11 +24848,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1050 + "__id__": 1069 }, "_enabled": true, "__prefab": { - "__id__": 1056 + "__id__": 1075 }, "templateMode": false, "watchPath": "data.role.mission", @@ -24439,11 +24883,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1018 + "__id__": 1037 }, "_enabled": true, "__prefab": { - "__id__": 1059 + "__id__": 1078 }, "_contentSize": { "__type__": "cc.Size", @@ -24467,11 +24911,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1018 + "__id__": 1037 }, "_enabled": true, "__prefab": { - "__id__": 1061 + "__id__": 1080 }, "_alignFlags": 16, "_target": null, @@ -24516,11 +24960,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1017 + "__id__": 1036 }, "_enabled": true, "__prefab": { - "__id__": 1064 + "__id__": 1083 }, "_contentSize": { "__type__": "cc.Size", @@ -24544,11 +24988,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1017 + "__id__": 1036 }, "_enabled": true, "__prefab": { - "__id__": 1066 + "__id__": 1085 }, "_alignFlags": 16, "_target": null, @@ -24594,14 +25038,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 1069 + "__id__": 1088 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1068 + "__id__": 1087 }, "asset": { "__uuid__": "5423b9f8-8a8a-49a0-8ecb-0489dfcaba92", @@ -24609,7 +25053,7 @@ }, "fileId": "913f5QU7JKAZE87n6c4hSI", "instance": { - "__id__": 1070 + "__id__": 1089 }, "targetOverrides": null }, @@ -24623,19 +25067,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1071 + "__id__": 1090 }, { - "__id__": 1073 + "__id__": 1092 }, { - "__id__": 1074 + "__id__": 1093 }, { - "__id__": 1075 + "__id__": 1094 }, { - "__id__": 1076 + "__id__": 1095 } ], "removedComponents": [] @@ -24643,7 +25087,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1072 + "__id__": 1091 }, "propertyPath": [ "_name" @@ -24659,7 +25103,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1072 + "__id__": 1091 }, "propertyPath": [ "_lpos" @@ -24674,7 +25118,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1072 + "__id__": 1091 }, "propertyPath": [ "_lrot" @@ -24690,7 +25134,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1072 + "__id__": 1091 }, "propertyPath": [ "_euler" @@ -24705,7 +25149,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1072 + "__id__": 1091 }, "propertyPath": [ "_active" @@ -24719,14 +25163,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 1078 + "__id__": 1097 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1077 + "__id__": 1096 }, "asset": { "__uuid__": "a14709ee-4775-4141-ae49-9f1f4a2b91b8", @@ -24734,7 +25178,7 @@ }, "fileId": "a2Mppj56hC3rhWLN9lYFwN", "instance": { - "__id__": 1079 + "__id__": 1098 }, "targetOverrides": null }, @@ -24748,19 +25192,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1080 + "__id__": 1099 }, { - "__id__": 1082 + "__id__": 1101 }, { - "__id__": 1083 + "__id__": 1102 }, { - "__id__": 1084 + "__id__": 1103 }, { - "__id__": 1085 + "__id__": 1104 } ], "removedComponents": [] @@ -24768,7 +25212,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1081 + "__id__": 1100 }, "propertyPath": [ "_name" @@ -24784,7 +25228,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1081 + "__id__": 1100 }, "propertyPath": [ "_lpos" @@ -24799,7 +25243,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1081 + "__id__": 1100 }, "propertyPath": [ "_lrot" @@ -24815,7 +25259,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1081 + "__id__": 1100 }, "propertyPath": [ "_euler" @@ -24830,7 +25274,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1081 + "__id__": 1100 }, "propertyPath": [ "_active" @@ -24849,11 +25293,11 @@ "_active": true, "_components": [ { - "__id__": 1087 + "__id__": 1106 } ], "_prefab": { - "__id__": 1089 + "__id__": 1108 }, "_lpos": { "__type__": "cc.Vec3", @@ -24890,11 +25334,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1086 + "__id__": 1105 }, "_enabled": true, "__prefab": { - "__id__": 1088 + "__id__": 1107 }, "_contentSize": { "__type__": "cc.Size", @@ -24932,14 +25376,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 1091 + "__id__": 1110 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1090 + "__id__": 1109 }, "asset": { "__uuid__": "dc0b56d7-c633-4cd2-a6ff-8fa2d7456d9d", @@ -24947,7 +25391,7 @@ }, "fileId": "5bChJGE9BD55+nIimwyIR0", "instance": { - "__id__": 1092 + "__id__": 1111 }, "targetOverrides": null }, @@ -24961,16 +25405,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1093 + "__id__": 1112 }, { - "__id__": 1095 + "__id__": 1114 }, { - "__id__": 1096 + "__id__": 1115 }, { - "__id__": 1097 + "__id__": 1116 } ], "removedComponents": [] @@ -24978,7 +25422,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1094 + "__id__": 1113 }, "propertyPath": [ "_name" @@ -24994,7 +25438,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1094 + "__id__": 1113 }, "propertyPath": [ "_lpos" @@ -25009,7 +25453,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1094 + "__id__": 1113 }, "propertyPath": [ "_lrot" @@ -25025,7 +25469,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1094 + "__id__": 1113 }, "propertyPath": [ "_euler" @@ -25047,32 +25491,32 @@ }, "_children": [ { - "__id__": 1099 + "__id__": 1118 }, { - "__id__": 1105 + "__id__": 1124 }, { - "__id__": 1130 + "__id__": 1149 }, { - "__id__": 1155 + "__id__": 1174 } ], "_active": true, "_components": [ { - "__id__": 1180 + "__id__": 1199 }, { - "__id__": 1182 + "__id__": 1201 }, { - "__id__": 1184 + "__id__": 1203 } ], "_prefab": { - "__id__": 1186 + "__id__": 1205 }, "_lpos": { "__type__": "cc.Vec3", @@ -25109,20 +25553,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1098 + "__id__": 1117 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1100 + "__id__": 1119 }, { - "__id__": 1102 + "__id__": 1121 } ], "_prefab": { - "__id__": 1104 + "__id__": 1123 }, "_lpos": { "__type__": "cc.Vec3", @@ -25159,11 +25603,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1099 + "__id__": 1118 }, "_enabled": true, "__prefab": { - "__id__": 1101 + "__id__": 1120 }, "_contentSize": { "__type__": "cc.Size", @@ -25187,11 +25631,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1099 + "__id__": 1118 }, "_enabled": true, "__prefab": { - "__id__": 1103 + "__id__": 1122 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25245,30 +25689,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1098 + "__id__": 1117 }, "_children": [ { - "__id__": 1106 + "__id__": 1125 }, { - "__id__": 1112 + "__id__": 1131 }, { - "__id__": 1118 + "__id__": 1137 } ], "_active": true, "_components": [ { - "__id__": 1124 + "__id__": 1143 }, { - "__id__": 1126 + "__id__": 1145 } ], "_prefab": { - "__id__": 1129 + "__id__": 1148 }, "_lpos": { "__type__": "cc.Vec3", @@ -25305,20 +25749,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1105 + "__id__": 1124 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1107 + "__id__": 1126 }, { - "__id__": 1109 + "__id__": 1128 } ], "_prefab": { - "__id__": 1111 + "__id__": 1130 }, "_lpos": { "__type__": "cc.Vec3", @@ -25355,11 +25799,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1106 + "__id__": 1125 }, "_enabled": true, "__prefab": { - "__id__": 1108 + "__id__": 1127 }, "_contentSize": { "__type__": "cc.Size", @@ -25383,11 +25827,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1106 + "__id__": 1125 }, "_enabled": true, "__prefab": { - "__id__": 1110 + "__id__": 1129 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25441,20 +25885,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1105 + "__id__": 1124 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1113 + "__id__": 1132 }, { - "__id__": 1115 + "__id__": 1134 } ], "_prefab": { - "__id__": 1117 + "__id__": 1136 }, "_lpos": { "__type__": "cc.Vec3", @@ -25491,11 +25935,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1112 + "__id__": 1131 }, "_enabled": true, "__prefab": { - "__id__": 1114 + "__id__": 1133 }, "_contentSize": { "__type__": "cc.Size", @@ -25519,11 +25963,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1112 + "__id__": 1131 }, "_enabled": true, "__prefab": { - "__id__": 1116 + "__id__": 1135 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25577,20 +26021,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1105 + "__id__": 1124 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1119 + "__id__": 1138 }, { - "__id__": 1121 + "__id__": 1140 } ], "_prefab": { - "__id__": 1123 + "__id__": 1142 }, "_lpos": { "__type__": "cc.Vec3", @@ -25627,11 +26071,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1118 + "__id__": 1137 }, "_enabled": true, "__prefab": { - "__id__": 1120 + "__id__": 1139 }, "_contentSize": { "__type__": "cc.Size", @@ -25655,11 +26099,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1118 + "__id__": 1137 }, "_enabled": true, "__prefab": { - "__id__": 1122 + "__id__": 1141 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -25736,11 +26180,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1105 + "__id__": 1124 }, "_enabled": true, "__prefab": { - "__id__": 1125 + "__id__": 1144 }, "_contentSize": { "__type__": "cc.Size", @@ -25764,15 +26208,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1105 + "__id__": 1124 }, "_enabled": true, "__prefab": { - "__id__": 1127 + "__id__": 1146 }, "clickEvents": [ { - "__id__": 1128 + "__id__": 1147 } ], "_interactable": true, @@ -25847,30 +26291,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1098 + "__id__": 1117 }, "_children": [ { - "__id__": 1131 + "__id__": 1150 }, { - "__id__": 1137 + "__id__": 1156 }, { - "__id__": 1143 + "__id__": 1162 } ], "_active": true, "_components": [ { - "__id__": 1149 + "__id__": 1168 }, { - "__id__": 1151 + "__id__": 1170 } ], "_prefab": { - "__id__": 1154 + "__id__": 1173 }, "_lpos": { "__type__": "cc.Vec3", @@ -25907,20 +26351,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1130 + "__id__": 1149 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1132 + "__id__": 1151 }, { - "__id__": 1134 + "__id__": 1153 } ], "_prefab": { - "__id__": 1136 + "__id__": 1155 }, "_lpos": { "__type__": "cc.Vec3", @@ -25957,11 +26401,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1131 + "__id__": 1150 }, "_enabled": true, "__prefab": { - "__id__": 1133 + "__id__": 1152 }, "_contentSize": { "__type__": "cc.Size", @@ -25985,11 +26429,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1131 + "__id__": 1150 }, "_enabled": true, "__prefab": { - "__id__": 1135 + "__id__": 1154 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26043,20 +26487,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1130 + "__id__": 1149 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1138 + "__id__": 1157 }, { - "__id__": 1140 + "__id__": 1159 } ], "_prefab": { - "__id__": 1142 + "__id__": 1161 }, "_lpos": { "__type__": "cc.Vec3", @@ -26093,11 +26537,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1137 + "__id__": 1156 }, "_enabled": true, "__prefab": { - "__id__": 1139 + "__id__": 1158 }, "_contentSize": { "__type__": "cc.Size", @@ -26121,11 +26565,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1137 + "__id__": 1156 }, "_enabled": true, "__prefab": { - "__id__": 1141 + "__id__": 1160 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26179,20 +26623,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1130 + "__id__": 1149 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1144 + "__id__": 1163 }, { - "__id__": 1146 + "__id__": 1165 } ], "_prefab": { - "__id__": 1148 + "__id__": 1167 }, "_lpos": { "__type__": "cc.Vec3", @@ -26229,11 +26673,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1143 + "__id__": 1162 }, "_enabled": true, "__prefab": { - "__id__": 1145 + "__id__": 1164 }, "_contentSize": { "__type__": "cc.Size", @@ -26257,11 +26701,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1143 + "__id__": 1162 }, "_enabled": true, "__prefab": { - "__id__": 1147 + "__id__": 1166 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26338,11 +26782,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1130 + "__id__": 1149 }, "_enabled": true, "__prefab": { - "__id__": 1150 + "__id__": 1169 }, "_contentSize": { "__type__": "cc.Size", @@ -26366,15 +26810,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1130 + "__id__": 1149 }, "_enabled": true, "__prefab": { - "__id__": 1152 + "__id__": 1171 }, "clickEvents": [ { - "__id__": 1153 + "__id__": 1172 } ], "_interactable": true, @@ -26449,30 +26893,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1098 + "__id__": 1117 }, "_children": [ { - "__id__": 1156 + "__id__": 1175 }, { - "__id__": 1162 + "__id__": 1181 }, { - "__id__": 1168 + "__id__": 1187 } ], "_active": true, "_components": [ { - "__id__": 1174 + "__id__": 1193 }, { - "__id__": 1176 + "__id__": 1195 } ], "_prefab": { - "__id__": 1179 + "__id__": 1198 }, "_lpos": { "__type__": "cc.Vec3", @@ -26509,20 +26953,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1155 + "__id__": 1174 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1157 + "__id__": 1176 }, { - "__id__": 1159 + "__id__": 1178 } ], "_prefab": { - "__id__": 1161 + "__id__": 1180 }, "_lpos": { "__type__": "cc.Vec3", @@ -26559,11 +27003,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1156 + "__id__": 1175 }, "_enabled": true, "__prefab": { - "__id__": 1158 + "__id__": 1177 }, "_contentSize": { "__type__": "cc.Size", @@ -26587,11 +27031,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1156 + "__id__": 1175 }, "_enabled": true, "__prefab": { - "__id__": 1160 + "__id__": 1179 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26645,20 +27089,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1155 + "__id__": 1174 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1163 + "__id__": 1182 }, { - "__id__": 1165 + "__id__": 1184 } ], "_prefab": { - "__id__": 1167 + "__id__": 1186 }, "_lpos": { "__type__": "cc.Vec3", @@ -26695,11 +27139,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1162 + "__id__": 1181 }, "_enabled": true, "__prefab": { - "__id__": 1164 + "__id__": 1183 }, "_contentSize": { "__type__": "cc.Size", @@ -26723,11 +27167,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1162 + "__id__": 1181 }, "_enabled": true, "__prefab": { - "__id__": 1166 + "__id__": 1185 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26781,20 +27225,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1155 + "__id__": 1174 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1169 + "__id__": 1188 }, { - "__id__": 1171 + "__id__": 1190 } ], "_prefab": { - "__id__": 1173 + "__id__": 1192 }, "_lpos": { "__type__": "cc.Vec3", @@ -26831,11 +27275,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1168 + "__id__": 1187 }, "_enabled": true, "__prefab": { - "__id__": 1170 + "__id__": 1189 }, "_contentSize": { "__type__": "cc.Size", @@ -26859,11 +27303,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1168 + "__id__": 1187 }, "_enabled": true, "__prefab": { - "__id__": 1172 + "__id__": 1191 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -26940,11 +27384,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1155 + "__id__": 1174 }, "_enabled": true, "__prefab": { - "__id__": 1175 + "__id__": 1194 }, "_contentSize": { "__type__": "cc.Size", @@ -26968,15 +27412,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1155 + "__id__": 1174 }, "_enabled": true, "__prefab": { - "__id__": 1177 + "__id__": 1196 }, "clickEvents": [ { - "__id__": 1178 + "__id__": 1197 } ], "_interactable": true, @@ -27051,11 +27495,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1098 + "__id__": 1117 }, "_enabled": true, "__prefab": { - "__id__": 1181 + "__id__": 1200 }, "_contentSize": { "__type__": "cc.Size", @@ -27079,11 +27523,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1098 + "__id__": 1117 }, "_enabled": true, "__prefab": { - "__id__": 1183 + "__id__": 1202 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -27121,11 +27565,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1098 + "__id__": 1117 }, "_enabled": true, "__prefab": { - "__id__": 1185 + "__id__": 1204 }, "_alignFlags": 20, "_target": null, @@ -27171,14 +27615,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 1188 + "__id__": 1207 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1187 + "__id__": 1206 }, "asset": { "__uuid__": "9260d2d2-4104-4b8f-beb7-ab74b894b73b", @@ -27186,7 +27630,7 @@ }, "fileId": "1el6EAJ9JL9ruo0tKeStck", "instance": { - "__id__": 1189 + "__id__": 1208 }, "targetOverrides": null }, @@ -27200,19 +27644,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1190 + "__id__": 1209 }, { - "__id__": 1192 + "__id__": 1211 }, { - "__id__": 1193 + "__id__": 1212 }, { - "__id__": 1194 + "__id__": 1213 }, { - "__id__": 1195 + "__id__": 1214 } ], "removedComponents": [] @@ -27220,7 +27664,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1191 + "__id__": 1210 }, "propertyPath": [ "_name" @@ -27236,7 +27680,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1191 + "__id__": 1210 }, "propertyPath": [ "_lpos" @@ -27251,7 +27695,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1191 + "__id__": 1210 }, "propertyPath": [ "_lrot" @@ -27267,7 +27711,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1191 + "__id__": 1210 }, "propertyPath": [ "_euler" @@ -27282,7 +27726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1191 + "__id__": 1210 }, "propertyPath": [ "_active" @@ -27301,14 +27745,14 @@ "_active": true, "_components": [ { - "__id__": 1197 + "__id__": 1216 }, { - "__id__": 1199 + "__id__": 1218 } ], "_prefab": { - "__id__": 1201 + "__id__": 1220 }, "_lpos": { "__type__": "cc.Vec3", @@ -27345,11 +27789,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1196 + "__id__": 1215 }, "_enabled": true, "__prefab": { - "__id__": 1198 + "__id__": 1217 }, "_contentSize": { "__type__": "cc.Size", @@ -27373,11 +27817,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1196 + "__id__": 1215 }, "_enabled": true, "__prefab": { - "__id__": 1200 + "__id__": 1219 }, "_alignFlags": 12, "_target": null, @@ -27426,7 +27870,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1203 + "__id__": 1222 }, "_contentSize": { "__type__": "cc.Size", @@ -27454,7 +27898,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1205 + "__id__": 1224 }, "_alignFlags": 45, "_target": null, @@ -27490,7 +27934,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1207 + "__id__": 1226 }, "_id": "" }, @@ -27510,24 +27954,24 @@ "instance": null, "targetOverrides": [ { - "__id__": 1209 + "__id__": 1228 }, { - "__id__": 1212 + "__id__": 1231 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 1187 + "__id__": 1206 }, { - "__id__": 1090 + "__id__": 1109 }, { - "__id__": 1077 + "__id__": 1096 }, { - "__id__": 1068 + "__id__": 1087 }, { "__id__": 404 @@ -27546,7 +27990,7 @@ "__id__": 64 }, "sourceInfo": { - "__id__": 1210 + "__id__": 1229 }, "propertyPath": [ "_target" @@ -27555,7 +27999,7 @@ "__id__": 64 }, "targetInfo": { - "__id__": 1211 + "__id__": 1230 } }, { @@ -27576,7 +28020,7 @@ "__id__": 64 }, "sourceInfo": { - "__id__": 1213 + "__id__": 1232 }, "propertyPath": [ "_target" @@ -27585,7 +28029,7 @@ "__id__": 64 }, "targetInfo": { - "__id__": 1214 + "__id__": 1233 } }, { diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 473447cc..9015ebfb 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -122,7 +122,7 @@ export class HeroViewComp extends CCComp { this.sprite = this.node.getChildByName("anm").getComponent(Sprite); this.orginalFlashMaterial = this.sprite.getRenderMaterial(0); - // this.node.getChildByName("top").getChildByName("shield").active = false; + // this.node.getChildByName("shielded").active = false; // this.node.getChildByName("top").setScale(this.scale,1); // this.node.getChildByName("atk").setScale(this.scale,1); // this.node.getChildByName("atk").getComponent(Label).string = this.atk.toString(); @@ -160,6 +160,10 @@ export class HeroViewComp extends CCComp { } if(this.shield > 0){ this.shield -= 1 + if(this.shield <= 0){ + this.shield = 0 + this.node.getChildByName("shielded").active = false + } return } let dodge = RandomManager.instance.getRandomInt(0,100,3) @@ -576,10 +580,13 @@ export class HeroViewComp extends CCComp { // this.node.getChildByName("top").getChildByName("buff").getChildByName(icon).active=value } - + add_shield(shield:number){ this.shield =shield + if(this.shield > 0){ + this.node.getChildByName("shielded").active=true + } } tooltip(type:number=1,value:string="",s_uuid:number=1001,y:number=60){ diff --git a/assets/script/game/map/CardController.ts b/assets/script/game/map/CardController.ts index 18419a61..9bc1cc4b 100644 --- a/assets/script/game/map/CardController.ts +++ b/assets/script/game/map/CardController.ts @@ -190,6 +190,7 @@ export class CardControllerComp extends CCComp { } } to_mission(){ + oops.message.dispatchEvent("mission_end") this.node.getChildByName("mission_home").active=true this.node.getChildByName("mission").active=false this.node.getChildByName("bar").active=true; diff --git a/assets/script/game/map/MapMonsterComp.ts b/assets/script/game/map/MapMonsterComp.ts index fa297122..7907ea03 100644 --- a/assets/script/game/map/MapMonsterComp.ts +++ b/assets/script/game/map/MapMonsterComp.ts @@ -16,6 +16,7 @@ import { MonModelComp } from "../mon/MonModelComp"; import { Boss} from "../Boss/Boss"; import { UIID } from "../common/config/GameUIConfig"; import { Talents } from "../common/config/TalentSet"; +import { HeroViewComp } from "../hero/HeroViewComp"; const { ccclass, property } = _decorator; /** 视图层对象 */ @@ -59,6 +60,7 @@ export class MapMonsterComp extends CCComp { oops.message.on("other_add_monster", this.on_other_add_monster, this); oops.message.on("do_add_hero", this.on_do_add_hero, this); oops.message.on("mission_start", this.mission_start, this); + oops.message.on("mission_end", this.mission_end, this); oops.message.on("normal_call", this.on_normal_call, this); oops.message.on("better_call", this.on_better_call, this); oops.message.on("mon_dead", this.on_mon_dead, this); @@ -123,6 +125,13 @@ export class MapMonsterComp extends CCComp { this.hero_index=0 smc.vm_data.mission.coin = 0 } + mission_end(){ + smc.vm_data.mission.play=false + let heros:any= ecs.query(ecs.allOf(HeroViewComp)); + for(let i=0;i