From f32a7e5c47d80bfda3c9c45aa95bae82796031b0 Mon Sep 17 00:00:00 2001 From: "pan@work" Date: Thu, 28 Nov 2024 10:37:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=A5=96=E5=93=81=E5=92=8C?= =?UTF-8?q?=E7=89=A9=E5=93=81=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?oops.gui.open=E6=89=93=E5=BC=80=E7=89=A9=E5=93=81=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=A0=8F=20=E5=8F=AF=E8=83=BD=E8=BF=98=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resources/game/gui/item.prefab | 82 +- assets/resources/gui/element/item_info.prefab | 39 +- assets/resources/gui/role_controller.prefab | 953 ++++++++++++------ .../script/game/common/config/GameUIConfig.ts | 2 +- assets/script/game/common/config/heroSet.ts | 2 +- assets/script/game/map/ItemComp.ts | 6 +- assets/script/game/map/ItemInfoComp.ts | 25 +- assets/script/game/map/MIssionController.ts | 3 - assets/script/game/map/VictoryComp.ts | 24 +- 9 files changed, 754 insertions(+), 382 deletions(-) diff --git a/assets/resources/game/gui/item.prefab b/assets/resources/game/gui/item.prefab index d7258863..e9076769 100644 --- a/assets/resources/game/gui/item.prefab +++ b/assets/resources/game/gui/item.prefab @@ -35,10 +35,13 @@ }, { "__id__": 22 + }, + { + "__id__": 24 } ], "_prefab": { - "__id__": 24 + "__id__": 27 }, "_lpos": { "__type__": "cc.Vec3", @@ -305,10 +308,7 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@094d8", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 0, "_fillType": 0, "_sizeMode": 0, @@ -441,7 +441,7 @@ "b": 255, "a": 255 }, - "_string": "99999", + "_string": "0", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 31, @@ -546,6 +546,76 @@ "__type__": "cc.CompPrefabInfo", "fileId": "a3fT984fVMY6kPqXqb9G8d" }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 25 + }, + "clickEvents": [ + { + "__id__": 26 + } + ], + "_interactable": true, + "_transition": 3, + "_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": 0.95, + "_target": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2fDZn0y0hGe74K7nzW6Hsq" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "b3d7bQfUYVKCraQiXgA4mTv", + "handler": "show_info", + "customEventData": "" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/gui/element/item_info.prefab b/assets/resources/gui/element/item_info.prefab index de134d44..fcb97a4a 100644 --- a/assets/resources/gui/element/item_info.prefab +++ b/assets/resources/gui/element/item_info.prefab @@ -52,7 +52,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 748.999, + "y": 0, "z": 0 }, "_lrot": { @@ -142,7 +142,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 600, + "width": 700, "height": 500 }, "_anchorPoint": { @@ -241,7 +241,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -227.342, + "x": -270, "y": 163.185, "z": 0 }, @@ -514,7 +514,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -13.947, + "y": -4.997, "z": 0 }, "_lrot": { @@ -554,8 +554,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 550, - "height": 250 + "width": 630, + "height": 240 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -977,10 +977,12 @@ }, { "__type__": "cc.ClickEvent", - "target": null, + "target": { + "__id__": 1 + }, "component": "", - "_componentId": "", - "handler": "", + "_componentId": "8a98fQ67vxAqoq1t/JfAe7z", + "handler": "onTouchEnd", "customEventData": "" }, { @@ -1019,7 +1021,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -169.242, + "x": -200, "y": 161.461, "z": 0 }, @@ -1099,8 +1101,8 @@ "_string": "这是物品名称", "_horizontalAlign": 0, "_verticalAlign": 1, - "_actualFontSize": 31, - "_fontSize": 30, + "_actualFontSize": 41, + "_fontSize": 40, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 2, @@ -1113,7 +1115,7 @@ "_isUnderline": false, "_underlineHeight": 2, "_cacheMode": 0, - "_enableOutline": false, + "_enableOutline": true, "_outlineColor": { "__type__": "cc.Color", "r": 0, @@ -1122,7 +1124,7 @@ "a": 255 }, "_outlineWidth": 2, - "_enableShadow": false, + "_enableShadow": true, "_shadowColor": { "__type__": "cc.Color", "r": 0, @@ -1132,8 +1134,8 @@ }, "_shadowOffset": { "__type__": "cc.Vec2", - "x": 2, - "y": 2 + "x": 1, + "y": -2 }, "_shadowBlur": 2, "_id": "" @@ -1219,8 +1221,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 530, - "height": 230 + "width": 600, + "height": 220 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1369,6 +1371,7 @@ "__id__": 0 }, "fileId": "93EVPcNsBBXpMaJjrmWbVn", + "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 9ec58b4e..fbbfd8cd 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -21,42 +21,42 @@ { "__id__": 2 }, - { - "__id__": 254 - }, { "__id__": 280 }, { - "__id__": 294 + "__id__": 306 }, { - "__id__": 303 + "__id__": 320 }, { - "__id__": 307 + "__id__": 329 }, { - "__id__": 317 + "__id__": 333 }, { - "__id__": 406 + "__id__": 343 + }, + { + "__id__": 432 } ], "_active": true, "_components": [ { - "__id__": 412 + "__id__": 438 }, { - "__id__": 414 + "__id__": 440 }, { - "__id__": 416 + "__id__": 442 } ], "_prefab": { - "__id__": 418 + "__id__": 444 }, "_lpos": { "__type__": "cc.Vec3", @@ -115,17 +115,17 @@ "_active": true, "_components": [ { - "__id__": 247 + "__id__": 273 }, { - "__id__": 249 + "__id__": 275 }, { - "__id__": 251 + "__id__": 277 } ], "_prefab": { - "__id__": 253 + "__id__": 279 }, "_lpos": { "__type__": "cc.Vec3", @@ -1874,15 +1874,9 @@ } ], "propertyOverrides": [ - { - "__id__": 230 - }, { "__id__": 232 }, - { - "__id__": 233 - }, { "__id__": 234 }, @@ -1893,25 +1887,76 @@ "__id__": 236 }, { - "__id__": 238 + "__id__": 237 }, { - "__id__": 239 + "__id__": 238 }, { "__id__": 240 }, { - "__id__": 242 + "__id__": 241 }, { - "__id__": 243 + "__id__": 242 }, { "__id__": 244 }, { "__id__": 245 + }, + { + "__id__": 246 + }, + { + "__id__": 247 + }, + { + "__id__": 249 + }, + { + "__id__": 250 + }, + { + "__id__": 252 + }, + { + "__id__": 254 + }, + { + "__id__": 255 + }, + { + "__id__": 256 + }, + { + "__id__": 257 + }, + { + "__id__": 258 + }, + { + "__id__": 259 + }, + { + "__id__": 261 + }, + { + "__id__": 263 + }, + { + "__id__": 265 + }, + { + "__id__": 267 + }, + { + "__id__": 269 + }, + { + "__id__": 271 } ], "removedComponents": [] @@ -1947,7 +1992,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 231 }, "_alignFlags": 18, "_target": null, @@ -2000,23 +2045,23 @@ "__id__": 176 }, { - "__id__": 203 + "__id__": 205 }, { - "__id__": 220 + "__id__": 222 } ], "_active": true, "_components": [ { - "__id__": 226 + "__id__": 228 }, { "__id__": 114 } ], "_prefab": { - "__id__": 228 + "__id__": 230 }, "_lpos": { "__type__": "cc.Vec3", @@ -2056,7 +2101,7 @@ "__id__": 115 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { "__id__": 117 @@ -2185,7 +2230,7 @@ }, { "__type__": "cc.Node", - "_name": "Button_SkillBtn_Orange", + "_name": "bg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -2247,7 +2292,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 660, + "width": 600, "height": 700 }, "_anchorPoint": { @@ -2338,7 +2383,7 @@ "__id__": 141 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 147 @@ -2621,7 +2666,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -2757,7 +2802,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -2883,7 +2928,7 @@ "__id__": 153 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 159 @@ -3030,7 +3075,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -3145,7 +3190,7 @@ }, { "__type__": "cc.Node", - "_name": "Title_Ribbon01_Sky", + "_name": "title", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -3207,7 +3252,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 500, + "width": 450, "height": 80 }, "_anchorPoint": { @@ -3470,7 +3515,7 @@ } ], "_prefab": { - "__id__": 202 + "__id__": 204 }, "_lpos": { "__type__": "cc.Vec3", @@ -4043,6 +4088,12 @@ "clickEvents": [ { "__id__": 201 + }, + { + "__id__": 202 + }, + { + "__id__": 203 } ], "_interactable": true, @@ -4095,7 +4146,27 @@ }, "component": "", "_componentId": "463c7iN7clDbLBuuJ6fqWQv", - "handler": "end_mission", + "handler": "do_x10", + "customEventData": "" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 2 + }, + "component": "", + "_componentId": "9cbe4j5jBRBt7aZKuB2MRoX", + "handler": "mission_end", + "customEventData": "" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "ee99bEQ89lEtavAHQsY2sba", + "handler": "to_mission", "customEventData": "" }, { @@ -4121,23 +4192,23 @@ }, "_children": [ { - "__id__": 204 + "__id__": 206 } ], "_active": true, "_components": [ - { - "__id__": 210 - }, { "__id__": 212 }, { "__id__": 214 + }, + { + "__id__": 216 } ], "_prefab": { - "__id__": 219 + "__id__": 221 }, "_lpos": { "__type__": "cc.Vec3", @@ -4174,20 +4245,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 203 + "__id__": 205 }, "_children": [], "_active": true, "_components": [ { - "__id__": 205 + "__id__": 207 }, { - "__id__": 207 + "__id__": 209 } ], "_prefab": { - "__id__": 209 + "__id__": 211 }, "_lpos": { "__type__": "cc.Vec3", @@ -4224,11 +4295,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 208 }, "_contentSize": { "__type__": "cc.Size", @@ -4252,11 +4323,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 210 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4333,11 +4404,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 213 }, "_contentSize": { "__type__": "cc.Size", @@ -4361,11 +4432,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 215 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4406,21 +4477,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 205 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 217 }, "clickEvents": [ - { - "__id__": 216 - }, - { - "__id__": 217 - }, { "__id__": 218 + }, + { + "__id__": 219 + }, + { + "__id__": 220 } ], "_interactable": true, @@ -4473,7 +4544,7 @@ }, "component": "", "_componentId": "463c7iN7clDbLBuuJ6fqWQv", - "handler": "end_mission", + "handler": "do_x1", "customEventData": "" }, { @@ -4521,14 +4592,14 @@ "_active": true, "_components": [ { - "__id__": 221 + "__id__": 223 }, { - "__id__": 223 + "__id__": 225 } ], "_prefab": { - "__id__": 225 + "__id__": 227 }, "_lpos": { "__type__": "cc.Vec3", @@ -4565,11 +4636,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 220 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 224 }, "_contentSize": { "__type__": "cc.Size", @@ -4593,11 +4664,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 220 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 226 }, "_resizeMode": 0, "_layoutType": 3, @@ -4648,7 +4719,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 229 }, "_contentSize": { "__type__": "cc.Size", @@ -4686,7 +4757,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 231 + "__id__": 233 }, "propertyPath": [ "_name" @@ -4702,14 +4773,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 231 + "__id__": 233 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": 0, + "x": 1841.289, "y": 640, "z": 0 } @@ -4717,7 +4788,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 231 + "__id__": 233 }, "propertyPath": [ "_lrot" @@ -4733,7 +4804,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 231 + "__id__": 233 }, "propertyPath": [ "_euler" @@ -4748,7 +4819,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 231 + "__id__": 233 }, "propertyPath": [ "_active" @@ -4758,7 +4829,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 237 + "__id__": 239 }, "propertyPath": [ "clickEvents", @@ -4775,7 +4846,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 237 + "__id__": 239 }, "propertyPath": [ "clickEvents", @@ -4789,20 +4860,20 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 237 + "__id__": 239 }, "propertyPath": [ "clickEvents", "1" ], "value": { - "__id__": 217 + "__id__": 219 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 241 + "__id__": 243 }, "propertyPath": [ "_active" @@ -4818,20 +4889,20 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 237 + "__id__": 239 }, "propertyPath": [ "clickEvents", "2" ], "value": { - "__id__": 218 + "__id__": 220 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 241 + "__id__": 243 }, "propertyPath": [ "_lpos" @@ -4846,7 +4917,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 241 + "__id__": 243 }, "propertyPath": [ "_lscale" @@ -4861,7 +4932,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 246 + "__id__": 248 }, "propertyPath": [ "item" @@ -4874,6 +4945,238 @@ "a5xwCYwVJEWYXcU3LyUEaY" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 233 + }, + "propertyPath": [ + "_lscale" + ], + "value": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 251 + }, + "propertyPath": [ + "_horizontalCenter" + ], + "value": 1841.289 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cdlL6KYKJN2599nT1QtRJm" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 253 + }, + "propertyPath": [ + "clickEvents", + "0", + "target" + ], + "value": { + "__id__": 109 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "23ZdZTfgFFtb6NvJKBYTZ/" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 253 + }, + "propertyPath": [ + "clickEvents", + "0", + "handler" + ], + "value": "do_x10" + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 239 + }, + "propertyPath": [ + "clickEvents", + "0", + "handler" + ], + "value": "do_x1" + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 253 + }, + "propertyPath": [ + "clickEvents", + "length" + ], + "value": 3 + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 253 + }, + "propertyPath": [ + "clickEvents", + "1" + ], + "value": { + "__id__": 202 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 253 + }, + "propertyPath": [ + "clickEvents", + "2" + ], + "value": { + "__id__": 203 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 260 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 600, + "height": 700 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "91LawJkjxBNadN2JyNP2lC" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 262 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 450, + "height": 80 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "6aIXenjYRABIwpE8VaiZIC" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 264 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "2fiOLWZe1GeZYuO+LAR1b0" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 266 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dfk/LnUzFLQaJwcuMjdg0T" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 268 + }, + "propertyPath": [ + "_name" + ], + "value": "bg" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e7oKWTyKBPzbTe3G8bfmXP" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 270 + }, + "propertyPath": [ + "_name" + ], + "value": "title" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "d5nVAMgR1Ok4DQkBnFjmuH" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 272 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5bGQtqeHdKKblZUCYha8gm" + ] + }, { "__type__": "cc.UITransform", "_name": "", @@ -4884,7 +5187,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 248 + "__id__": 274 }, "_contentSize": { "__type__": "cc.Size", @@ -4912,7 +5215,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 250 + "__id__": 276 }, "_alignFlags": 16, "_target": null, @@ -4948,7 +5251,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 278 }, "_id": "" }, @@ -4979,20 +5282,20 @@ }, "_children": [ { - "__id__": 255 + "__id__": 281 } ], "_active": true, "_components": [ { - "__id__": 275 + "__id__": 301 }, { - "__id__": 277 + "__id__": 303 } ], "_prefab": { - "__id__": 279 + "__id__": 305 }, "_lpos": { "__type__": "cc.Vec3", @@ -5029,27 +5332,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 254 + "__id__": 280 }, "_children": [ { - "__id__": 256 + "__id__": 282 }, { - "__id__": 262 + "__id__": 288 } ], "_active": true, "_components": [ { - "__id__": 268 + "__id__": 294 }, { - "__id__": 270 + "__id__": 296 } ], "_prefab": { - "__id__": 274 + "__id__": 300 }, "_lpos": { "__type__": "cc.Vec3", @@ -5086,20 +5389,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 255 + "__id__": 281 }, "_children": [], "_active": true, "_components": [ { - "__id__": 257 + "__id__": 283 }, { - "__id__": 259 + "__id__": 285 } ], "_prefab": { - "__id__": 261 + "__id__": 287 }, "_lpos": { "__type__": "cc.Vec3", @@ -5136,11 +5439,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 256 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 258 + "__id__": 284 }, "_contentSize": { "__type__": "cc.Size", @@ -5164,11 +5467,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 256 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 286 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5222,20 +5525,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 255 + "__id__": 281 }, "_children": [], "_active": true, "_components": [ { - "__id__": 263 + "__id__": 289 }, { - "__id__": 265 + "__id__": 291 } ], "_prefab": { - "__id__": 267 + "__id__": 293 }, "_lpos": { "__type__": "cc.Vec3", @@ -5272,11 +5575,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 288 }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 290 }, "_contentSize": { "__type__": "cc.Size", @@ -5300,11 +5603,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 288 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 292 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5381,11 +5684,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 269 + "__id__": 295 }, "_contentSize": { "__type__": "cc.Size", @@ -5409,18 +5712,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 271 + "__id__": 297 }, "clickEvents": [ { - "__id__": 272 + "__id__": 298 }, { - "__id__": 273 + "__id__": 299 } ], "_interactable": true, @@ -5460,7 +5763,7 @@ "_duration": 0.1, "_zoomScale": 0.8, "_target": { - "__id__": 255 + "__id__": 281 }, "_id": "" }, @@ -5507,11 +5810,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 280 }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 302 }, "_contentSize": { "__type__": "cc.Size", @@ -5535,11 +5838,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 280 }, "_enabled": true, "__prefab": { - "__id__": 278 + "__id__": 304 }, "_alignFlags": 16, "_target": null, @@ -5585,14 +5888,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 281 + "__id__": 307 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 280 + "__id__": 306 }, "asset": { "__uuid__": "5423b9f8-8a8a-49a0-8ecb-0489dfcaba92", @@ -5600,7 +5903,7 @@ }, "fileId": "913f5QU7JKAZE87n6c4hSI", "instance": { - "__id__": 282 + "__id__": 308 }, "targetOverrides": null }, @@ -5614,28 +5917,28 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 283 + "__id__": 309 }, { - "__id__": 285 + "__id__": 311 }, { - "__id__": 286 + "__id__": 312 }, { - "__id__": 287 + "__id__": 313 }, { - "__id__": 288 + "__id__": 314 }, { - "__id__": 289 + "__id__": 315 }, { - "__id__": 291 + "__id__": 317 }, { - "__id__": 292 + "__id__": 318 } ], "removedComponents": [] @@ -5643,7 +5946,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 284 + "__id__": 310 }, "propertyPath": [ "_name" @@ -5659,7 +5962,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 284 + "__id__": 310 }, "propertyPath": [ "_lpos" @@ -5674,7 +5977,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 284 + "__id__": 310 }, "propertyPath": [ "_lrot" @@ -5690,7 +5993,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 284 + "__id__": 310 }, "propertyPath": [ "_euler" @@ -5705,7 +6008,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 284 + "__id__": 310 }, "propertyPath": [ "_active" @@ -5715,7 +6018,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 290 + "__id__": 316 }, "propertyPath": [ "_left" @@ -5731,7 +6034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 290 + "__id__": 316 }, "propertyPath": [ "_right" @@ -5741,7 +6044,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 293 + "__id__": 319 }, "propertyPath": [ "_contentSize" @@ -5765,14 +6068,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 295 + "__id__": 321 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 294 + "__id__": 320 }, "asset": { "__uuid__": "a14709ee-4775-4141-ae49-9f1f4a2b91b8", @@ -5780,7 +6083,7 @@ }, "fileId": "a2Mppj56hC3rhWLN9lYFwN", "instance": { - "__id__": 296 + "__id__": 322 }, "targetOverrides": null }, @@ -5794,19 +6097,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 297 + "__id__": 323 }, { - "__id__": 299 + "__id__": 325 }, { - "__id__": 300 + "__id__": 326 }, { - "__id__": 301 + "__id__": 327 }, { - "__id__": 302 + "__id__": 328 } ], "removedComponents": [] @@ -5814,7 +6117,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 298 + "__id__": 324 }, "propertyPath": [ "_name" @@ -5830,7 +6133,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 298 + "__id__": 324 }, "propertyPath": [ "_lpos" @@ -5845,7 +6148,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 298 + "__id__": 324 }, "propertyPath": [ "_lrot" @@ -5861,7 +6164,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 298 + "__id__": 324 }, "propertyPath": [ "_euler" @@ -5876,7 +6179,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 298 + "__id__": 324 }, "propertyPath": [ "_active" @@ -5895,11 +6198,11 @@ "_active": true, "_components": [ { - "__id__": 304 + "__id__": 330 } ], "_prefab": { - "__id__": 306 + "__id__": 332 }, "_lpos": { "__type__": "cc.Vec3", @@ -5936,11 +6239,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 303 + "__id__": 329 }, "_enabled": true, "__prefab": { - "__id__": 305 + "__id__": 331 }, "_contentSize": { "__type__": "cc.Size", @@ -5978,14 +6281,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 308 + "__id__": 334 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 307 + "__id__": 333 }, "asset": { "__uuid__": "dc0b56d7-c633-4cd2-a6ff-8fa2d7456d9d", @@ -5993,7 +6296,7 @@ }, "fileId": "5bChJGE9BD55+nIimwyIR0", "instance": { - "__id__": 309 + "__id__": 335 }, "targetOverrides": null }, @@ -6007,19 +6310,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 310 + "__id__": 336 }, { - "__id__": 312 + "__id__": 338 }, { - "__id__": 313 + "__id__": 339 }, { - "__id__": 314 + "__id__": 340 }, { - "__id__": 315 + "__id__": 341 } ], "removedComponents": [] @@ -6027,7 +6330,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 311 + "__id__": 337 }, "propertyPath": [ "_name" @@ -6043,7 +6346,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 311 + "__id__": 337 }, "propertyPath": [ "_lpos" @@ -6058,7 +6361,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 311 + "__id__": 337 }, "propertyPath": [ "_lrot" @@ -6074,7 +6377,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 311 + "__id__": 337 }, "propertyPath": [ "_euler" @@ -6089,7 +6392,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 316 + "__id__": 342 }, "propertyPath": [ "_active" @@ -6112,32 +6415,32 @@ }, "_children": [ { - "__id__": 318 + "__id__": 344 }, { - "__id__": 324 + "__id__": 350 }, { - "__id__": 349 + "__id__": 375 }, { - "__id__": 374 + "__id__": 400 } ], "_active": true, "_components": [ { - "__id__": 399 + "__id__": 425 }, { - "__id__": 401 + "__id__": 427 }, { - "__id__": 403 + "__id__": 429 } ], "_prefab": { - "__id__": 405 + "__id__": 431 }, "_lpos": { "__type__": "cc.Vec3", @@ -6174,20 +6477,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 317 + "__id__": 343 }, "_children": [], "_active": true, "_components": [ { - "__id__": 319 + "__id__": 345 }, { - "__id__": 321 + "__id__": 347 } ], "_prefab": { - "__id__": 323 + "__id__": 349 }, "_lpos": { "__type__": "cc.Vec3", @@ -6224,11 +6527,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 318 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 320 + "__id__": 346 }, "_contentSize": { "__type__": "cc.Size", @@ -6252,11 +6555,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 318 + "__id__": 344 }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 348 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6310,30 +6613,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 317 + "__id__": 343 }, "_children": [ { - "__id__": 325 + "__id__": 351 }, { - "__id__": 331 + "__id__": 357 }, { - "__id__": 337 + "__id__": 363 } ], "_active": true, "_components": [ { - "__id__": 343 + "__id__": 369 }, { - "__id__": 345 + "__id__": 371 } ], "_prefab": { - "__id__": 348 + "__id__": 374 }, "_lpos": { "__type__": "cc.Vec3", @@ -6370,20 +6673,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 324 + "__id__": 350 }, "_children": [], "_active": true, "_components": [ { - "__id__": 326 + "__id__": 352 }, { - "__id__": 328 + "__id__": 354 } ], "_prefab": { - "__id__": 330 + "__id__": 356 }, "_lpos": { "__type__": "cc.Vec3", @@ -6420,11 +6723,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 351 }, "_enabled": true, "__prefab": { - "__id__": 327 + "__id__": 353 }, "_contentSize": { "__type__": "cc.Size", @@ -6448,11 +6751,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 351 }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 355 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6506,20 +6809,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 324 + "__id__": 350 }, "_children": [], "_active": true, "_components": [ { - "__id__": 332 + "__id__": 358 }, { - "__id__": 334 + "__id__": 360 } ], "_prefab": { - "__id__": 336 + "__id__": 362 }, "_lpos": { "__type__": "cc.Vec3", @@ -6556,11 +6859,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 357 }, "_enabled": true, "__prefab": { - "__id__": 333 + "__id__": 359 }, "_contentSize": { "__type__": "cc.Size", @@ -6584,11 +6887,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 357 }, "_enabled": true, "__prefab": { - "__id__": 335 + "__id__": 361 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6642,20 +6945,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 324 + "__id__": 350 }, "_children": [], "_active": true, "_components": [ { - "__id__": 338 + "__id__": 364 }, { - "__id__": 340 + "__id__": 366 } ], "_prefab": { - "__id__": 342 + "__id__": 368 }, "_lpos": { "__type__": "cc.Vec3", @@ -6692,11 +6995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 363 }, "_enabled": true, "__prefab": { - "__id__": 339 + "__id__": 365 }, "_contentSize": { "__type__": "cc.Size", @@ -6720,11 +7023,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 363 }, "_enabled": true, "__prefab": { - "__id__": 341 + "__id__": 367 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6801,11 +7104,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 350 }, "_enabled": true, "__prefab": { - "__id__": 344 + "__id__": 370 }, "_contentSize": { "__type__": "cc.Size", @@ -6829,15 +7132,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 350 }, "_enabled": true, "__prefab": { - "__id__": 346 + "__id__": 372 }, "clickEvents": [ { - "__id__": 347 + "__id__": 373 } ], "_interactable": true, @@ -6912,30 +7215,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 317 + "__id__": 343 }, "_children": [ { - "__id__": 350 + "__id__": 376 }, { - "__id__": 356 + "__id__": 382 }, { - "__id__": 362 + "__id__": 388 } ], "_active": true, "_components": [ { - "__id__": 368 + "__id__": 394 }, { - "__id__": 370 + "__id__": 396 } ], "_prefab": { - "__id__": 373 + "__id__": 399 }, "_lpos": { "__type__": "cc.Vec3", @@ -6972,20 +7275,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 349 + "__id__": 375 }, "_children": [], "_active": false, "_components": [ { - "__id__": 351 + "__id__": 377 }, { - "__id__": 353 + "__id__": 379 } ], "_prefab": { - "__id__": 355 + "__id__": 381 }, "_lpos": { "__type__": "cc.Vec3", @@ -7022,11 +7325,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 350 + "__id__": 376 }, "_enabled": true, "__prefab": { - "__id__": 352 + "__id__": 378 }, "_contentSize": { "__type__": "cc.Size", @@ -7050,11 +7353,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 350 + "__id__": 376 }, "_enabled": true, "__prefab": { - "__id__": 354 + "__id__": 380 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7108,20 +7411,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 349 + "__id__": 375 }, "_children": [], "_active": true, "_components": [ { - "__id__": 357 + "__id__": 383 }, { - "__id__": 359 + "__id__": 385 } ], "_prefab": { - "__id__": 361 + "__id__": 387 }, "_lpos": { "__type__": "cc.Vec3", @@ -7158,11 +7461,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 356 + "__id__": 382 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 384 }, "_contentSize": { "__type__": "cc.Size", @@ -7186,11 +7489,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 356 + "__id__": 382 }, "_enabled": true, "__prefab": { - "__id__": 360 + "__id__": 386 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7244,20 +7547,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 349 + "__id__": 375 }, "_children": [], "_active": true, "_components": [ { - "__id__": 363 + "__id__": 389 }, { - "__id__": 365 + "__id__": 391 } ], "_prefab": { - "__id__": 367 + "__id__": 393 }, "_lpos": { "__type__": "cc.Vec3", @@ -7294,11 +7597,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 390 }, "_contentSize": { "__type__": "cc.Size", @@ -7322,11 +7625,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 362 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 392 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7403,11 +7706,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 375 }, "_enabled": true, "__prefab": { - "__id__": 369 + "__id__": 395 }, "_contentSize": { "__type__": "cc.Size", @@ -7431,15 +7734,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 375 }, "_enabled": true, "__prefab": { - "__id__": 371 + "__id__": 397 }, "clickEvents": [ { - "__id__": 372 + "__id__": 398 } ], "_interactable": true, @@ -7514,30 +7817,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 317 + "__id__": 343 }, "_children": [ { - "__id__": 375 + "__id__": 401 }, { - "__id__": 381 + "__id__": 407 }, { - "__id__": 387 + "__id__": 413 } ], "_active": true, "_components": [ { - "__id__": 393 + "__id__": 419 }, { - "__id__": 395 + "__id__": 421 } ], "_prefab": { - "__id__": 398 + "__id__": 424 }, "_lpos": { "__type__": "cc.Vec3", @@ -7574,20 +7877,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 374 + "__id__": 400 }, "_children": [], "_active": false, "_components": [ { - "__id__": 376 + "__id__": 402 }, { - "__id__": 378 + "__id__": 404 } ], "_prefab": { - "__id__": 380 + "__id__": 406 }, "_lpos": { "__type__": "cc.Vec3", @@ -7624,11 +7927,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 375 + "__id__": 401 }, "_enabled": true, "__prefab": { - "__id__": 377 + "__id__": 403 }, "_contentSize": { "__type__": "cc.Size", @@ -7652,11 +7955,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 375 + "__id__": 401 }, "_enabled": true, "__prefab": { - "__id__": 379 + "__id__": 405 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7710,20 +8013,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 374 + "__id__": 400 }, "_children": [], "_active": true, "_components": [ { - "__id__": 382 + "__id__": 408 }, { - "__id__": 384 + "__id__": 410 } ], "_prefab": { - "__id__": 386 + "__id__": 412 }, "_lpos": { "__type__": "cc.Vec3", @@ -7760,11 +8063,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 407 }, "_enabled": true, "__prefab": { - "__id__": 383 + "__id__": 409 }, "_contentSize": { "__type__": "cc.Size", @@ -7788,11 +8091,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 381 + "__id__": 407 }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 411 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7846,20 +8149,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 374 + "__id__": 400 }, "_children": [], "_active": true, "_components": [ { - "__id__": 388 + "__id__": 414 }, { - "__id__": 390 + "__id__": 416 } ], "_prefab": { - "__id__": 392 + "__id__": 418 }, "_lpos": { "__type__": "cc.Vec3", @@ -7896,11 +8199,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 387 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 389 + "__id__": 415 }, "_contentSize": { "__type__": "cc.Size", @@ -7924,11 +8227,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 387 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 391 + "__id__": 417 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8005,11 +8308,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 374 + "__id__": 400 }, "_enabled": true, "__prefab": { - "__id__": 394 + "__id__": 420 }, "_contentSize": { "__type__": "cc.Size", @@ -8033,15 +8336,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 374 + "__id__": 400 }, "_enabled": true, "__prefab": { - "__id__": 396 + "__id__": 422 }, "clickEvents": [ { - "__id__": 397 + "__id__": 423 } ], "_interactable": true, @@ -8116,11 +8419,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 317 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 400 + "__id__": 426 }, "_contentSize": { "__type__": "cc.Size", @@ -8144,11 +8447,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 317 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 402 + "__id__": 428 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8186,11 +8489,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 317 + "__id__": 343 }, "_enabled": true, "__prefab": { - "__id__": 404 + "__id__": 430 }, "_alignFlags": 20, "_target": null, @@ -8241,14 +8544,14 @@ "_active": true, "_components": [ { - "__id__": 407 + "__id__": 433 }, { - "__id__": 409 + "__id__": 435 } ], "_prefab": { - "__id__": 411 + "__id__": 437 }, "_lpos": { "__type__": "cc.Vec3", @@ -8285,11 +8588,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 406 + "__id__": 432 }, "_enabled": true, "__prefab": { - "__id__": 408 + "__id__": 434 }, "_contentSize": { "__type__": "cc.Size", @@ -8313,11 +8616,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 406 + "__id__": 432 }, "_enabled": true, "__prefab": { - "__id__": 410 + "__id__": 436 }, "_alignFlags": 12, "_target": null, @@ -8366,7 +8669,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 413 + "__id__": 439 }, "_contentSize": { "__type__": "cc.Size", @@ -8394,7 +8697,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 415 + "__id__": 441 }, "_alignFlags": 45, "_target": null, @@ -8430,7 +8733,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 417 + "__id__": 443 }, "_id": "" }, @@ -8451,13 +8754,13 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 307 + "__id__": 333 }, { - "__id__": 294 + "__id__": 320 }, { - "__id__": 280 + "__id__": 306 }, { "__id__": 109 diff --git a/assets/script/game/common/config/GameUIConfig.ts b/assets/script/game/common/config/GameUIConfig.ts index 19551994..e9b0a030 100644 --- a/assets/script/game/common/config/GameUIConfig.ts +++ b/assets/script/game/common/config/GameUIConfig.ts @@ -26,5 +26,5 @@ export var UIConfigData: { [key: number]: UIConfig } = { [UIID.Netinstable]: { layer: LayerType.PopUp, prefab: "common/prefab/netinstable" }, [UIID.Window]: { layer: LayerType.Dialog, prefab: "common/prefab/window" }, [UIID.Role_Controller]: { layer: LayerType.UI, prefab: "gui/role_controller" }, - [UIID.ItemInfo]: { layer: LayerType.UI, prefab: "gui/element/item_info" }, + [UIID.ItemInfo]: { layer: LayerType.Dialog, prefab: "gui/element/item_info" }, } \ No newline at end of file diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index 47ed5c02..33d3467c 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -1,7 +1,7 @@ export const HeroInfo = { 9001: { - uuid:9001,name: "骑士·白",path:"k1",type:1,hp: 200, hp_up:10,def:10,def_up:1,ap:20,ap_up:2,atp:1,vun:0,crit:20,crit_add:0,dodge:0,dis:100,a_cd:1, + uuid:9001,name: "骑士·白",path:"k1",type:1,hp: 50, hp_up:10,def:10,def_up:1,ap:20,ap_up:2,atp:1,vun:0,crit:20,crit_add:0,dodge:0,dis:100,a_cd:1, lvexp:2,slvexp:2, speed: 100,aep:1,uaep:1,dep:10,sk1:[9001,9001,9001,9001,9001],sk2: [2002,2002,2002,2002,2002],pw:0,pwm:15,pws:1, akr:[10,20,30,40,50],akc:[1,1,1,1,1],uar:[10,20,30,40,50],uac:[1,1,1,1,1],dgr:[10,20,30,40,50],dgc:[1,1,1,1,1],crr:[10,20,30,40,50],crc:[1,1,1,1,1], abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001, diff --git a/assets/script/game/map/ItemComp.ts b/assets/script/game/map/ItemComp.ts index 1e648449..aaea187f 100644 --- a/assets/script/game/map/ItemComp.ts +++ b/assets/script/game/map/ItemComp.ts @@ -2,6 +2,8 @@ import { _decorator, Label, resources, Sprite, SpriteAtlas } 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 { Items } from "../common/config/Items"; +import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; +import { UIID } from "../common/config/GameUIConfig"; const { ccclass, property } = _decorator; @@ -16,7 +18,9 @@ export class ItemComp extends CCComp { //todo 设定icon 显示 } - + show_info(){ + oops.gui.open(UIID.ItemInfo, { name:Items[this.i_uuid].name, info:Items[this.i_uuid].info}); + } /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */ reset() { diff --git a/assets/script/game/map/ItemInfoComp.ts b/assets/script/game/map/ItemInfoComp.ts index 86ab9e93..f20a7f2a 100644 --- a/assets/script/game/map/ItemInfoComp.ts +++ b/assets/script/game/map/ItemInfoComp.ts @@ -1,4 +1,4 @@ -import { EventTouch, Node,_decorator } from "cc"; +import { EventTouch, Label, Node,_decorator } 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 { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; @@ -10,20 +10,15 @@ const { ccclass, property } = _decorator; @ecs.register('ItemInfo', false) export class ItemInfoComp extends CCComp { onAdded(args: any) { - console.log("args"); - } - - onLoad() { - this.node.on(Node.EventType.TOUCH_END, this.onTouchEnd, this); + console.log("args",args); + this.node.getChildByName("name").getComponent(Label).string=args.name + this.node.getChildByName("info").getComponent(Label).string=args.info } private onTouchEnd(event: EventTouch) { switch (event.target.name) { - case "btn_levelup": - this.ent.remove(ItemInfoComp); - break; - case "btn_close": - this.ent.remove(ItemInfoComp); + case "btn": + this.reset(); break; } @@ -33,10 +28,10 @@ export class ItemInfoComp extends CCComp { reset() { oops.gui.remove(UIID.ItemInfo, false); - // 注：模拟二次删除清理缓存 - setTimeout(() => { - oops.gui.remove(UIID.ItemInfo); - }, 1000); + // // 注：模拟二次删除清理缓存 + // setTimeout(() => { + // oops.gui.remove(UIID.ItemInfo); + // }, 100); } protected onDestroy(): void { diff --git a/assets/script/game/map/MIssionController.ts b/assets/script/game/map/MIssionController.ts index 71c18661..7d7a9276 100644 --- a/assets/script/game/map/MIssionController.ts +++ b/assets/script/game/map/MIssionController.ts @@ -99,9 +99,6 @@ export class MissionComp extends CCComp { this.node.getChildByName("mexp").getChildByName("hp").active = true this.mon_refresh() this.heros_call() - } - do_x10(){ - } mission_end(){ smc.vmdata.mission.play=false diff --git a/assets/script/game/map/VictoryComp.ts b/assets/script/game/map/VictoryComp.ts index 1653a49b..75cd1db5 100644 --- a/assets/script/game/map/VictoryComp.ts +++ b/assets/script/game/map/VictoryComp.ts @@ -28,21 +28,21 @@ export class VictoryComp extends CCComp { } private do_victiry() { if(this.if_show) return - this.node.getChildByName("Node").setScale(1,1,1) + this.node.setPosition(0,this.node.position.y,0) this.getReward(true) this.node.getChildByName("Node").getChildByName("defeat").active = false this.node.getChildByName("Node").getChildByName("victory").active = true; } private do_defeat() { if(this.if_show) return - this.node.getChildByName("Node").setScale(1,1,1) + this.node.setPosition(0,this.node.position.y,0) this.getReward(false) this.node.getChildByName("Node").getChildByName("victory").active = false; this.node.getChildByName("Node").getChildByName("defeat").active = true } getReward(is_victory:boolean){ let conut =2 - if(is_victory) conut=1 + if(!is_victory) conut=1 let item1=ecs.getEntity(Item) let gold: number = Math.floor(RandomManager.instance.getRandomInt((3000 + smc.vmdata.mission.lv * 100) / 3 * 2, 3000 + smc.vmdata.mission.lv * 100)); let parent = this.node.getChildByName("Node").getChildByName("items") @@ -55,17 +55,17 @@ export class VictoryComp extends CCComp { } this.if_show=true } + do_x10(){ + console.log("x10") + this.end_mission() + } + do_x1(){ + console.log("x1") + this.end_mission() + } end_mission(){ - this.node.getChildByName("Node").setScale(0,0,0) + this.node.setPosition(2000,this.node.position.y,0) this.if_show=false - let args:any ={ - uuid:1001, - name:"普通攻击石", - info:"一星英雄升星", - num:1 - } - - }